Merge pull request #41 from shuzijun/dev

Dev

Author: shuzijun

doc/leetcode-editor-V4.3.zip

@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>leetcode-editor</id>
     <name>leetcode editor</name>
-    <version>4.2</version>
+    <version>4.3</version>
     <vendor email="shuzijun0109@gmail.com" url="https://github.com/shuzijun/idea-leetcode-plugin">shuzijun</vendor>
 
     <description><![CDATA[
@@ -102,6 +102,15 @@
 
     <change-notes><![CDATA[
          <ul>
+            <li>v4.3<br>
+                1.修复付费用户订阅题目展示<br>
+                2.修复leetcode-cn.com登陆问题<br>
+            </li>
+            <li>v4.3<br>
+                1.Fix subscription view<br>
+                2.fix leetcode-cn.com login<br>
+            </li>
+
             <li>v4.2<br>
                 1.增加代理<br>
                 2.修复订阅题目展示<br>

resources/META-INF/plugin.xml

@@ -28,7 +28,7 @@ public class LoginAction extends AbstractAsynAction {
     public void perform(AnActionEvent anActionEvent, Config config) {
 
         if (StringUtils.isBlank(HttpClientUtils.getToken())) {
-            HttpGet httpget = new HttpGet(URLUtils.getLeetcodeUrl());
+            HttpGet httpget = new HttpGet(URLUtils.getLeetcodeVerify());
             CloseableHttpResponse response = HttpClientUtils.executeGet(httpget);
             httpget.abort();
             if (response == null) {

src/com/shuzijun/leetcode/plugin/actions/LoginAction.java

@@ -192,16 +192,17 @@ private static List<Question> parseQuestion(String str) {
         List<Question> questionList = new ArrayList<Question>();
 
         if (StringUtils.isNotBlank(str)) {
-
-            JSONArray jsonArray = JSONObject.parseObject(str).getJSONArray("stat_status_pairs");
+            JSONObject jsonObject = JSONObject.parseObject(str);
+            Boolean isPremium = new Integer("1").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.getJSONObject("stat").getString("question__title"));
                 question.setLeaf(Boolean.TRUE);
                 question.setQuestionId(object.getJSONObject("stat").getString("question_id"));
                 question.setFrontendQuestionId(object.getJSONObject("stat").getString("frontend_question_id"));
                 try {
-                    if(object.getBoolean("paid_only")){
+                    if(object.getBoolean("paid_only") && !isPremium){
                         question.setStatus(object.getBoolean("paid_only") ? "lock" : null);
                     }else {
                         question.setStatus(object.get("status") == null ? "" : object.getString("status"));
@@ -255,7 +256,9 @@ private static void translation(List<Question> questions) {
                         translationMap.put(object.getJSONObject("question").getString("questionId"), object.getString("title"));
                     }
                     for (Question question : questions) {
-                        question.setTitle(translationMap.get(question.getQuestionId()));
+                        if(translationMap.containsKey(question.getQuestionId())){
+                            question.setTitle(translationMap.get(question.getQuestionId()));
+                        }
                     }
                 } else {
                     logger.error("读取翻译内容为空");

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

@@ -176,6 +176,7 @@ public static void resetHttpclient() {
                 e.printStackTrace();
             } finally {
                 httpclient = null;
+                context = null;
             }
         }
     }

src/com/shuzijun/leetcode/plugin/utils/HttpClientUtils.java

@@ -8,8 +8,8 @@
  */
 public class URLUtils {
 
-    public static final String leetcode="leetcode.com";
-    public static final String leetcodecn="leetcode-cn.com";
+    public static final String leetcode = "leetcode.com";
+    public static final String leetcodecn = "leetcode-cn.com";
 
     private static String leetcodeUrl = "https://";
     private static String leetcodeLogin = "/accounts/login/";
@@ -21,7 +21,7 @@ public class URLUtils {
     private static String leetcodeSubmissions = "/submissions/detail/";
     private static String leetcodeTags = "/problems/api/tags/";
     private static String leetcodeFavorites = "/problems/api/favorites/";
-
+    private static String leetcodeVerify = "/problemset/all/";
 
     public static String getLeetcodeHost() {
         String host = PersistentConfig.getInstance().getConfig().getUrl();
@@ -71,6 +71,10 @@ public static String getLeetcodeFavorites() {
         return getLeetcodeUrl() + leetcodeFavorites;
     }
 
+    public static String getLeetcodeVerify() {
+        return getLeetcodeUrl() + leetcodeVerify;
+    }
+
     public static String getDescContent() {
         if ("leetcode.com".equals(getLeetcodeHost())) {
             return "content";