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

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

@@ -1,10 +1,14 @@
 package com.fr.design.actions.help.alphafine;
 
+import com.fr.design.i18n.Toolkit;
 import com.fr.general.CloudCenter;
+import com.fr.json.JSONArray;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * 需要从云端获取的常量单独放一起
- * 以防AlphaFineConstants被加载时，CloudCenter还没启动，导致常量获取不到。
+ * 云端变量统一管理
  *
  * @author Link
  * @version 11.0
@@ -12,55 +16,185 @@ import com.fr.general.CloudCenter;
  */
 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");
+    private static final String PLUGIN_SEARCH_API = "plugin.searchAPI";
+    private static final String PLUGIN_ALL_SEARCH_API = "plugin.all.searchAPI";
+    private static final String AF_PLUGIN_INFO = "af.pluginInfo";
+    private static final String AF_REUSE_INFO = "af.reuseInfo";
+    private static final String AF_DOC_VIEW = "af.doc_view";
+    private static final String AF_DOC_SEARCH = "af.doc_search";
+    private static final String AF_DOC_INFO = "af.doc_info";
+    private static final String AF_PLUGIN_IMAGE = "af.plugin_image";
+    private static final String AF_RECORD = "af.record";
+    private static final String AF_CLOUD_SEARCH = "af.cloud_search";
+    private static final String AF_SIMILAR_SEARCH = "af.similar_search";
+    private static final String AF_ADVICE_SEARCH = "af.advice_search";
+    private static final String AF_HOT_SEARCH = "af.hot_search";
+    private static final String AF_GO_FORUM = "af.go_fourm";
+    private static final String AF_GO_WEB = "af.go_web";
+    private static final String AF_PREVIEW = "af.preview";
+    private static final String AF_CID_NEW = "af.cid.new";
+    private static final String AF_CID_USER_GROUP_INFO = "af.cid.user.group.info";
+    private static final String AF_HELP_QUICK_START = "af.help.quick.start";
+    private static final String AF_HELP_REPORT_LEARNING_PATH = "af.help.report.learning.path";
+    private static final String AF_HELP_PARAM_LEARNING_PATH = "af.help.param.learning.path";
+    private static final String AF_HELP_FILL_LEARNING_PATH = "af.help.fill.learning.path";
+    private static final String AF_HELP_API_SUMMARY = "af.help.api.summary";
+    private static final String AF_HELP_MONTHLY_DOCUMENT = "af.help.monthly.document";
+    private static final String AF_RECOMMEND = "af.recommend";
+
+    private static final String LINK_NAME = "name";
+    private static final String LINK_URL = "link";
 
-    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");
+    /**
+     * 获取插件搜索api
+     */
+    public static String getPluginSearchUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(PLUGIN_SEARCH_API);
+    };
 
-    public static final String DOCUMENT_INFORMATION_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_info");
+    /**
+     * 帆软市场里全部插件api
+     */
+    public static String getSearchAllPluginUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(PLUGIN_ALL_SEARCH_API);
+    }
 
-    public static final String PLUGIN_IMAGE_URL = CloudCenter.getInstance().acquireUrlByKind("af.plugin_image");
+    /**
+     * 获取插件信息api
+     */
+    public static String getPluginUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_PLUGIN_INFO);
+    }
 
-    public static final String CLOUD_SERVER_URL = CloudCenter.getInstance().acquireUrlByKind("af.record");
+    /**
+     * 获取组件信息api
+     */
+    public static String getReuseUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_REUSE_INFO);
+    }
 
-    public static final String SEARCH_API = CloudCenter.getInstance().acquireUrlByKind("af.cloud_search");
+    /**
+     * 获取帮助文档url
+     */
+    public static String getDocumentDocUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_DOC_VIEW);
+    }
 
-    public static final String SIMILAR_SEARCH_URL_PREFIX = CloudCenter.getInstance().acquireUrlByKind("af.similar_search");
+    /**
+     * 帮助文档搜索api
+     */
+    public static String getDocumentSearchUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_DOC_SEARCH);
+    }
 
