domain name change

shuzijun · shuzijun · commit 8d6b2179faf7 · 2022-05-09T11:15:47.000+08:00
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
     - [Custom Code](https://github.com/shuzijun/leetcode-editor/blob/master/doc/CustomCode.md) ([demo](https://github.com/shuzijun/leetcode-question))    
   
 ## Introduction  
-  Do Leetcode exercises in IDE, support `leetcode.com` and `leetcode-cn.com`, to meet the basic needs of doing exercises.
+  Do Leetcode exercises in IDE, support `leetcode.com` and `leetcode.cn`, to meet the basic needs of doing exercises.
   Support theoretically: IntelliJ IDEA PhpStorm WebStorm PyCharm RubyMine AppCode CLion GoLand DataGrip Rider MPS Android Studio.  
   <a href="http://shuzijun.cn/leetcode-editor/monitor.html" target="_blank">be with you!</a>
   
@@ -35,7 +35,7 @@
 </p>  
  
 - **Configuration path**: `File` -> `settings`->`tools`->`leetcode plugin`  
-  - **`URL options`**: `leetcode.com`OR`leetcode-cn.com`  
+  - **`URL options`**: `leetcode.com`OR`leetcode.cn`  
   - **`Code Type`**: `Java`,`Python`,`C++`,`Python3`,`C`,`C#`,`JavaScript`,`Ruby`,`Swift`,`Go` ,`Scala`,`Kotlin`,`Rust`,`PHP`,`Bash`,`SQL`   
   - **`LoginName`**: Login Username
   - **`Password`**: Login password  
diff --git a/README_ZH.md b/README_ZH.md
@@ -8,7 +8,7 @@
     - [自定义代码生成](https://github.com/shuzijun/leetcode-editor/blob/master/doc/CustomCode_ZH.md) ([示例](https://github.com/shuzijun/leetcode-question))    
     
 ## 简介  
-  在IDE中解决LeetCode问题,支持`leetcode.com`与`leetcode-cn.com`,满足基本的做题需求。  
+  在IDE中解决LeetCode问题,支持`leetcode.com`与`leetcode.cn`,满足基本的做题需求。  
   理论上支持: IntelliJ IDEA  PhpStorm  WebStorm  PyCharm  RubyMine  AppCode  CLion  GoLand  DataGrip  Rider MPS  Android Studio。  
   [be with you!](http://shuzijun.cn/leetcode-editor/monitor.html)  
 
@@ -35,7 +35,7 @@
 </p>  
  
 - **配置路径**: `File` -> `settings`->`tools`->`leetcode plugin`  
-  - **`URL可选项`**: `leetcode.com`与`leetcode-cn.com`  
+  - **`URL可选项`**: `leetcode.com`与`leetcode.cn`  
   - **`Code Type`**: `Java`,`Python`,`C++`,`Python3`,`C`,`C#`,`JavaScript`,`Ruby`,`Swift`,`Go` ,`Scala`,`Kotlin`,`Rust`,`PHP`,`Bash`,`SQL`   
   - **`LoginName`**: 登录用户名
   - **`Password`**: 登录密码  
diff --git a/doc/LoginHelp_ZH.md b/doc/LoginHelp_ZH.md
@@ -3,7 +3,7 @@
   - [中文文档](#登录配置)   
   登录方式:配置用户名密码登录,cookie登录,浏览器登录  
 ## 用户名密码登录  
-  在leetcode插件配置页配置用户名密码,如登录失败将加载下面两种登录方式,此方式仅支持leetcode-cn.com  
+  在leetcode插件配置页配置用户名密码,如登录失败将加载下面两种登录方式,此方式仅支持leetcode.cn  
 ## cookie登录  
   首先在浏览器中登录leetcode,打开浏览器控制台,复制cookie到登录弹出框,点击login.[参考](https://developers.google.com/web/tools/chrome-devtools/network?hl=zh_cn)  
   <p align="center">
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/editor/AbstractEditAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/editor/AbstractEditAction.java
@@ -34,7 +34,7 @@ public void actionPerformed(AnActionEvent anActionEvent, Config config) {
             MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.null"));
             return;
         }
-        if(!URLUtils.getLeetcodeHost().equals(leetcodeEditor.getHost())){
+        if(!URLUtils.equalsHost(leetcodeEditor.getHost())){
             MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.host"));
             return;
         }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/editor/OpenSolutionAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/editor/OpenSolutionAction.java
@@ -32,7 +32,7 @@ public void update(@NotNull AnActionEvent anActionEvent) {
             return;
         }
         LeetcodeEditor leetcodeEditor = ProjectConfig.getInstance(anActionEvent.getProject()).getEditor(vf.getPath());
-        if (leetcodeEditor == null || StringUtils.isBlank(leetcodeEditor.getTitleSlug()) || !URLUtils.getLeetcodeHost().equals(leetcodeEditor.getHost())) {
+        if (leetcodeEditor == null || StringUtils.isBlank(leetcodeEditor.getTitleSlug()) || !URLUtils.equalsHost(leetcodeEditor.getHost())) {
             anActionEvent.getPresentation().setEnabled(false);
             return;
         }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/setting/ProjectConfig.java b/src/main/java/com/shuzijun/leetcode/plugin/setting/ProjectConfig.java
@@ -1,22 +1,26 @@
 package com.shuzijun.leetcode.plugin.setting;
 
-import com.intellij.openapi.components.*;
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.xmlb.annotations.MapAnnotation;
 import com.shuzijun.leetcode.plugin.model.LeetcodeEditor;
 import com.shuzijun.leetcode.plugin.model.PluginConstant;
+import com.shuzijun.leetcode.plugin.utils.URLUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 /**
  * @author shuzijun
  */
-@State(name = "LeetcodeEditor" + PluginConstant.ACTION_SUFFIX, storages = {@Storage(value = PluginConstant.ACTION_PREFIX+"/editor.xml")})
-public class ProjectConfig implements  PersistentStateComponent<ProjectConfig.InnerState> {
+@State(name = "LeetcodeEditor" + PluginConstant.ACTION_SUFFIX, storages = {@Storage(value = PluginConstant.ACTION_PREFIX + "/editor.xml")})
+public class ProjectConfig implements PersistentStateComponent<ProjectConfig.InnerState> {
 
     public Map<String, LeetcodeEditor> idProjectConfig = new HashMap<>();
 
@@ -37,24 +41,34 @@ public ProjectConfig.InnerState getState() {
     public void loadState(@NotNull ProjectConfig.InnerState innerState) {
         this.innerState = innerState;
         idProjectConfig.clear();
-        this.innerState.projectConfig.forEach((s, leetcodeEditor) -> {
-            idProjectConfig.put(leetcodeEditor.getFrontendQuestionId(),leetcodeEditor);
-        });
+        Iterator<String> iter = this.innerState.projectConfig.keySet().iterator();
+        while (iter.hasNext()) {
+            String key = iter.next();
+            LeetcodeEditor leetcodeEditor = this.innerState.projectConfig.get(key);
+            if (StringUtils.isBlank(leetcodeEditor.getFrontendQuestionId())) {
+                iter.remove();
+                continue;
+            } else if (leetcodeEditor.getFrontendQuestionId().startsWith(URLUtils.leetcodecnOld)) {
+                leetcodeEditor.setHost(URLUtils.leetcodecn);
+                leetcodeEditor.setFrontendQuestionId(leetcodeEditor.getFrontendQuestionId().replace(URLUtils.leetcodecnOld, URLUtils.leetcodecn));
+            }
+            idProjectConfig.put(leetcodeEditor.getFrontendQuestionId(), leetcodeEditor);
+        }
     }
 
 
     public LeetcodeEditor getDefEditor(String frontendQuestionId) {
         LeetcodeEditor leetcodeEditor = idProjectConfig.get(frontendQuestionId);
         if (leetcodeEditor == null) {
             leetcodeEditor = new LeetcodeEditor();
-            idProjectConfig.put(frontendQuestionId,leetcodeEditor);
+            idProjectConfig.put(frontendQuestionId, leetcodeEditor);
         }
         return leetcodeEditor;
     }
 
     public void addLeetcodeEditor(LeetcodeEditor leetcodeEditor) {
         idProjectConfig.put(leetcodeEditor.getFrontendQuestionId(), leetcodeEditor);
-        if(StringUtils.isNotBlank(leetcodeEditor.getPath())) {
+        if (StringUtils.isNotBlank(leetcodeEditor.getPath())) {
             innerState.projectConfig.put(leetcodeEditor.getPath(), leetcodeEditor);
         }
     }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/utils/URLUtils.java b/src/main/java/com/shuzijun/leetcode/plugin/utils/URLUtils.java
@@ -9,7 +9,8 @@
 public class URLUtils {
 
     public static final String leetcode = "leetcode.com";
-    public static final String leetcodecn = "leetcode-cn.com";
+    public static final String leetcodecn = "leetcode.cn";
+    public static final String leetcodecnOld = "leetcode-cn.com";
 
     private static String leetcodeUrl = "https://";
     private static String leetcodeLogin = "/accounts/login/";
@@ -35,6 +36,17 @@ public static String getLeetcodeHost() {
         return host;
     }
 
+    public static boolean equalsHost(String host) {
+        String thisHost = getLeetcodeHost();
+        if(thisHost.equals(host)){
+            return true;
+        }else if(thisHost.equals(leetcodecn) && leetcodecnOld.equals(host)){
+            return true;
+        }else {
+            return false;
+        }
+    }
+
     public static String getLeetcodeUrl() {
         return leetcodeUrl + getLeetcodeHost();
     }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/window/HttpLogin.java b/src/main/java/com/shuzijun/leetcode/plugin/window/HttpLogin.java
@@ -28,7 +28,7 @@
 public class HttpLogin {
     public static boolean ajaxLogin(Config config, NavigatorTable navigatorTable, Project project) {
 
-        if (URLUtils.leetcode.equals(URLUtils.getLeetcodeHost())) {
+        if (!URLUtils.isCn()) {
             return Boolean.FALSE;
         }
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -6,18 +6,18 @@
 
     <description><![CDATA[
         <div>
-           <p>Support for leetcode.com and leetcode-cn.com, can test and submit questions.
+           <p>Support for leetcode.com and leetcode.cn, can test and submit questions.
 			  More tutorial please visit： <a href="https://github.com/shuzijun/leetcode-editor">here</a></p>
         </div>
         <div>
 			<h2>Introduction</h2>
 			<br>
 			<ul>
-				<li>Support for leetcode.com and leetcode-cn.com, can test and submit questions</li>
+				<li>Support for leetcode.com and leetcode.cn, can test and submit questions</li>
 				<li>More tutorial please visit： <a href="https://github.com/shuzijun/leetcode-editor">here</a></li>
 			</ul>
 			<ul>
-				<li>支持leetcode.com和leetcode-cn.com,可测试与提交问题</li>
+				<li>支持leetcode.com和leetcode.cn,可测试与提交问题</li>
 				<li>更多的插件使用教程： <a href="https://github.com/shuzijun/leetcode-editor">插件使用介绍</a></li>
 			</ul>
 		</div>
@@ -47,7 +47,7 @@
 			<h3>Configuration path: File -> settings->tools->leetcode plugin</h3>
 			<br>
 			<ul>
-				<li>URL options: leetcode.com and leetcode-cn.com</li>
+				<li>URL options: leetcode.com and leetcode.cn</li>
 				<li>Code Type: Java, Python, C++, Python3, C, C#, JavaScript, Ruby, Swift, Go, Scala, Kotlin, Rust, PHP</li>
 				<li> Login Name: Login Username</li>
 				<li> Password: Login password</li>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void actionPerformed(AnActionEvent anActionEvent, Config config) {`
`34`	`34`	`MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.null"));`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`		`- if(!URLUtils.getLeetcodeHost().equals(leetcodeEditor.getHost())){`
	`37`	`+ if(!URLUtils.equalsHost(leetcodeEditor.getHost())){`
`38`	`38`	`MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.host"));`
`39`	`39`	`return;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void update(@NotNull AnActionEvent anActionEvent) {`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`	`34`	`LeetcodeEditor leetcodeEditor = ProjectConfig.getInstance(anActionEvent.getProject()).getEditor(vf.getPath());`
`35`		`- if (leetcodeEditor == null \|\| StringUtils.isBlank(leetcodeEditor.getTitleSlug()) \|\| !URLUtils.getLeetcodeHost().equals(leetcodeEditor.getHost())) {`
	`35`	`+ if (leetcodeEditor == null \|\| StringUtils.isBlank(leetcodeEditor.getTitleSlug()) \|\| !URLUtils.equalsHost(leetcodeEditor.getHost())) {`
`36`	`36`	`anActionEvent.getPresentation().setEnabled(false);`
`37`	`37`	`return;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`public class HttpLogin {`
`29`	`29`	`public static boolean ajaxLogin(Config config, NavigatorTable navigatorTable, Project project) {`
`30`	`30`
`31`		`- if (URLUtils.leetcode.equals(URLUtils.getLeetcodeHost())) {`
	`31`	`+ if (!URLUtils.isCn()) {`
`32`	`32`	`return Boolean.FALSE;`
`33`	`33`	`}`
`34`	`34`