diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java index 410796f26..d4a532815 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java @@ -121,5 +121,7 @@ public class AlphaFineConstants { public static final String ALPHA_GO_TO_WEB = CloudCenter.getInstance().acquireUrlByKind("af.go_web"); + public static final String CHINESE_CHARACTERS = "[\\u4e00-\\u9fa5]"; + } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/ActionModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/ActionModel.java index 324006f93..df218b1ce 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/ActionModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/ActionModel.java @@ -51,7 +51,7 @@ public class ActionModel extends AlphaCellModel { } @Override - public JSONObject ModelToJson() { + public JSONObject modelToJson() { JSONObject object = JSONObject.create(); try { JSONObject modelObject = JSONObject.create(); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java index 04af82195..23be9bd9d 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java @@ -75,7 +75,7 @@ public abstract class AlphaCellModel implements Comparable { * @return * @throws JSONException */ - abstract public JSONObject ModelToJson() throws JSONException; + abstract public JSONObject modelToJson() throws JSONException; /** * 获取需要保存到云中心的信息 diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/BottomModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/BottomModel.java index 50dc169bf..c8f92721c 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/BottomModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/BottomModel.java @@ -31,7 +31,7 @@ public class BottomModel extends AlphaCellModel { } @Override - public JSONObject ModelToJson() throws JSONException { + public JSONObject modelToJson() throws JSONException { return JSONObject.EMPTY; } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java index 4cb7cd16d..c3dd69369 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java @@ -40,7 +40,7 @@ public class DocumentModel extends AlphaCellModel { } @Override - public JSONObject ModelToJson() { + public JSONObject modelToJson() { JSONObject object = JSONObject.create(); try { JSONObject modelObject = JSONObject.create(); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/FileModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/FileModel.java index 377c2c8eb..b21f53bd4 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/FileModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/FileModel.java @@ -35,7 +35,7 @@ public class FileModel extends AlphaCellModel { } @Override - public JSONObject ModelToJson() { + public JSONObject modelToJson() { JSONObject object = JSONObject.create(); try { JSONObject modelObject = JSONObject.create(); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java index 2b808a0f8..860b2ff08 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java @@ -37,7 +37,7 @@ public class MoreModel extends AlphaCellModel { } @Override - public JSONObject ModelToJson() throws JSONException { + public JSONObject modelToJson() throws JSONException { return null; } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java index 81b19e763..15bd931e6 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java @@ -13,7 +13,7 @@ public class NoResultModel extends AlphaCellModel { } @Override - public JSONObject ModelToJson() throws JSONException { + public JSONObject modelToJson() throws JSONException { return null; } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java index 8416afdec..ef293eea8 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java @@ -85,7 +85,7 @@ public class PluginModel extends AlphaCellModel { } @Override - public JSONObject ModelToJson() { + public JSONObject modelToJson() { JSONObject object = JSONObject.create(); try { JSONObject modelObject = JSONObject.create(); @@ -109,7 +109,7 @@ public class PluginModel extends AlphaCellModel { if (StringUtils.isBlank(this.pluginId) || !WorkContext.getCurrent().isLocal()) { return; } - WebViewDlgHelper.showPluginInStore(getName(), "[" + ModelToJson().optString("result") + "]"); + WebViewDlgHelper.showPluginInStore(getName(), "[" + modelToJson().optString("result") + "]"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java index 85e0cfa84..03f038e60 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java @@ -65,7 +65,7 @@ public class RobotModel extends AlphaCellModel { } @Override - public JSONObject ModelToJson() throws JSONException { + public JSONObject modelToJson() throws JSONException { JSONObject object = JSONObject.create(); try { JSONObject modelObject = JSONObject.create(); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java index aae6dff2d..c4c4ca8e2 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java @@ -138,7 +138,7 @@ public class RecentSearchManager implements AlphaFineSearchProvider { initWriter(); Document doc = new Document(); doc.add(new StringField("searchKey", searchKey, Field.Store.YES)); - doc.add(new StringField("cellModel", cellModel.ModelToJson().toString(), Field.Store.YES)); + doc.add(new StringField("cellModel", cellModel.modelToJson().toString(), Field.Store.YES)); doc.add(new LongField("time", System.currentTimeMillis(), Field.Store.YES)); writeDoc(doc); } catch (JSONException e) { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java index a6eeb1862..908d1b1f6 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java @@ -35,8 +35,7 @@ public class SegmentationManager { */ public boolean isNeedSegmentation(String searchText) { int count = 0; - String reg = "[\\u4e00-\\u9fa5]"; - Pattern p = Pattern.compile(reg); + Pattern p = Pattern.compile(AlphaFineConstants.CHINESE_CHARACTERS); Matcher m = p.matcher(searchText); while (m.find()) { for (int i = 0; i <= m.groupCount(); i++) {