Merge pull request #901 in BA/design from ~XIAOXIA/design:9.0 to 9.0

* commit 'f9120667b1f8262b0e461b19deeb131001b64962':
  bug fix
  rt
  bug fix AOP实现提醒功能

designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj

@@ -35,7 +35,7 @@ public aspect TemplateProcessTracker {
 
 //        String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
     //同上
     before(ActionEvent e) : onActionPerformed(e) {
@@ -47,7 +47,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -56,7 +56,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -66,7 +66,7 @@ public aspect TemplateProcessTracker {
 //        String v = "test";
         //String log = String.format("%s:\n%s\nset value: %s at %s\n\n", new Date(), sl, v, g.getEditingCellElement());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
 
 

designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java

@@ -30,9 +30,9 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor {
     }
     @Override
     public synchronized SearchResult getLessSearchResult(String searchText) {
+        this.modelList = new SearchResult();
         if (DesignerEnvManager.getEnvManager().getAlphafineConfigManager().isContainRecommend()) {
             String result;
-            this.modelList = new SearchResult();
             HttpClient httpClient = new HttpClient(SEARCHAPI + CodeUtils.cjkEncode(searchText));
             httpClient.asGet();
             httpClient.setTimeout(5000);

designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj

@@ -0,0 +1,23 @@
+package com.fr.aspectj.designerbase;
+
+import java.awt.event.ActionEvent;
+
+/**
+ * Created by XiaXiang on 2017/5/25.
+ */
+public aspect AlphaFineReminder {
+    pointcut onActionPerformed(ActionEvent e) :
+            execution(* actionPerformed(ActionEvent)) && args(e);
+
+    before(ActionEvent e) : onActionPerformed(e) {
+        String point = thisJoinPoint.toString();
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
+            return;
+        }
+        if (e != null && e.getSource().getClass().getName().equals("com.fr.design.gui.imenu.UIMenuItem") && point.contains("com.fr.design.actions")) {
+            //System.out.print(thisJoinPoint + "\n");
+        }
+
+
+    }
+}

designer_base/src/com/fr/aspectj/designerbase/TemplateProcessTracker.aj

@@ -32,7 +32,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
     //同上
     before(ActionEvent e) : onActionPerformed(e) {
@@ -44,7 +44,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -53,7 +53,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+       // TemplateInfoCollector.appendProcess(log);
     }
 
 

designer_base/src/com/fr/design/extra/LoginWebBridge.java

@@ -146,7 +146,7 @@ public class LoginWebBridge {
                             if (res.equals(FAILED_MESSAGE_STATUS)) {
                             } else {
                                 JSONObject jo = new JSONObject(res);
-                                if (jo.getString("status").equals(SUCCESS_MESSAGE_STATUS)) {
+                                if (jo.optString("status").equals(SUCCESS_MESSAGE_STATUS)) {
                                     setMessageCount(Integer.parseInt(jo.getString("message")));
                                 }
                             }

designer_chart/src/com/fr/aspectj/designerchart/TemplateProcessTracker.aj

@@ -32,7 +32,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
     //同上
     before(ActionEvent e) : onActionPerformed(e) {
@@ -44,7 +44,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -52,7 +52,7 @@ public aspect TemplateProcessTracker {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
         //String log = String.format("%s:\n%s\n插入新图表：%s\n\n", new Date(), sl, c.getChartName());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
 

designer_form/src/com/fr/aspectj/designerform/TemplateProcessTracker.aj

@@ -30,7 +30,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
     //同上
     before(ActionEvent e) : onActionPerformed(e) {
@@ -42,7 +42,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -51,7 +51,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }