Merge remote-tracking branch 'origin/feature/x' into feature/x

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineCloudConstants.java

@@ -0,0 +1,66 @@
+package com.fr.design.actions.help.alphafine;
+
+import com.fr.general.CloudCenter;
+
+/**
+ * 需要从云端获取的常量单独放一起
+ * 以防AlphaFineConstants被加载时，CloudCenter还没启动，导致常量获取不到。
+ *
+ * @author Link
+ * @version 11.0
+ * Created by Link on 2022/9/21
+ */
+public class AlphaFineCloudConstants {
+
+    public static final String PLUGIN_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("plugin.searchAPI");
+
+    public static final String SEARCH_ALL_PLUGIN_URL = CloudCenter.getInstance().acquireUrlByKind("plugin.all.searchAPI");
+
+    public static final String PLUGIN_URL = CloudCenter.getInstance().acquireUrlByKind("af.pluginInfo");
+
+    public static final String REUSE_URL = CloudCenter.getInstance().acquireUrlByKind("af.reuseInfo");
+
+    public static final String DOCUMENT_DOC_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_view");
+
+    public static final String DOCUMENT_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_search");
+
+    public static final String DOCUMENT_INFORMATION_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_info");
+
+    public static final String PLUGIN_IMAGE_URL = CloudCenter.getInstance().acquireUrlByKind("af.plugin_image");
+
+    public static final String CLOUD_SERVER_URL = CloudCenter.getInstance().acquireUrlByKind("af.record");
+
+    public static final String SEARCH_API = CloudCenter.getInstance().acquireUrlByKind("af.cloud_search");
+
+    public static final String SIMILAR_SEARCH_URL_PREFIX = CloudCenter.getInstance().acquireUrlByKind("af.similar_search");
+
+    public static final String COMPLEMENT_ADVICE_SEARCH_URL_PREFIX = CloudCenter.getInstance().acquireUrlByKind("af.advice_search");
+
+    public static final String ALPHA_HOT_SEARCH = CloudCenter.getInstance().acquireUrlByKind("af.hot_search");
+
+    public static final String ALPHA_GO_TO_FORUM = CloudCenter.getInstance().acquireUrlByKind("af.go_fourm");
+
+    public static final String ALPHA_GO_TO_WEB = CloudCenter.getInstance().acquireUrlByKind("af.go_web");
+
+    public static final String ALPHA_PREVIEW = CloudCenter.getInstance().acquireUrlByKind("af.preview");
+
+    public static final String ALPHA_CID = CloudCenter.getInstance().acquireUrlByKind("af.cid.new");
+
+    public static final String ALPHA_CID_USER_GROUP_INFO = CloudCenter.getInstance().acquireUrlByKind("af.cid.user.group.info");
+
+    private static final String QUICK_START_URL = CloudCenter.getInstance().acquireUrlByKind("af.help.quick.start");
+
+    private static final String REPORT_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.report.learning.path");
+
+    private static final String PARAMETER_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.param.learning.path");
+
+    private static final String FILL_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.fill.learning.path");
+
+    private static final String API_SUMMARY = CloudCenter.getInstance().acquireUrlByKind("af.help.api.summary");
+
+    private static final String MONTHLY_DOCUMENT = CloudCenter.getInstance().acquireUrlByKind("af.help.monthly.document");
+
+    private static final String DEFAULT_RECOMMEND = "[     {         \"name\":\"快速入门指南\",         \"link\":\"" + QUICK_START_URL + "\"     },     {         \"name\":\"报表应用学习路径\",         \"link\":\"" + REPORT_LEARNING_PATH + "\"     },     {         \"name\":\"参数应用学习路径\",         \"link\":\"" + PARAMETER_LEARNING_PATH + "\"     },     {         \"name\":\"填报学习路径\",         \"link\":\"" + FILL_LEARNING_PATH + "\"     },     {         \"name\":\"API接口汇总\",         \"link\":\"" + API_SUMMARY + "\"     },     {         \"name\":\"文档月刊\",         \"link\":\"" + MONTHLY_DOCUMENT + "\"     } ]";
+
+    public static final String ALPHA_HELP_RECOMMEND = CloudCenter.getInstance().acquireUrlByKind("af.recommend", DEFAULT_RECOMMEND);
+}

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConstants.java

