Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/base/framework/config/FilterConfig.java

@@ -23,13 +23,13 @@ import java.util.Map;
 @Configuration
 @Slf4j
 public class FilterConfig {
-    @Value("${xss.enabled}")
+    @Value("${xss.enabled:}")
     private String enabled;
 
-    @Value("${xss.excludes}")
+    @Value("${xss.excludes:}")
     private String excludes;
 
-    @Value("${xss.urlPatterns}")
+    @Value("${xss.urlPatterns:}")
     private String urlPatterns;
 
     @SuppressWarnings({"rawtypes", "unchecked"})

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppVersionController.java

@@ -134,7 +134,7 @@ public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppV
             if (ObjectUtils.isEmpty(appEntity)) {
                 throw new AppException("当前应用不存在！appId:" + appVersionEntity.getAppId());
             }
-            Rest<String> disRest = this.service.appDistribute(appVersionEntity, getContext());
+           // Rest<String> disRest = this.service.appDistribute(appVersionEntity, getContext());
             SiteEntity siteEntity = siteService.get(appEntity.getSiteId(), getContext());
             //请求地址 http://domian/app/siteCode/appcode/html
             String domainUrl = GlobalSysInfo.getParamValue(Constant.PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -146,7 +146,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":1
+  "id":50
 }