gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置关键字转译之前去掉首尾空格

Browse Source 
Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-30 12:43:22 +08:00
parent d0e2b409e5
commit d9d968dcaa
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -580,6 +580,7 @@ public abstract class BaseService {
public static String keywordsEscape(String cfgKeywords){ public static String keywordsEscape(String cfgKeywords){
if(StringUtils.isNotEmpty(cfgKeywords)){ if(StringUtils.isNotEmpty(cfgKeywords)){
//不转译特殊字符 //不转译特殊字符
cfgKeywords = cfgKeywords.trim();//首先去掉首尾空格
cfgKeywords = StringEscapeUtils.unescapeHtml4(cfgKeywords); cfgKeywords = StringEscapeUtils.unescapeHtml4(cfgKeywords);
cfgKeywords=cfgKeywords.replace("\\", "\\\\"); cfgKeywords=cfgKeywords.replace("\\", "\\\\");
cfgKeywords=cfgKeywords.replace("&", "\\&"); cfgKeywords=cfgKeywords.replace("&", "\\&");

2
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -684,7 +684,7 @@ public class AppCfgService extends BaseService {
//设置APP自定义域 //设置APP自定义域
String userRegion = "APP_ID="+entity.getAppCode()+Constants.USER_REGION_SPLIT+ String userRegion = "APP_ID="+entity.getAppCode()+Constants.USER_REGION_SPLIT+
"DOMAIN_ID="+entity.getCompileId()+Constants.USER_REGION_SPLIT+ "DOMAIN_ID="+entity.getCompileId()+Constants.USER_REGION_SPLIT+
"DOMAIN_STR="+entity.getDomain(); "DOMAIN_STR="+keywordsEscape(entity.getDomain());
maatCfg.setUserRegion(userRegion); maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg); configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList); maatBean.setConfigCompileList(configCompileList);