@@ -4,7 +4,6 @@ import com.fr.base.extension.FileExtension;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.DesignUtils;
-import com.fr.general.CloudCenter;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
@@ -68,11 +67,9 @@ public class AlphaFineConstants {
 
     /**
      * 帮助文档搜索间隔（ms） api限制了1s之内只能搜索一次
-     *
      */
     public static final long DOCUMENT_SEARCH_GAP = 1000;
 
-
     public static final Dimension FULL_SIZE = new Dimension(680, 460);
 
     public static final Dimension CONTENT_SIZE = new Dimension(680, 405);
@@ -126,27 +123,6 @@ public class AlphaFineConstants {
 
     public static final String ALPHA_HOT_IMAGE_NAME = "alphafine_hot";
 
-    public static final String PLUGIN_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("plugin.searchAPI");
-
-    public static final String SEARCH_ALL_PLUGIN_URL = CloudCenter.getInstance().acquireUrlByKind("plugin.all.searchAPI");
-
-    public static final String PLUGIN_URL = CloudCenter.getInstance().acquireUrlByKind("af.pluginInfo");
-
-    public static final String REUSE_URL = CloudCenter.getInstance().acquireUrlByKind("af.reuseInfo");
-
-
-    public static final String DOCUMENT_DOC_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_view");
-
-    public static final String DOCUMENT_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_search");
-
-    public static final String DOCUMENT_INFORMATION_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_info");
-
-    public static final String PLUGIN_IMAGE_URL = CloudCenter.getInstance().acquireUrlByKind("af.plugin_image");
-
-    public static final String CLOUD_SERVER_URL = CloudCenter.getInstance().acquireUrlByKind("af.record");
-
-    public static final String SEARCH_API = CloudCenter.getInstance().acquireUrlByKind("af.cloud_search");
-
     public static final String SPECIAL_CHARACTER_REGEX = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】'；：”“’。，、？]";
 
     public static final String BOTTOM_REGEX_FIRST = "<div class=\"bang\">([\\s\\S]*?)class=\"jiaoyes\">YES</a><br/>";
@@ -159,36 +135,8 @@ public class AlphaFineConstants {
 
     public static final String ALPHA_ROBOT_SEARCH_TOKEN = "K8dl0Np6l0gs";
 
-    public static final String SIMILAR_SEARCH_URL_PREFIX = CloudCenter.getInstance().acquireUrlByKind("af.similar_search");
-
-    public static final String COMPLEMENT_ADVICE_SEARCH_URL_PREFIX = CloudCenter.getInstance().acquireUrlByKind("af.advice_search");
-
-    public static final String ALPHA_HOT_SEARCH = CloudCenter.getInstance().acquireUrlByKind("af.hot_search");
-
-    public static final String ALPHA_GO_TO_FORUM = CloudCenter.getInstance().acquireUrlByKind("af.go_fourm");
-
-    public static final String ALPHA_GO_TO_WEB = CloudCenter.getInstance().acquireUrlByKind("af.go_web");
-
-    public static final String ALPHA_PREVIEW = CloudCenter.getInstance().acquireUrlByKind("af.preview");
-
-    public static final String ALPHA_CID = CloudCenter.getInstance().acquireUrlByKind("af.cid.new");
-
-    public static final String ALPHA_CID_USER_GROUP_INFO = CloudCenter.getInstance().acquireUrlByKind("af.cid.user.group.info");
-
     public static final String SEARCH_BY_ID = "?id=";
 
-    private static final String QUICK_START_URL = CloudCenter.getInstance().acquireUrlByKind("af.help.quick.start");
-    private static final String REPORT_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.report.learning.path");
-    private static final String PARAMETER_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.param.learning.path");
-    private static final String FILL_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.fill.learning.path");
-    private static final String API_SUMMARY = CloudCenter.getInstance().acquireUrlByKind("af.help.api.summary");
-    private static final String MONTHLY_DOCUMENT = CloudCenter.getInstance().acquireUrlByKind("af.help.monthly.document");
-
-
-    private static final String DEFAULT_RECOMMEND = "[     {         \"name\":\"快速入门指南\",         \"link\":\"" + QUICK_START_URL + "\"     },     {         \"name\":\"报表应用学习路径\",         \"link\":\"" + REPORT_LEARNING_PATH + "\"     },     {         \"name\":\"参数应用学习路径\",         \"link\":\"" + PARAMETER_LEARNING_PATH + "\"     },     {         \"name\":\"填报学习路径\",         \"link\":\"" + FILL_LEARNING_PATH + "\"     },     {         \"name\":\"API接口汇总\",         \"link\":\"" + API_SUMMARY + "\"     },     {         \"name\":\"文档月刊\",         \"link\":\"" + MONTHLY_DOCUMENT + "\"     } ]";
-
-    public static final String ALPHA_HELP_RECOMMEND = CloudCenter.getInstance().acquireUrlByKind("af.recommend", DEFAULT_RECOMMEND);
-
     public static final String JAVASCRIPT_PREFIX = "javascript:SendJava";
 
     public static final String CHINESE_CHARACTERS = "[\\u4e00-\\u9fa5]";

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/BottomModel.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe.alphafine.cell.model;
 
-import com.fr.design.actions.help.alphafine.AlphaFineConstants;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.mainframe.alphafine.CellType;
 import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
@@ -48,7 +48,7 @@ public class BottomModel extends AlphaCellModel {
     @Override
     public void doAction() {
         try {
-            Desktop.getDesktop().browse(new URI(AlphaFineConstants.ALPHA_GO_TO_FORUM));
+            Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.ALPHA_GO_TO_FORUM));
         } catch (IOException | URISyntaxException e) {
             FineLoggerFactory.getLogger().error(e.getMessage());
         }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe.alphafine.cell.model;
 
-import com.fr.design.actions.help.alphafine.AlphaFineConstants;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.mainframe.alphafine.CellType;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
@@ -26,8 +26,8 @@ public class DocumentModel extends AlphaCellModel {
     public DocumentModel(String name, String content, int documentId) {
         super(name, content, CellType.DOCUMENT);
         this.documentId = documentId;
-        this.informationUrl = AlphaFineConstants.DOCUMENT_INFORMATION_URL + documentId;
+        this.informationUrl = AlphaFineCloudConstants.DOCUMENT_INFORMATION_URL + documentId;
-        this.documentUrl = AlphaFineConstants.DOCUMENT_DOC_URL + documentId + ".html";
+        this.documentUrl = AlphaFineCloudConstants.DOCUMENT_DOC_URL + documentId + ".html";
     }
 
     public DocumentModel(String name, String content, int documentId, int searchCount) {

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe.alphafine.cell.model;
 
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.extra.WebViewDlgHelper;
-import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.CellType;
 import com.fr.json.JSONObject;
 import com.fr.stable.StringUtils;
@@ -36,9 +36,9 @@ public class PluginModel extends AlphaCellModel {
         this.price = price;
         this.pluginId = pluginId;
         if (getType() == CellType.PLUGIN) {
-            this.informationUrl = AlphaFineConstants.PLUGIN_URL + id;
+            this.informationUrl = AlphaFineCloudConstants.PLUGIN_URL + id;
         } else {
-            this.informationUrl = AlphaFineConstants.REUSE_URL + id;
+            this.informationUrl = AlphaFineCloudConstants.REUSE_URL + id;
         }
     }
 

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.alphafine.cell.model;
 
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.CellType;
 import com.fr.general.http.HttpToolbox;
@@ -46,7 +47,7 @@ public class RobotModel extends AlphaCellModel {
 
     public static String getContent(String titleStr) {
         String token = DigestUtils.md5Hex(AlphaFineConstants.ALPHA_ROBOT_SEARCH_TOKEN + titleStr);
-        String url = AlphaFineConstants.ALPHA_GO_TO_WEB + titleStr + "&token=" + token;
+        String url = AlphaFineCloudConstants.ALPHA_GO_TO_WEB + titleStr + "&token=" + token;
 
         try {
             String result = HttpToolbox.get(url);
@@ -83,7 +84,7 @@ public class RobotModel extends AlphaCellModel {
     @Override
     public void doAction() {
         try {
-            Desktop.getDesktop().browse(new URI(AlphaFineConstants.ALPHA_PREVIEW + URLEncoder.encode(super.getName(), EncodeConstants.ENCODING_UTF_8)));
+            Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.ALPHA_PREVIEW + URLEncoder.encode(super.getName(), EncodeConstants.ENCODING_UTF_8)));
         } catch (IOException e) {
             FineLoggerFactory.getLogger().error(e.getMessage());
         } catch (URISyntaxException e) {

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -2,12 +2,13 @@ package com.fr.design.mainframe.alphafine.component;
 
 import com.bulenkov.iconloader.IconLoader;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
+import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.cell.CellModelHelper;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
@@ -39,10 +40,10 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.stable.CodeUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
-
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.exporter.LocalExportOperator;
 import com.fr.workspace.server.exporter.TemplateExportOperator;
+
 import javax.imageio.ImageIO;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
@@ -968,7 +969,7 @@ public class AlphaFineDialog extends UIDialog {
             String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
             para.put("token", CodeUtils.md5Encode(date, StringUtils.EMPTY, "MD5"));
             para.put("content", object.toString());
-            HttpClient httpClient = new HttpClient(AlphaFineConstants.CLOUD_SERVER_URL, para, true);
+            HttpClient httpClient = new HttpClient(AlphaFineCloudConstants.CLOUD_SERVER_URL, para, true);
             httpClient.asGet();
             if (!httpClient.isServerAlive()) {
                 FineLoggerFactory.getLogger().error("Failed to sent data to server!");

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/HelpDocumentNoResultPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe.alphafine.preview;
 
-import com.fr.design.actions.help.alphafine.AlphaFineConstants;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
@@ -98,7 +98,7 @@ public class HelpDocumentNoResultPane extends JPanel {
 
 
     private Map<String, String> generateMap() {
-        JSONArray jsonArray = JSONFactory.createJSON(JSON.ARRAY, AlphaFineConstants.ALPHA_HELP_RECOMMEND);
+        JSONArray jsonArray = JSONFactory.createJSON(JSON.ARRAY, AlphaFineCloudConstants.ALPHA_HELP_RECOMMEND);
         Map<String, String> linkMap = new LinkedHashMap<>();
         for (int i = 0, len = jsonArray.size(); i < len; i++) {
             JSONObject json = jsonArray.getJSONObject(i);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/NoResultWithLinkPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.alphafine.preview;
 
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.dialog.link.MessageWithLink;
 import com.fr.design.utils.BrowseUtils;
@@ -33,7 +34,7 @@ public class NoResultWithLinkPane extends NoResultPane {
         String[] para1 = title.split(TAG_A_START);
         String[] para2 = para1[1].split(TAG_A_END);
 
-        MessageWithLink messageWithLink = new MessageWithLink(para1[0], para2[0], AlphaFineConstants.ALPHA_GO_TO_FORUM, para2[1], Color.WHITE, DesignUtils.getDefaultGUIFont().applySize(14), AlphaFineConstants.MEDIUM_GRAY) {
+        MessageWithLink messageWithLink = new MessageWithLink(para1[0], para2[0], AlphaFineCloudConstants.ALPHA_GO_TO_FORUM, para2[1], Color.WHITE, DesignUtils.getDefaultGUIFont().applySize(14), AlphaFineConstants.MEDIUM_GRAY) {
             @Override
             protected void initListener(String link) {
 

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/RobotPreviewPane.java

@@ -1,9 +1,10 @@
 package com.fr.design.mainframe.alphafine.preview;
 
 
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
+import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itextarea.UITextArea;
-import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
 import com.fr.design.mainframe.alphafine.cell.model.RobotModel;
 import com.fr.log.FineLoggerFactory;
@@ -60,7 +61,7 @@ public class RobotPreviewPane extends JPanel {
                             .replaceAll("\\('", StringUtils.EMPTY)
                             .replaceAll("'\\)", StringUtils.EMPTY);
                     try {
-                        Desktop.getDesktop().browse(new URI(AlphaFineConstants.ALPHA_PREVIEW + URLEncoder.encode(s, EncodeConstants.ENCODING_UTF_8)));
+                        Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.ALPHA_PREVIEW + URLEncoder.encode(s, EncodeConstants.ENCODING_UTF_8)));
                     } catch (IOException | URISyntaxException e1) {
                         FineLoggerFactory.getLogger().error(e1.getMessage());
                     }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ComplementAdviceManager.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.alphafine.search.manager.impl;
 
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
@@ -40,7 +41,7 @@ public class ComplementAdviceManager {
             SearchResult searchResult = new SearchResult();
             for (int j = 0; j < searchText.length; j++) {
                 String token = DigestUtils.md5Hex(AlphaFineConstants.ALPHA_ROBOT_SEARCH_TOKEN + searchText[j]);
-                String url = AlphaFineConstants.COMPLEMENT_ADVICE_SEARCH_URL_PREFIX + "msg=" + searchText[j] + "&token=" + token;
+                String url = AlphaFineCloudConstants.COMPLEMENT_ADVICE_SEARCH_URL_PREFIX + "msg=" + searchText[j] + "&token=" + token;
                 try {
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.alphafine.search.manager.impl;
 
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.CellType;
@@ -15,6 +16,7 @@ import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
+
 import java.util.concurrent.TimeUnit;
 
 
@@ -69,7 +71,7 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
             searchResult = new SearchResult();
             for (int j = 0; j < searchText.length; j++) {
                 long start = System.currentTimeMillis();
-                String url = AlphaFineConstants.DOCUMENT_SEARCH_URL + searchText[j];
+                String url = AlphaFineCloudConstants.DOCUMENT_SEARCH_URL + searchText[j];
                 try {
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/HotIssuesManager.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe.alphafine.search.manager.impl;
 
-import com.fr.design.actions.help.alphafine.AlphaFineConstants;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
 import com.fr.design.mainframe.alphafine.cell.model.RobotModel;
@@ -75,7 +75,7 @@ public class HotIssuesManager {
     public String[][] getHotIssues() {
 
         try {
-            String result = HttpToolbox.get(AlphaFineConstants.ALPHA_HOT_SEARCH);
+            String result = HttpToolbox.get(AlphaFineCloudConstants.ALPHA_HOT_SEARCH);
             JSONArray jsonArray = JSONFactory.createJSON(JSON.ARRAY, result);
             if(jsonArray != null){
                 for (int i = 0; i < HOT_ITEM_NUM; i++) {

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.alphafine.search.manager.impl;
 
 import com.fr.common.util.Collections;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.CellType;
@@ -73,7 +74,7 @@ public class PluginSearchManager implements AlphaFineSearchProvider {
         int searchCount = object.optInt("searchCount");
         String imageUrl = null;
         try {
-            imageUrl = isFromCloud ? AlphaFineConstants.PLUGIN_IMAGE_URL + URLEncoder.encode(object.optString("pic").toString().substring(AlphaFineConstants.PLUGIN_IMAGE_URL.length()), "utf8") : object.optString("pic");
+            imageUrl = isFromCloud ? AlphaFineCloudConstants.PLUGIN_IMAGE_URL + URLEncoder.encode(object.optString("pic").toString().substring(AlphaFineCloudConstants.PLUGIN_IMAGE_URL.length()), "utf8") : object.optString("pic");
         } catch (UnsupportedEncodingException e) {
             FineLoggerFactory.getLogger().error("plugin icon error: " + e.getMessage());
         }
@@ -125,7 +126,7 @@ public class PluginSearchManager implements AlphaFineSearchProvider {
             for (int j = 0; j < searchText.length; j++) {
                 try {
                     String encodedKey = URLEncoder.encode(searchText[j], EncodeConstants.ENCODING_UTF_8);
-                    String url = AlphaFineConstants.PLUGIN_SEARCH_URL + "?keyword=" + encodedKey;
+                    String url = AlphaFineCloudConstants.PLUGIN_SEARCH_URL + "?keyword=" + encodedKey;
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();
                     JSONObject jsonObject = new JSONObject(result);
@@ -173,7 +174,7 @@ public class PluginSearchManager implements AlphaFineSearchProvider {
     public SearchResult getDefaultResult() {
         this.defaultModelList = new SearchResult();
         try {
-            String url = AlphaFineConstants.SEARCH_ALL_PLUGIN_URL;
+            String url = AlphaFineCloudConstants.SEARCH_ALL_PLUGIN_URL;
             String result = HttpToolbox.get(url);
             AlphaFineHelper.checkCancel();
             JSONObject jsonObject = new JSONObject(result);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ProductNewsSearchManager.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.alphafine.search.manager.impl;
 
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.model.ProductNews;
@@ -82,7 +83,7 @@ public class ProductNewsSearchManager {
     public List<ProductNews> getProductNewsList() throws Exception {
         productNewsList = new ArrayList<>();
         idSet = new HashSet<>();
-        String jsonStr = HttpToolbox.get(AlphaFineConstants.ALPHA_CID);
+        String jsonStr = HttpToolbox.get(AlphaFineCloudConstants.ALPHA_CID);
         AlphaFineHelper.checkCancel();
         JSONObject cidJSON = JSONFactory.createJSON(JSON.OBJECT, jsonStr);
         JSONArray jsonArray = cidJSON.getJSONArray("data");
@@ -150,7 +151,7 @@ public class ProductNewsSearchManager {
      * 根据用户组id，查询用户组信息（改用户组中的所有设计器id）
      * */
     private Set<String> searchUserGroupInfo(String userGroupId) {
-        String url = AlphaFineConstants.ALPHA_CID_USER_GROUP_INFO + AlphaFineConstants.SEARCH_BY_ID + userGroupId;
+        String url = AlphaFineCloudConstants.ALPHA_CID_USER_GROUP_INFO + AlphaFineConstants.SEARCH_BY_ID + userGroupId;
         Set<String> idSet = new HashSet<>();
         try {
             String jsonStr = HttpToolbox.get(url);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.alphafine.search.manager.impl;
 
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.CellType;
@@ -59,7 +60,7 @@ public class RecommendSearchManager implements AlphaFineSearchProvider {
             for (int j = 0; j < searchText.length; j++) {
                 searchText[j] = searchText[j].replaceAll(StringUtils.BLANK, StringUtils.EMPTY);
                 try {
-                    String url = AlphaFineConstants.SEARCH_API + CodeUtils.cjkEncode(searchText[j]);
+                    String url = AlphaFineCloudConstants.SEARCH_API + CodeUtils.cjkEncode(searchText[j]);
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();
                     JSONObject jsonObject = new JSONObject(result);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SimilarSearchManager.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.alphafine.search.manager.impl;
 
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.CellType;
@@ -47,7 +48,7 @@ public class SimilarSearchManager implements AlphaFineSearchProvider {
             SearchResult allModelList = new SearchResult();
             for (int j = 0; j < searchText.length; j++) {
                 String token = DigestUtils.md5Hex(AlphaFineConstants.ALPHA_ROBOT_SEARCH_TOKEN + searchText[j]);
-                String url = AlphaFineConstants.SIMILAR_SEARCH_URL_PREFIX + "msg=" + searchText[j] + "&token=" + token;
+                String url = AlphaFineCloudConstants.SIMILAR_SEARCH_URL_PREFIX + "msg=" + searchText[j] + "&token=" + token;
                 try {
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();