-    public static final String COMPLEMENT_ADVICE_SEARCH_URL_PREFIX = CloudCenter.getInstance().acquireUrlByKind("af.advice_search");
+    /**
+     * 帮助文档信息api
+     */
+    public static String getDocumentInformationUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_DOC_INFO);
+    }
 
-    public static final String ALPHA_HOT_SEARCH = CloudCenter.getInstance().acquireUrlByKind("af.hot_search");
+    /**
+     * 插件图片api
+     */
+    public static String getPluginImageUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_PLUGIN_IMAGE);
+    }
 
-    public static final String ALPHA_GO_TO_FORUM = CloudCenter.getInstance().acquireUrlByKind("af.go_fourm");
+    /**
+     * 获取云端接口，用于上传alphafine搜索记录
+     */
+    public static String getCloudServerUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_RECORD);
+    }
 
-    public static final String ALPHA_GO_TO_WEB = CloudCenter.getInstance().acquireUrlByKind("af.go_web");
+    /**
+     * 获取搜索api，输入搜索词，返回fr的相关功能
+     */
+    public static String getSearchApi() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_CLOUD_SEARCH);
+    }
 
-    public static final String ALPHA_PREVIEW = CloudCenter.getInstance().acquireUrlByKind("af.preview");
+    /**
+     * 获取模糊搜索api前缀，输入搜索词，返回alphaFine相关内容，插件，文档，功能等
+     */
+    public static String getSimilarSearchUrlPrefix() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_SIMILAR_SEARCH);
+    }
 
-    public static final String ALPHA_CID = CloudCenter.getInstance().acquireUrlByKind("af.cid.new");
+    /**
+     * 补全建议搜索结果 api，与AF_SIMILAR_SEARCH接口类似，但是返回的信息更全
+     */
+    public static String getComplementAdviceSearchUrlPrefix() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_ADVICE_SEARCH);
+    }
 
-    public static final String ALPHA_CID_USER_GROUP_INFO = CloudCenter.getInstance().acquireUrlByKind("af.cid.user.group.info");
+    /**
+     * 获取热门问题
+     */
+    public static String getAlphaHotSearch() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_HOT_SEARCH);
+    }
 
-    private static final String QUICK_START_URL = CloudCenter.getInstance().acquireUrlByKind("af.help.quick.start");
+    /**
+     * 跳转论坛url
+     */
+    public static String getAlphaGoToForum() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_GO_FORUM);
+    }
 
-    private static final String REPORT_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.report.learning.path");
+    /**
+     * 推荐搜索api，输入搜索词，返回猜你想搜的内容（html格式）
+     */
+    public static String getAlphaGoToWeb() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_GO_WEB);
+    }
 
-    private static final String PARAMETER_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.param.learning.path");
+    /**
+     * 帆软智能客服页面url
+     */
+    public static String getAlphaPreview() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_PREVIEW);
+    }
 
-    private static final String FILL_LEARNING_PATH = CloudCenter.getInstance().acquireUrlByKind("af.help.fill.learning.path");
+    /**
+     * cid系统的产品动态api
+     */
+    public static String getAlphaCid() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_CID_NEW);
+    }
 
-    private static final String API_SUMMARY = CloudCenter.getInstance().acquireUrlByKind("af.help.api.summary");
+    /**
+     * cid系统的 用户组信息api
+     */
+    public static String getAlphaCidUserGroupInfo() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_CID_USER_GROUP_INFO);
+    }
 
