From f3356e2be00b20e258e65f2964da3ff95628e9fb Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 9 Jun 2017 10:48:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-2354=20=E5=B0=86=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=9A=84=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=E5=92=8C=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=9A=84=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=B5=B7=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/extra/PluginOperateUtils.java | 46 +++++++++++++------ .../com/fr/design/extra/PluginWebBridge.java | 7 +++ .../design/extra/exe/callback/JSCallback.java | 3 +- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java index abf97093c9..acea728d01 100644 --- a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java +++ b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java @@ -8,6 +8,7 @@ import com.fr.design.extra.exe.extratask.UpdatePluginTask; import com.fr.general.FRLogger; import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; +import com.fr.json.JSONArray; import com.fr.json.JSONObject; import com.fr.plugin.context.PluginContext; import com.fr.plugin.context.PluginMarker; @@ -17,7 +18,7 @@ import com.fr.plugin.manage.bbs.BBSUserInfo; import com.fr.plugin.manage.control.PluginTaskCallback; import com.fr.plugin.view.PluginView; import com.fr.stable.StringUtils; -import org.json.JSONArray; + import java.io.File; import java.util.List; @@ -107,25 +108,34 @@ public class PluginOperateUtils { } public static void searchPlugin(String keyword, JSCallback jsCallback) { - try { - new Thread(new Runnable() { - @Override - public void run() { - HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("plugin.plist") + "&keyword=" + keyword); + new Thread(new Runnable() { + @Override + public void run() { + try { +// HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("plugin.plist") + "&keyword=" + keyword); + HttpClient httpClient = new HttpClient("http://shop.finereport.com/searchApi?type=all" + "&keyword=" + keyword); + httpClient.asGet(); String result = httpClient.getResponseText(); - jsCallback.execute(result); + JSONObject jsonObject = new JSONObject(result); + JSONArray jsonArray = jsonObject.getJSONArray("result"); + jsCallback.execute(jsonArray.toString()); + } catch (Exception e) { + FRLogger.getLogger().error(e.getMessage()); } - }).start(); - } catch (Exception e) { - FRLogger.getLogger().error(e.getMessage()); - } + } + }).start(); + } public static void getPluginFromStore(String category, String seller, String fee, JSCallback jsCallback) { new Thread(new Runnable() { @Override public void run() { - String plistUrl = SiteCenter.getInstance().acquireUrlByKind("plugin.plist"); +// String plistUrl = SiteCenter.getInstance().acquireUrlByKind("plugin.plist"); + String plistUrl = "http://shop.finereport.com/shopServer?pg=plist"; + if (StringUtils.isEmpty(category) && StringUtils.isEmpty(seller) && StringUtils.isEmpty(fee)){ + plistUrl = "http://shop.finereport.com/ShopServer?pg=feature"; + } if (StringUtils.isNotBlank(plistUrl)) { StringBuilder url = new StringBuilder(); url.append(plistUrl); @@ -159,7 +169,7 @@ public class PluginOperateUtils { @Override public void run() { String result; - String url = SiteCenter.getInstance().acquireUrlByKind("plugin.category"); + String url = "http://shop.finereport.com/shopServer?pg=category"; if (url != null) { HttpClient httpClient = new HttpClient(url); result = httpClient.getResponseText(); @@ -171,6 +181,16 @@ public class PluginOperateUtils { }).start(); } + public static void getPluginPrefix(JSCallback jsCallback) { + new Thread(new Runnable() { + @Override + public void run() { + String result = SiteCenter.getInstance().acquireUrlByKind("plugin.url.prefix"); + jsCallback.execute(result); + } + }).start(); + } + public static void getLoginInfo(JSCallback jsCallback) { BBSUserInfo bbsUserInfo = BBSPluginLogin.getInstance().getUserInfo(); String username = bbsUserInfo == null ? "" : bbsUserInfo.getUserName(); diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java index 3efa0fd6e9..b7cadcbde5 100644 --- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java +++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java @@ -312,6 +312,13 @@ public class PluginWebBridge { PluginOperateUtils.getPluginFromStore(category, seller, fee, jsCallback); } + + public void getPluginPrefix(final JSObject callback){ + JSCallback jsCallback = new JSCallback(webEngine, callback); + PluginOperateUtils.getPluginPrefix(jsCallback); + } + + /** * 在线获取插件分类 * diff --git a/designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java index 4d2fb7adec..de7d779490 100644 --- a/designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java +++ b/designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java @@ -55,13 +55,14 @@ public class JSCallback extends Task { * 2.js字符串中的\n会导致js字符串变成多行,而js字符串不支持多行拼接 * 3.由JSONObject.toString()得到的字符串中html标签的属性会自动加上\造成替换难度加大， * 这边建议去除所有的html标签 + * 字符\在java中实际存储的是\\,替换字符串\\n, 需要用\\\\n * * @param old 原始字符串 * @return 处理之后的字符串 */ private String trimText(String old) { if (StringUtils.isNotBlank(old)) { - return old.replaceAll("\n", "").replaceAll("\"", "\\\\\"").replaceAll("\'", "\\\\\'"); + return old.replaceAll("\\\\n", "").replaceAll("\"", "\\\\\"").replaceAll("\'", "\\\\\'"); } return StringUtils.EMPTY; } From c156cbc9add19429b2f6409f33cb658a66f7172a Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 9 Jun 2017 11:02:22 +0800 Subject: [PATCH 2/2] PMD --- designer_base/src/com/fr/design/extra/PluginOperateUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java index acea728d01..42d646b11c 100644 --- a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java +++ b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java @@ -133,7 +133,8 @@ public class PluginOperateUtils { public void run() { // String plistUrl = SiteCenter.getInstance().acquireUrlByKind("plugin.plist"); String plistUrl = "http://shop.finereport.com/shopServer?pg=plist"; - if (StringUtils.isEmpty(category) && StringUtils.isEmpty(seller) && StringUtils.isEmpty(fee)){ + boolean getRecommend = StringUtils.isEmpty(category) && StringUtils.isEmpty(seller) && StringUtils.isEmpty(fee); + if (getRecommend){ plistUrl = "http://shop.finereport.com/ShopServer?pg=feature"; } if (StringUtils.isNotBlank(plistUrl)) {