domain name change

Author: shuzijun

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.shuzijun.leetcode'
-version (System.getenv('LD_VERSION')==null ? "6.10":System.getenv('LD_VERSION')) + (project.build_env.isEmpty() ? "" : "-") + project.build_env
+version (System.getenv('LD_VERSION')==null ? "6.11":System.getenv('LD_VERSION')) + (project.build_env.isEmpty() ? "" : "-") + project.build_env
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

src/main/java/com/shuzijun/leetcode/plugin/actions/toolbar/DonateAction.java

@@ -0,0 +1,16 @@
+package com.shuzijun.leetcode.plugin.actions.toolbar;
+
+import com.intellij.ide.BrowserUtil;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+
+/**
+ * @author shuzijun
+ */
+public class DonateAction extends AnAction {
+    @Override
+    public void actionPerformed(AnActionEvent anActionEvent) {
+        BrowserUtil.browse("https://shuzijun.cn/donate.html");
+    }
+
+}

src/main/java/com/shuzijun/leetcode/plugin/actions/toolbar/FindTagAction.java

@@ -51,7 +51,7 @@ public void setSelected(AnActionEvent anActionEvent, boolean b) {
                 @Override
                 public void run(@NotNull ProgressIndicator progressIndicator) {
                     if (b) {
-                        ViewManager.loadServiceData(tree, anActionEvent.getProject(), tag.getSlug());
+                        ViewManager.loadServiceData(tree, anActionEvent.getProject(), tag.getType());
                     } else {
                         ViewManager.loadServiceData(tree, anActionEvent.getProject());
                     }

src/main/java/com/shuzijun/leetcode/plugin/manager/QuestionManager.java

@@ -32,67 +32,21 @@ public class QuestionManager {
     private final static String TRANSLATIONNAME = "translation.json";
 
 
-    public static List<Question> getQuestionService(Project project, String categorySlug) {
-        Boolean isPremium = false;
-        if (HttpRequestUtils.isLogin()) {
-            HttpRequest httpRequest = HttpRequest.post(URLUtils.getLeetcodeGraphql(), "application/json");
-            httpRequest.setBody("{\"query\":\"\\n    query globalData {\\n  userStatus {\\n    isSignedIn\\n    isPremium\\n    username\\n    realName\\n    avatar\\n    userSlug\\n    isAdmin\\n    useTranslation\\n    premiumExpiredAt\\n    isTranslator\\n    isSuperuser\\n    isPhoneVerified\\n  }\\n  jobsMyCompany {\\n    nameSlug\\n  }\\n  commonNojPermissionTypes\\n}\\n    \",\"variables\":{},\"operationName\":\"globalData\"}");
-            httpRequest.addHeader("Accept", "application/json");
-            HttpResponse response = HttpRequestUtils.executePost(httpRequest);
-            if (response != null && response.getStatusCode() == 200) {
-                JSONObject user = JSONObject.parseObject(response.getBody()).getJSONObject("data").getJSONObject("userStatus");
-                isPremium =  user.getBoolean("isPremium");
-                ApplicationManager.getApplication().invokeAndWait(() -> {
-                    WindowFactory.updateTitle(project, user.getString("username"));
-                });
-            } else {
-                LogUtils.LOG.error("Request userStatus  failed, status:" + response == null ? "" : response.getStatusCode());
-            }
-        }
-        List<Question> questionList = new ArrayList<>();
-        int skip = 0;
-        int limit = 100;
-        int total = -1;
-        while(true) {
-            try {
-                Map<String, Object> page = getQuestionPage(categorySlug, skip, limit, isPremium);
-                if (total < 0) {
-                    total = (int) page.get("total");
-                }
-                questionList.addAll((List) page.get("questionList"));
-                skip = skip + limit;
-                if(total <= skip){
-                    break;
-                }
-            } catch (Exception e) {
-                return null;
-            }
+    public static List<Question> getQuestionService(Project project, String url) {
+        List<Question> questionList = null;
 
+        HttpRequest httpRequest = HttpRequest.get(url);
+        HttpResponse response = HttpRequestUtils.executeGet(httpRequest);
+        if (response != null && response.getStatusCode() == 200) {
+            questionList = parseQuestion(response.getBody());
+            JSONObject jsonObject = JSONObject.parseObject(response.getBody());
+            ApplicationManager.getApplication().invokeAndWait(() -> {
+                WindowFactory.updateTitle(project, jsonObject.getString("user_name"));
+            });
+        } else {
+            LogUtils.LOG.error("Request question list failed, status:" + response == null ? "" : response.getStatusCode());
         }
 
-        String dayQuestion = questionOfToday();
-        Collections.sort(questionList, new Comparator<Question>() {
-            @Override
-            public int compare(Question arg0, Question arg1) {
-                String frontendId0 = arg0.getFrontendQuestionId();
-                String frontendId1 = arg1.getFrontendQuestionId();
-                if (frontendId0.equals(dayQuestion)) {
-                    return -1;
-                } else if (frontendId1.equals(dayQuestion)) {
-                    return 1;
-                } else if (StringUtils.isNumeric(frontendId0) && StringUtils.isNumeric(frontendId1)) {
-                    return Integer.valueOf(frontendId0).compareTo(Integer.valueOf(frontendId1));
-                } else if (StringUtils.isNumeric(frontendId0)) {
-                    return -1;
-                } else if (StringUtils.isNumeric(frontendId1)) {
-                    return 1;
-                } else {
-                    return frontendId0.compareTo(frontendId1);
-                }
-
-            }
-        });
-
         if (questionList != null && !questionList.isEmpty()) {
             String filePath = PersistentConfig.getInstance().getTempFilePath() + ALLNAME;
             FileUtils.saveFile(filePath, JSON.toJSONString(questionList));
@@ -102,28 +56,6 @@ public int compare(Question arg0, Question arg1) {
 
     }
 
-    private static Map<String, Object> getQuestionPage(String categorySlug, int skip, int limit, Boolean isPremium) throws Exception {
-        HttpRequest httpRequest = HttpRequest.post(URLUtils.getLeetcodeGraphql(), "application/json");
-        if (URLUtils.isCn()) {
-            httpRequest.setBody("{\"query\":\"\\n    query problemsetQuestionList($categorySlug: String, $limit: Int, $skip: Int, $filters: QuestionListFilterInput) {\\n  problemsetQuestionList(\\n    categorySlug: $categorySlug\\n    limit: $limit\\n    skip: $skip\\n    filters: $filters\\n  ) {\\n    hasMore\\n    total\\n    questions {\\n      acRate\\n      difficulty\\n      freqBar\\n      frontendQuestionId\\n      isFavor\\n      paidOnly\\n      solutionNum\\n      status\\n      title\\n      titleCn\\n      titleSlug\\n      topicTags {\\n        name\\n        nameTranslated\\n        id\\n        slug\\n      }\\n      extra {\\n        hasVideoSolution\\n        topCompanyTags {\\n          imgUrl\\n          slug\\n          numSubscribed\\n        }\\n      }\\n    }\\n  }\\n}\\n    \",\"variables\":{\"categorySlug\":\""+categorySlug+"\",\"skip\":" + skip + ",\"limit\":" + limit + ",\"filters\":{}},\"operationName\":\"problemsetQuestionList\"}");
-        } else {
-            httpRequest.setBody("{\"query\":\"\\n    query problemsetQuestionList($categorySlug: String, $limit: Int, $skip: Int, $filters: QuestionListFilterInput) {\\n  problemsetQuestionList: questionList(\\n    categorySlug: $categorySlug\\n    limit: $limit\\n    skip: $skip\\n    filters: $filters\\n  ) {\\n    total: totalNum\\n    questions: data {\\n      acRate\\n      difficulty\\n      freqBar\\n      frontendQuestionId: questionFrontendId\\n      isFavor\\n      paidOnly: isPaidOnly\\n      status\\n      title\\n      titleSlug\\n      topicTags {\\n        name\\n        id\\n        slug\\n      }\\n      hasSolution\\n      hasVideoSolution\\n    }\\n  }\\n}\\n    \",\"variables\":{\"categorySlug\":\"" + categorySlug + "\",\"skip\":" + skip + ",\"limit\":" + limit + ",\"filters\":{}},\"operationName\":\"problemsetQuestionList\"}");
-        }
-        httpRequest.addHeader("Accept", "application/json");
-        HttpResponse response = HttpRequestUtils.executePost(httpRequest);
-        if (response != null && response.getStatusCode() == 200) {
-            List questionList = parseQuestion(response.getBody(), isPremium);
-            Integer total = JSONObject.parseObject(response.getBody()).getJSONObject("data").getJSONObject("problemsetQuestionList").getInteger("total");
-            Map<String, Object> page = new HashMap<>();
-            page.put("total", total);
-            page.put("questionList", questionList);
-            return page;
-        } else {
-            LogUtils.LOG.error("Request question list failed, status:" + response == null ? "" : response.getStatusCode());
-            throw new RuntimeException("Request question list failed");
-        }
-    }
-
     public static List<Question> getQuestionCache() {
         if (QUESTIONLIST != null) {
             return QUESTIONLIST;
@@ -243,15 +175,15 @@ public static List<Tag> getLists() {
         return tags;
     }
 
-    public static List<Tag> getCategory(String categorySlug) {
+    public static List<Tag> getCategory(String url) {
         List<Tag> tags = new ArrayList<>();
 
         HttpRequest httpRequest = HttpRequest.get(URLUtils.getLeetcodeCardInfo());
         HttpResponse response = HttpRequestUtils.executeGet(httpRequest);
         if (response != null && response.getStatusCode() == 200) {
             try {
                 String body = response.getBody();
-                tags = parseCategory(body, categorySlug);
+                tags = parseCategory(body, url);
             } catch (Exception e1) {
                 LogUtils.LOG.error("Request CardInfo exception", e1);
             }
@@ -262,52 +194,75 @@ public static List<Tag> getCategory(String categorySlug) {
     }
 
 
-    private static List<Question> parseQuestion(String str, Boolean isPremium) {
+    private static List<Question> parseQuestion(String str) {
 
         List<Question> questionList = new ArrayList<Question>();
 
         if (StringUtils.isNotBlank(str)) {
-            JSONObject jsonObject = JSONObject.parseObject(str).getJSONObject("data").getJSONObject("problemsetQuestionList");
-            JSONArray jsonArray = jsonObject.getJSONArray("questions");
+            JSONObject jsonObject = JSONObject.parseObject(str);
+            Boolean isPremium = new Integer("0").equals(jsonObject.getInteger("frequency_high")); //Premium users display frequency
+            JSONArray jsonArray = jsonObject.getJSONArray("stat_status_pairs");
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject object = jsonArray.getJSONObject(i);
-                Question question = new Question(object.getString("title"));
-                if (URLUtils.isCn() && !PersistentConfig.getInstance().getConfig().getEnglishContent()) {
-                    question.setTitle(object.getString("titleCn"));
-                }
+                Question question = new Question(object.getJSONObject("stat").getString("question__title"));
                 question.setLeaf(Boolean.TRUE);
-                question.setQuestionId(object.getString("frontendQuestionId"));
-                question.setFrontendQuestionId(object.getString("frontendQuestionId"));
+                question.setQuestionId(object.getJSONObject("stat").getString("question_id"));
+                question.setFrontendQuestionId(object.getJSONObject("stat").getString("frontend_question_id"));
                 try {
-                    if (object.getBoolean("paidOnly") && !isPremium) {
-                        question.setStatus("lock");
+                    if (object.getBoolean("paid_only") && isPremium) {
+                        question.setStatus(object.getBoolean("paid_only") ? "lock" : null);
                     } else {
-                        question.setStatus(object.get("status") == null ? "" : object.getString("status").toLowerCase());
+                        question.setStatus(object.get("status") == null ? "" : object.getString("status"));
                     }
                 } catch (Exception ee) {
                     question.setStatus("");
                 }
-                question.setTitleSlug(object.getString("titleSlug"));
-                question.setLevel(object.getString("difficulty"));
+                question.setTitleSlug(object.getJSONObject("stat").getString("question__title_slug"));
+                question.setLevel(object.getJSONObject("difficulty").getInteger("level"));
                 try {
-                    if (object.containsKey("hasSolution")) {
-                        if (object.getBoolean("hasSolution")) {
-                            question.setArticleLive(Constant.ARTICLE_LIVE_ONE);
-                            question.setArticleSlug(object.getString("titleSlug"));
-                        } else {
+                    if (object.getJSONObject("stat").containsKey("question__article__live")) {
+                        if (object.getJSONObject("stat").get("question__article__live") == null
+                                || !object.getJSONObject("stat").getBoolean("question__article__live")) {
                             question.setArticleLive(Constant.ARTICLE_LIVE_NONE);
+                        } else {
+                            question.setArticleLive(Constant.ARTICLE_LIVE_ONE);
+                            question.setArticleSlug(object.getJSONObject("stat").getString("question__title_slug"));
                         }
-                    } else if (object.containsKey("solutionNum")) {
-                        question.setArticleLive(Constant.ARTICLE_LIVE_LIST);
                     } else {
-                        question.setArticleLive(Constant.ARTICLE_LIVE_NONE);
+                        question.setArticleLive(Constant.ARTICLE_LIVE_LIST);
                     }
                 } catch (Exception e) {
                     LogUtils.LOG.error("Identify abnormal article", e);
                     question.setArticleLive(Constant.ARTICLE_LIVE_NONE);
                 }
                 questionList.add(question);
             }
+
+            translation(questionList);
+
+            String dayQuestion = questionOfToday();
+
+            Collections.sort(questionList, new Comparator<Question>() {
+                @Override
+                public int compare(Question arg0, Question arg1) {
+                    String frontendId0 = arg0.getFrontendQuestionId();
+                    String frontendId1 = arg1.getFrontendQuestionId();
+                    if (frontendId0.equals(dayQuestion)) {
+                        return -1;
+                    } else if (frontendId1.equals(dayQuestion)) {
+                        return 1;
+                    } else if (StringUtils.isNumeric(frontendId0) && StringUtils.isNumeric(frontendId1)) {
+                        return Integer.valueOf(frontendId0).compareTo(Integer.valueOf(frontendId1));
+                    } else if (StringUtils.isNumeric(frontendId0)) {
+                        return -1;
+                    } else if (StringUtils.isNumeric(frontendId1)) {
+                        return 1;
+                    } else {
+                        return frontendId0.compareTo(frontendId1);
+                    }
+
+                }
+            });
         }
         return questionList;
 
@@ -399,7 +354,7 @@ private static List<Tag> parseTag(String str) {
         return tags;
     }
 
-    private static List<Tag> parseCategory(String str, String categorySlug) {
+    private static List<Tag> parseCategory(String str, String url) {
         List<Tag> tags = new ArrayList<Tag>();
 
         if (StringUtils.isNotBlank(str)) {
@@ -411,7 +366,7 @@ private static List<Tag> parseCategory(String str, String categorySlug) {
                 tag.setSlug(object.getString("slug"));
                 tag.setType(URLUtils.getLeetcodeUrl() + "/api" + object.getString("url").replace("problemset", "problems"));
                 tag.setName(object.getString("title"));
-                if (categorySlug.contains(tag.getSlug())) {
+                if (url.contains(tag.getType())) {
                     tag.setSelect(true);
                 }
                 tags.add(tag);

src/main/java/com/shuzijun/leetcode/plugin/manager/ViewManager.java

@@ -11,6 +11,7 @@
 import com.shuzijun.leetcode.plugin.model.Tag;
 import com.shuzijun.leetcode.plugin.utils.MessageUtils;
 import com.shuzijun.leetcode.plugin.utils.PropertiesUtils;
+import com.shuzijun.leetcode.plugin.utils.URLUtils;
 import com.shuzijun.leetcode.plugin.window.WindowFactory;
 
 import javax.swing.*;
@@ -35,11 +36,11 @@ public class ViewManager {
     private static boolean intersection = Boolean.FALSE;
 
     public static void loadServiceData(JTree tree, Project project) {
-        loadServiceData(tree, project, "");
+        loadServiceData(tree, project, URLUtils.getLeetcodeAll());
     }
 
-    public static void loadServiceData(JTree tree, Project project, String categorySlug) {
-        List<Question> questionList = QuestionManager.getQuestionService(project, categorySlug);
+    public static void loadServiceData(JTree tree, Project project, String url) {
+        List<Question> questionList = QuestionManager.getQuestionService(project, url);
         if (questionList == null || questionList.isEmpty()) {
             MessageUtils.getInstance(project).showWarnMsg("warning", PropertiesUtils.getInfo("response.cache"));
             questionList = QuestionManager.getQuestionCache();
@@ -60,7 +61,7 @@ public String apply(Question question) {
         filter.put(Constant.FIND_TYPE_STATUS, QuestionManager.getStatus());
         filter.put(Constant.FIND_TYPE_LISTS, QuestionManager.getLists());
         filter.put(Constant.FIND_TYPE_TAGS, QuestionManager.getTags());
-        filter.put(Constant.FIND_TYPE_CATEGORY, QuestionManager.getCategory(categorySlug));
+        filter.put(Constant.FIND_TYPE_CATEGORY, QuestionManager.getCategory(url));
 
 
         DefaultTreeModel treeMode = (DefaultTreeModel) tree.getModel();

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

@@ -104,20 +104,6 @@ public void setLevel(Integer level) {
         this.level = level;
     }
 
-    public void setLevel(String difficulty) {
-        if(difficulty == null){
-            this.level = 0;
-        }else if("easy".equalsIgnoreCase(difficulty)){
-            this.level = 1;
-        }else if("medium".equalsIgnoreCase(difficulty)){
-            this.level = 2;
-        }else if("hard".equalsIgnoreCase(difficulty)){
-            this.level = 3;
-        }else {
-            this.level = 0;
-        }
-    }
-
     public String getStatus() {
         return status;
     }

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

@@ -1,7 +1,5 @@
 package com.shuzijun.leetcode.plugin.model;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Comparator;
 import java.util.TreeSet;
 
@@ -17,15 +15,7 @@ public class Tag {
     private TreeSet<String> questions = new TreeSet<String>(new Comparator<String>() {
         @Override
         public int compare(String arg0, String arg1) {
-            if (StringUtils.isNumeric(arg0) && StringUtils.isNumeric(arg1)) {
-                return Integer.valueOf(arg0).compareTo(Integer.valueOf(arg1));
-            } else if (StringUtils.isNumeric(arg0)) {
-                return  -1;
-            } else if (StringUtils.isNumeric(arg1)) {
-                return 1;
-            } else {
-                return arg0.compareTo(arg1);
-            }
+            return Integer.valueOf(arg0).compareTo(Integer.valueOf(arg1));
         }
     });