-    private static final String MONTHLY_DOCUMENT = CloudCenter.getInstance().acquireUrlByKind("af.help.monthly.document");
+    private static String getDefaultRecommend() {
+        String[][] links = new String[][]{
+            {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Quick_Start"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_QUICK_START)},
+            {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Report_Learning"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_REPORT_LEARNING_PATH)},
+            {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Parameter_Learning"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_PARAM_LEARNING_PATH)},
+            {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Fill_Learning"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_FILL_LEARNING_PATH)},
+            {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Api_Summary"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_API_SUMMARY)},
+            {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Monthly_Document"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_MONTHLY_DOCUMENT)}
+        };
+        JSONArray jsonArray = new JSONArray();
+        for (String[] link : links) {
+            Map<String, String> map = new HashMap<>();
+            map.put(LINK_NAME, link[0]);
+            map.put(LINK_URL, link[1]);
+            jsonArray.put(map);
+        }
 
-    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 + "\"     } ]";
+        return jsonArray.toString();
+    }
 
-    public static final String ALPHA_HELP_RECOMMEND = CloudCenter.getInstance().acquireUrlByKind("af.recommend", DEFAULT_RECOMMEND);
+    /**
+     * 获取默认推荐帮助文档url
+     */
+    public static String getAlphaHelpRecommend() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_RECOMMEND, getDefaultRecommend());
+    }
 }

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

@@ -48,7 +48,7 @@ public class BottomModel extends AlphaCellModel {
     @Override
     public void doAction() {
         try {
-            Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.ALPHA_GO_TO_FORUM));
+            Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.getAlphaGoToForum()));
         } catch (IOException | URISyntaxException e) {
             FineLoggerFactory.getLogger().error(e.getMessage());
         }

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

@@ -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 = AlphaFineCloudConstants.DOCUMENT_INFORMATION_URL + documentId;
-        this.documentUrl = AlphaFineCloudConstants.DOCUMENT_DOC_URL + documentId + ".html";
+        this.informationUrl = AlphaFineCloudConstants.getDocumentInformationUrl() + documentId;
+        this.documentUrl = AlphaFineCloudConstants.getDocumentDocUrl() + 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

@@ -36,9 +36,9 @@ public class PluginModel extends AlphaCellModel {
         this.price = price;
         this.pluginId = pluginId;
         if (getType() == CellType.PLUGIN) {
-            this.informationUrl = AlphaFineCloudConstants.PLUGIN_URL + id;
+            this.informationUrl = AlphaFineCloudConstants.getPluginUrl() + id;
         } else {
-            this.informationUrl = AlphaFineCloudConstants.REUSE_URL + id;
+            this.informationUrl = AlphaFineCloudConstants.getReuseUrl() + id;
         }
     }
 
@@ -98,11 +98,21 @@ public class PluginModel extends AlphaCellModel {
 
     @Override
     public void doAction() {
-    
-        if (StringUtils.isBlank(this.pluginId) || !WorkContext.getCurrent().isLocal()) {
+        if (StringUtils.isBlank(this.pluginId) && StringUtils.isBlank(this.getName())) {
+            return;
+        }
+        if (!WorkContext.getCurrent().isLocal()) {
             return;
         }
-        WebViewDlgHelper.createPluginDialog(getName());
+        openPluginStore(getName());
+    }
+
+    /**
+     * 打开插件商城
+     * 方便埋点
+     */
+    private void openPluginStore(String name) {
+        WebViewDlgHelper.createPluginDialog(name);
     }
 
     @Override

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.base.login.ClientHelper;
 import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.CellType;
@@ -46,8 +47,9 @@ public class RobotModel extends AlphaCellModel {
     }
 
     public static String getContent(String titleStr) {
+        String encodedTitleStr = ClientHelper.urlEncode(titleStr, EncodeConstants.ENCODING_UTF_8);
         String token = DigestUtils.md5Hex(AlphaFineConstants.ALPHA_ROBOT_SEARCH_TOKEN + titleStr);
-        String url = AlphaFineCloudConstants.ALPHA_GO_TO_WEB + titleStr + "&token=" + token;
+        String url = AlphaFineCloudConstants.getAlphaGoToWeb() + encodedTitleStr + "&token=" + token;
 
         try {
             String result = HttpToolbox.get(url);
@@ -84,7 +86,7 @@ public class RobotModel extends AlphaCellModel {
     @Override
     public void doAction() {
         try {
-            Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.ALPHA_PREVIEW + URLEncoder.encode(super.getName(), EncodeConstants.ENCODING_UTF_8)));
+            Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.getAlphaPreview() + 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

@@ -969,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(AlphaFineCloudConstants.CLOUD_SERVER_URL, para, true);
+            HttpClient httpClient = new HttpClient(AlphaFineCloudConstants.getCloudServerUrl(), 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

@@ -98,7 +98,7 @@ public class HelpDocumentNoResultPane extends JPanel {
 
 
     private Map<String, String> generateMap() {
-        JSONArray jsonArray = JSONFactory.createJSON(JSON.ARRAY, AlphaFineCloudConstants.ALPHA_HELP_RECOMMEND);
+        JSONArray jsonArray = JSONFactory.createJSON(JSON.ARRAY, AlphaFineCloudConstants.getAlphaHelpRecommend());
         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

@@ -34,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], AlphaFineCloudConstants.ALPHA_GO_TO_FORUM, para2[1], Color.WHITE, DesignUtils.getDefaultGUIFont().applySize(14), AlphaFineConstants.MEDIUM_GRAY) {
+        MessageWithLink messageWithLink = new MessageWithLink(para1[0], para2[0], AlphaFineCloudConstants.getAlphaGoToForum(), 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

@@ -61,7 +61,7 @@ public class RobotPreviewPane extends JPanel {
                             .replaceAll("\\('", StringUtils.EMPTY)
                             .replaceAll("'\\)", StringUtils.EMPTY);
                     try {
-                        Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.ALPHA_PREVIEW + URLEncoder.encode(s, EncodeConstants.ENCODING_UTF_8)));
+                        Desktop.getDesktop().browse(new URI(AlphaFineCloudConstants.getAlphaPreview() + 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/helper/FineMarketClientHelper.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.alphafine.search.helper;
 
+import com.fr.base.login.ClientHelper;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.extra.PluginConstants;
 import com.fr.design.mainframe.alphafine.download.FineMarketDownloadManager;
@@ -12,6 +13,7 @@ import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.market.key.FineMarketPublicKeyHolder;
 import com.fr.security.SecurityToolbox;
+import com.fr.stable.EncodeConstants;
 import com.fr.stable.StableUtils;
 import com.fr.third.org.apache.http.HttpEntity;
 import com.fr.third.org.apache.http.HttpException;
@@ -48,11 +50,13 @@ public class FineMarketClientHelper {
     private static final String CERTIFICATE_PUBLIC_KEY = FineMarketPublicKeyHolder.getInstance().getDefaultKey();
     public static final String FINE_MARKET_TEMPLATE_INFO = CloudCenter.getInstance().acquireUrlByKind("market.template.info");
     public static final String FINE_MARKET_TEMPLATE_URL = CloudCenter.getInstance().acquireUrlByKind("market.template.url");
+    public static final String VERSION = "version";
+    private static final String CURRENT_VERSION = "11.0";
     public static final String FILE_DOWNLOAD = "file/download/";
     public static final String PACKAGE_DOWNLOAD = "package/download/";
     public static final String TEMPLATES_PARENT_PACKAGE = "parent/";
     public static final String TEMPLATES_TAGS = "filter";
-    public static final String NAME_SEARCH = "?searchKeyword=";
+    public static final String NAME_SEARCH = "searchKeyword";
 
     public static final String RESPONSE_STATE = "state";
     public static final String RESPONSE_SUCCESS = "ok";
@@ -268,8 +272,10 @@ public class FineMarketClientHelper {
     }
 
     public @Nullable JSONArray getTemplateInfoByName(String name) throws IOException {
-        String url = FINE_MARKET_TEMPLATE_INFO + NAME_SEARCH + name;
-        String jsonString = HttpToolbox.get(url);
+        Map<String, String> params = new HashMap();
+        params.put(NAME_SEARCH, name);
+        params.put(VERSION, CURRENT_VERSION);
+        String jsonString = HttpToolbox.get(FINE_MARKET_TEMPLATE_INFO, params);
         JSONObject jsonObject = new JSONObject(jsonString);
         String responseState = (String) jsonObject.get(RESPONSE_STATE);
         if (RESPONSE_SUCCESS.equals(responseState)) {
@@ -323,7 +329,7 @@ public class FineMarketClientHelper {
      * */
     private void initTags() throws IOException {
         tags = new HashMap<>();
-        String url = FINE_MARKET_TEMPLATE_INFO + TEMPLATES_TAGS;
+        String url = FINE_MARKET_TEMPLATE_INFO + ClientHelper.urlEncode(TEMPLATES_TAGS, EncodeConstants.ENCODING_UTF_8);
         String jsonString = HttpToolbox.get(url);
         JSONObject jsonObject = new JSONObject(jsonString);
         String responseState = (String) jsonObject.get(RESPONSE_STATE);

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

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.alphafine.search.manager.impl;
 
+import com.fr.base.login.ClientHelper;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
@@ -7,6 +8,7 @@ import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
 import com.fr.general.http.HttpToolbox;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.EncodeConstants;
 import com.fr.third.org.apache.commons.codec.digest.DigestUtils;
 
 
@@ -40,8 +42,9 @@ public class ComplementAdviceManager {
         if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isNeedIntelligentCustomerService()) {
             SearchResult searchResult = new SearchResult();
             for (int j = 0; j < searchText.length; j++) {
+                String msg = ClientHelper.urlEncode(searchText[j], EncodeConstants.ENCODING_UTF_8);
                 String token = DigestUtils.md5Hex(AlphaFineConstants.ALPHA_ROBOT_SEARCH_TOKEN + searchText[j]);
-                String url = AlphaFineCloudConstants.COMPLEMENT_ADVICE_SEARCH_URL_PREFIX + "msg=" + searchText[j] + "&token=" + token;
+                String url = AlphaFineCloudConstants.getComplementAdviceSearchUrlPrefix() + "msg=" + msg + "&token=" + ClientHelper.urlEncode(token, EncodeConstants.ENCODING_UTF_8);
                 try {
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();

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

@@ -71,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 = AlphaFineCloudConstants.DOCUMENT_SEARCH_URL + searchText[j];
+                String url = AlphaFineCloudConstants.getDocumentSearchUrl() + 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

@@ -75,7 +75,7 @@ public class HotIssuesManager {
     public String[][] getHotIssues() {
 
         try {
-            String result = HttpToolbox.get(AlphaFineCloudConstants.ALPHA_HOT_SEARCH);
+            String result = HttpToolbox.get(AlphaFineCloudConstants.getAlphaHotSearch());
             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

@@ -74,7 +74,7 @@ public class PluginSearchManager implements AlphaFineSearchProvider {
         int searchCount = object.optInt("searchCount");
         String imageUrl = null;
         try {
-            imageUrl = isFromCloud ? AlphaFineCloudConstants.PLUGIN_IMAGE_URL + URLEncoder.encode(object.optString("pic").toString().substring(AlphaFineCloudConstants.PLUGIN_IMAGE_URL.length()), "utf8") : object.optString("pic");
+            imageUrl = isFromCloud ? AlphaFineCloudConstants.getPluginImageUrl() + URLEncoder.encode(object.optString("pic").toString().substring(AlphaFineCloudConstants.getPluginImageUrl().length()), "utf8") : object.optString("pic");
         } catch (UnsupportedEncodingException e) {
             FineLoggerFactory.getLogger().error("plugin icon error: " + e.getMessage());
         }
@@ -126,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 = AlphaFineCloudConstants.PLUGIN_SEARCH_URL + "?keyword=" + encodedKey;
+                    String url = AlphaFineCloudConstants.getPluginSearchUrl() + "?keyword=" + encodedKey;
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();
                     JSONObject jsonObject = new JSONObject(result);
@@ -174,7 +174,7 @@ public class PluginSearchManager implements AlphaFineSearchProvider {
     public SearchResult getDefaultResult() {
         this.defaultModelList = new SearchResult();
         try {
-            String url = AlphaFineCloudConstants.SEARCH_ALL_PLUGIN_URL;
+            String url = AlphaFineCloudConstants.getSearchAllPluginUrl();
             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

@@ -83,7 +83,7 @@ public class ProductNewsSearchManager {
     public List<ProductNews> getProductNewsList() throws Exception {
         productNewsList = new ArrayList<>();
         idSet = new HashSet<>();
-        String jsonStr = HttpToolbox.get(AlphaFineCloudConstants.ALPHA_CID);
+        String jsonStr = HttpToolbox.get(AlphaFineCloudConstants.getAlphaCid());
         AlphaFineHelper.checkCancel();
         JSONObject cidJSON = JSONFactory.createJSON(JSON.OBJECT, jsonStr);
         JSONArray jsonArray = cidJSON.getJSONArray("data");
@@ -151,7 +151,7 @@ public class ProductNewsSearchManager {
      * 根据用户组id，查询用户组信息（改用户组中的所有设计器id）
      * */
     private Set<String> searchUserGroupInfo(String userGroupId) {
-        String url = AlphaFineCloudConstants.ALPHA_CID_USER_GROUP_INFO + AlphaFineConstants.SEARCH_BY_ID + userGroupId;
+        String url = AlphaFineCloudConstants.getAlphaCidUserGroupInfo() + 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

@@ -60,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 = AlphaFineCloudConstants.SEARCH_API + CodeUtils.cjkEncode(searchText[j]);
+                    String url = AlphaFineCloudConstants.getSearchApi() + 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,5 +1,6 @@
 package com.fr.design.mainframe.alphafine.search.manager.impl;
 
+import com.fr.base.login.ClientHelper;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.help.alphafine.AlphaFineCloudConstants;
 import com.fr.design.actions.help.alphafine.AlphaFineConstants;
@@ -13,6 +14,7 @@ import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.EncodeConstants;
 import com.fr.third.org.apache.commons.codec.digest.DigestUtils;
 
 /**
@@ -47,8 +49,9 @@ public class SimilarSearchManager implements AlphaFineSearchProvider {
             }
             SearchResult allModelList = new SearchResult();
             for (int j = 0; j < searchText.length; j++) {
+                String msg = ClientHelper.urlEncode(searchText[j], EncodeConstants.ENCODING_UTF_8);
                 String token = DigestUtils.md5Hex(AlphaFineConstants.ALPHA_ROBOT_SEARCH_TOKEN + searchText[j]);
-                String url = AlphaFineCloudConstants.SIMILAR_SEARCH_URL_PREFIX + "msg=" + searchText[j] + "&token=" + token;
+                String url = AlphaFineCloudConstants.getSimilarSearchUrlPrefix() + "msg=" + msg + "&token=" + ClientHelper.urlEncode(token, EncodeConstants.ENCODING_UTF_8);
                 try {
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();

designer-realize/src/test/java/com.fr/design/mainframe/alphafine/cell/model/ModelTest.java

@@ -14,8 +14,8 @@ public class ModelTest {
         Assert.assertEquals("name", documentModel.getName());
         Assert.assertEquals("content", documentModel.getContent());
         Assert.assertEquals(1, documentModel.getDocumentId());
-        Assert.assertEquals(AlphaFineCloudConstants.DOCUMENT_DOC_URL + documentModel.getDocumentId() + ".html", documentModel.getDocumentUrl());
-        Assert.assertEquals(AlphaFineCloudConstants.DOCUMENT_INFORMATION_URL + documentModel.getDocumentId(), documentModel.getInformationUrl());
+        Assert.assertEquals(AlphaFineCloudConstants.getDocumentDocUrl() + documentModel.getDocumentId() + ".html", documentModel.getDocumentUrl());
+        Assert.assertEquals(AlphaFineCloudConstants.getDocumentInformationUrl() + documentModel.getDocumentId(), documentModel.getInformationUrl());
         Assert.assertEquals(documentModel.getStoreInformation(), documentModel.getInformationUrl());
         Assert.assertEquals(CellType.DOCUMENT, documentModel.getType());
         Assert.assertEquals(true, documentModel.hasAction());