Skip to content

Commit cea39dd

Browse files
committed
domain name change
1 parent 8d6b217 commit cea39dd

File tree

4 files changed

+29
-6
lines changed

4 files changed

+29
-6
lines changed

src/main/java/com/shuzijun/leetcode/plugin/model/Config.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ public boolean isModified(Config config){
375375
if(config ==null){
376376
return false;
377377
}
378-
if (!Objects.equals(version, config.version)) return false;
379378
if (!Objects.equals(loginName, config.loginName)) return false;
380379
if (!Objects.equals(filePath, config.filePath)) return false;
381380
if (!Objects.equals(codeType, config.codeType)) return false;

src/main/java/com/shuzijun/leetcode/plugin/model/Constant.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ public class Constant {
7171
public static final Integer PLUGIN_CONFIG_VERSION_1 = 1;
7272
//第二版本,不兼容之前的临时目录,从此版本开始更换新临时目录
7373
public static final Integer PLUGIN_CONFIG_VERSION_2 = 2;
74+
//第三版本,域名更新,需要将cookie更改一下域名
75+
public static final Integer PLUGIN_CONFIG_VERSION_3 = 3;
7476

7577
/**
7678
* 默认题目颜色

src/main/java/com/shuzijun/leetcode/plugin/setting/PersistentConfig.java

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@
66
import com.intellij.openapi.components.*;
77
import com.intellij.util.xmlb.XmlSerializerUtil;
88
import com.shuzijun.leetcode.plugin.model.Config;
9+
import com.shuzijun.leetcode.plugin.model.Constant;
910
import com.shuzijun.leetcode.plugin.model.PluginConstant;
1011
import com.shuzijun.leetcode.plugin.utils.MessageUtils;
1112
import com.shuzijun.leetcode.plugin.utils.PropertiesUtils;
13+
import com.shuzijun.leetcode.plugin.utils.URLUtils;
14+
import org.apache.commons.lang3.StringUtils;
1215
import org.jetbrains.annotations.NotNull;
1316
import org.jetbrains.annotations.Nullable;
1417

1518
import java.io.File;
1619
import java.util.HashMap;
20+
import java.util.Iterator;
1721
import java.util.Map;
1822

1923
/**
@@ -46,11 +50,27 @@ public void loadState(@NotNull PersistentConfig persistentConfig) {
4650
}
4751

4852
public Config getInitConfig() {
49-
return initConfig.get(INITNAME);
53+
Config config = initConfig.get(INITNAME);
54+
if (config != null && config.getVersion() != null && config.getVersion() < Constant.PLUGIN_CONFIG_VERSION_3) {
55+
if (URLUtils.leetcodecnOld.equals(config.getUrl())) {
56+
config.setUrl(URLUtils.leetcodecn);
57+
}
58+
Iterator<String> iterator = config.getUserCookie().keySet().iterator();
59+
while (iterator.hasNext()) {
60+
String key = iterator.next();
61+
String value = config.getCookie(key);
62+
if (StringUtils.isBlank(value) || key.startsWith(URLUtils.leetcodecnOld)) {
63+
iterator.remove();
64+
}
65+
}
66+
config.setVersion(Constant.PLUGIN_CONFIG_VERSION_3);
67+
setInitConfig(config);
68+
}
69+
return config;
5070
}
5171

5272
public Config getConfig() {
53-
Config config = initConfig.get(INITNAME);
73+
Config config = getInitConfig();
5474
if (config == null) {
5575
MessageUtils.showAllWarnMsg("warning", PropertiesUtils.getInfo("config.first"));
5676
throw new UnsupportedOperationException("not configured:File -> settings->tools->leetcode plugin");
@@ -69,10 +89,10 @@ public String getTempFilePath() {
6989
}
7090

7191
public void savePassword(String password, String username) {
72-
if(username == null || password == null){
92+
if (username == null || password == null) {
7393
return;
7494
}
75-
PasswordSafe.getInstance().set(new CredentialAttributes(PluginConstant.PLUGIN_ID, username, this.getClass()), new Credentials(username, password==null?"":password));
95+
PasswordSafe.getInstance().set(new CredentialAttributes(PluginConstant.PLUGIN_ID, username, this.getClass()), new Credentials(username, password == null ? "" : password));
7696
}
7797

7898
public String getPassword(String username) {

src/main/java/com/shuzijun/leetcode/plugin/setting/SettingUI.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,9 @@ public void apply() {
251251
}
252252

253253
public void process(Config config) {
254-
config.setVersion(Constant.PLUGIN_CONFIG_VERSION_2);
254+
if(config.getVersion() == null) {
255+
config.setVersion(Constant.PLUGIN_CONFIG_VERSION_3);
256+
}
255257
config.setLoginName(userNameField.getText());
256258
config.setFilePath(fileFolderBtn.getText());
257259
config.setCodeType(codeComboBox.getSelectedItem().toString());

0 commit comments

Comments
 (0)