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

base-manager-ui/admin/vue.config.js

@@ -8,6 +8,7 @@ const CompressionWebpackPlugin = require("compression-webpack-plugin");
 const productionGzipExtensions = ["js", "css"];
 const isProd = process.env.NODE_ENV === "production";
 
+
 const assetsCDN = {
   // webpack build externals
   // externals: {
@@ -33,6 +34,17 @@ const assetsCDN = {
   ],
 };
 
+const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
+const devPlugins = [
+  new HardSourceWebpackPlugin(),
+  new HardSourceWebpackPlugin.ExcludeModulePlugin([
+    {
+      test: /mini-css-extract-plugin[\\/]dist[\\/]loader/
+    }
+  ])
+];
+
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 module.exports = {
   devServer: {
     disableHostCheck: true,
@@ -56,6 +68,13 @@ module.exports = {
     },
   },
   configureWebpack: (config) => {
+    config.plugin('webpack-report').use(BundleAnalyzerPlugin, [
+      {
+        analyzerMode: 'static'
+      }
+    ])
+    plugins: process.env.NODE_ENV === "production" ? [] : [...devPlugins];
+
     config.entry.app = ["babel-polyfill", "whatwg-fetch", "./src/main.js"];
     config.performance = {
       hints: false,

base-manager/doc/api.md

@@ -1577,6 +1577,275 @@ msg|String|消息|-
 
 ```
 
+## 主题
+
+### 查询主题列表
+
+**请求URL:** site/theme/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询主题
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+siteId|Long|否|站点id
+userType|String|否|服务类型编号,字段前后添加%%模糊查询
+themeCode|String|否|主题编号,字段前后添加%%模糊查询
+themeName|String|否|主题名称,字段前后添加%%模糊查询
+
+**请求样例:**
+```
+  {
+        "siteId":9425,
+        "userType":"6mu82c",
+        "themeCode":"w7vxfs",
+        "themeName":"a9jq7j",
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|id号
+  siteId|Long|站点id
+  userType|String|服务类型编号
+  themeCode|String|主题编号
+  themeName|String|主题名称
+  createTime|Date|创建时间
+  createUserId|Long|创建用户id
+  updateTime|Date|更新时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看主题
+
+**请求URL:** site/theme/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看主题，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/site/theme/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|id号
+ siteId|Long|站点id
+ userType|String|服务类型编号
+ themeCode|String|主题编号
+ themeName|String|主题名称
+ createTime|Date|创建时间
+ createUserId|Long|创建用户id
+ updateTime|Date|更新时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":539,
+            "siteId":4859,
+            "userType":"ewybhk",
+            "themeCode":"27cygo",
+            "themeName":"qu6dep",
+            "createTime":"2023-01-28",
+            "createUserId":1565,
+            "updateTime":"2023-01-28"
+        }
+}
+```
+
+## 站点主题事项
+
+### 查询站点主题事项列表
+
+**请求URL:** site/theme/matter/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询站点主题事项
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+siteId|Long|否|站点ID
+siteName|String|否|站点名称,字段前后添加%%模糊查询
+matterId|Long|否|事项ID
+matterName|String|否|事项名称,字段前后添加%%模糊查询
+matterCode|String|否|事项编码,字段前后添加%%模糊查询
+userType|String|否|服务类型（1.公共服务，2.个人服务，3.法人服务）,字段前后添加%%模糊查询
+themeCode|String|否|主题编码,字段前后添加%%模糊查询
+themeName|String|否|主题名称,字段前后添加%%模糊查询
+source|Integer|否|事项来源
+
+**请求样例:**
+```
+  {
+        "siteId":2334,
+        "siteName":"j1sn8h",
+        "matterId":5032,
+        "matterName":"xnn17d",
+        "matterCode":"5c6fxz",
+        "userType":"9c8tar",
+        "themeCode":"ztkpff",
+        "themeName":"hyfa7h",
+        "source":3642,
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|序号，主键，自增长
+  siteId|Long|站点ID
+  siteName|String|站点名称
+  matterId|Long|事项ID
+  matterName|String|事项名称
+  matterCode|String|事项编码
+  userType|String|服务类型（1.公共服务，2.个人服务，3.法人服务）
+  themeCode|String|主题编码
+  themeName|String|主题名称
+  source|Integer|事项来源
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateTime|Date|修改时间
+dict|object|字典对象
+ userType|object|字典属性对象，详见附录
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看站点主题事项
+
+**请求URL:** site/theme/matter/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看站点主题事项，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/site/theme/matter/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|序号，主键，自增长
+ siteId|Long|站点ID
+ siteName|String|站点名称
+ matterId|Long|事项ID
+ matterName|String|事项名称
+ matterCode|String|事项编码
+ userType|String|服务类型（1.公共服务，2.个人服务，3.法人服务）
+ themeCode|String|主题编码
+ themeName|String|主题名称
+ source|Integer|事项来源
+ createTime|Date|创建时间
+ createUserId|Long|创建用户
+ updateTime|Date|修改时间
+dict|object|字典对象
+ userType|object|字典属性对象，详见附录
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":6517,
+            "siteId":8377,
+            "siteName":"wnnjis",
+            "matterId":5970,
+            "matterName":"b5c0l3",
+            "matterCode":"y3yyz4",
+            "userType":"sr07tk",
+            "themeCode":"s1az2z",
+            "themeName":"isyo83",
+            "source":7309,
+            "createTime":"2023-01-28",
+            "createUserId":2157,
+            "updateTime":"2023-01-28"
+        }
+}
+```
+
+
+
 ## 业务
 
 ### 查询站点业务列表
@@ -9264,6 +9533,8 @@ data|object|数据对象
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
   serviceApi|String|服务接口地址
+  custUrl|String|自主应用前端访问地址
+  appIconUrl|String|自主应用前端图标地址
 dict|object|字典对象
  type|object|字典属性对象，详见附录
  shelves|object|字典属性对象，详见附录
@@ -9334,6 +9605,8 @@ data|object|数据对象
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
  serviceApi|String|服务接口地址
+ custUrl|String|自主应用前端访问地址
+ appIconUrl|String|自主应用前端图标地址
 dict|object|字典对象
  type|object|字典属性对象，详见附录
  shelves|object|字典属性对象，详见附录

base-manager/pom.xml

@@ -38,7 +38,7 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>test</package.environment>
-                <skipDeploy>false</skipDeploy>
+                <skipUi>false</skipUi>
             </properties>
         </profile>
         <profile>
@@ -58,7 +58,7 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>test</package.environment>
-                <skipDeploy>false</skipDeploy>
+                <skipUi>true</skipUi>
             </properties>
         </profile>
         <profile>
@@ -78,7 +78,7 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>build</package.environment>
-                <skipDeploy>false</skipDeploy>
+                <skipUi>true</skipUi>
             </properties>
         </profile>
 
@@ -88,21 +88,22 @@
                 <profiles.active>yibin</profiles.active>
                 <profiles.server.path>/base</profiles.server.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
-                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+                <profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
                 <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
                 <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
                 <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
                 <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+                <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.filepath>/home/mortals/app/data</profiles.filepath>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>yibin</package.environment>
-                <skipDeploy>false</skipDeploy>
+                <skipUi>true</skipUi>
             </properties>
         </profile>
+
     </profiles>
 
     <dependencies>
@@ -190,11 +191,11 @@
         </dependency>
         <!-- 虹软人脸解析 -->
 
-        <dependency>
+<!--        <dependency>
             <groupId>com.arcsoft.face</groupId>
             <artifactId>arcsoft-sdk-face</artifactId>
             <version>3.0.0.0</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>net.coobird</groupId>
             <artifactId>thumbnailator</artifactId>
@@ -295,7 +296,7 @@
                 <artifactId>exec-maven-plugin</artifactId>
                 <version>1.6.0</version>
                 <configuration>
-                    <skip>${skipDeploy}</skip>
+                    <skip>${skipUi}</skip>
                 </configuration>
                 <executions>
                     <execution>
@@ -358,7 +359,7 @@
                             <goal>single</goal>
                         </goals>
                         <configuration>
-                            <skipAssembly>${skipDeploy}</skipAssembly>
+                            <skipAssembly>${skipUi}</skipAssembly>
                             <finalName>${project.artifactId}-ui</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>

base-manager/src/main/java/com/mortals/xhx/base/framework/aspect/WebLogAspect.java

@@ -37,8 +37,8 @@ import java.util.Map;
  * @author: zxfei
  * @date: 2022/4/20 9:24
  */
-//@Aspect
-//@Component
+@Aspect
+@Component
 @Slf4j
 //@Order(1)
 @Profile({"default", "develop", "test"})

base-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java

 package com.mortals.xhx.base.system.param.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.IParam;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.DataUtil;
@@ -32,6 +34,20 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
         return "ParamEntity.paramKey";
     }
 
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveBefore(ParamEntity entity, Context context) throws AppException {
+        //过滤换行符
+        entity.setParamKey(StrUtil.removeAllLineBreaks(entity.getParamKey()));
+        entity.setParamValue(StrUtil.removeAllLineBreaks(entity.getParamValue()));
+        super.saveBefore(entity, context);
+    }
+
     @Override
     public String getValueByKey(String key) {
         List<ParamEntity> list = this.getCacheList();

base-manager/src/main/java/com/mortals/xhx/common/code/JointInfoShowEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+public enum JointInfoShowEnum {
+    公共服务部("公共服务部", "公共服务部"),
+    党政建设部("党政建设部", "党政建设部"),
+    网络理政部("网络理政部", "网络理政部");
+    private String value;
+    private String desc;
+
+    JointInfoShowEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static JointInfoShowEnum getByValue(String value) {
+        for (JointInfoShowEnum isLackEnum : JointInfoShowEnum.values()) {
+            if (isLackEnum.getValue() == value) {
+                return isLackEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (JointInfoShowEnum item : JointInfoShowEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/utils/FaceUtil.java

-package com.mortals.xhx.common.utils;
-
-import com.arcsoft.face.*;
-import com.arcsoft.face.enums.DetectMode;
-import com.arcsoft.face.enums.DetectOrient;
-import com.arcsoft.face.enums.ErrorInfo;
-import com.arcsoft.face.toolkit.ImageInfo;
-import com.mortals.framework.exception.AppException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.arcsoft.face.toolkit.ImageFactory.getRGBData;
-
-@Slf4j
-@Component
-public class FaceUtil {
-
-    public FaceEngine initFace(String appId, String sdkKey) {
-        FaceEngine faceEngine = new FaceEngine(getClass().getResource(getOsName()).getPath());
-        //激活引擎
-        int errorCode = faceEngine.activeOnline(appId, sdkKey);
-        isTrue(!(errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()), "引擎激活失败");
-        ActiveFileInfo activeFileInfo = new ActiveFileInfo();
-        errorCode = faceEngine.getActiveFileInfo(activeFileInfo);
-        isTrue(!(errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()), "获取激活文件信息失败");
-        //引擎配置
-        EngineConfiguration engineConfiguration = new EngineConfiguration();
-        engineConfiguration.setDetectMode(DetectMode.ASF_DETECT_MODE_IMAGE);
-        engineConfiguration.setDetectFaceOrientPriority(DetectOrient.ASF_OP_ALL_OUT);
-        engineConfiguration.setDetectFaceMaxNum(10);
-        engineConfiguration.setDetectFaceScaleVal(16);
-        //功能配置
-        FunctionConfiguration functionConfiguration = new FunctionConfiguration();
-        functionConfiguration.setSupportAge(true);
-        functionConfiguration.setSupportFace3dAngle(true);
-        functionConfiguration.setSupportFaceDetect(true);
-        functionConfiguration.setSupportFaceRecognition(true);
-        functionConfiguration.setSupportGender(true);
-        functionConfiguration.setSupportLiveness(true);
-        functionConfiguration.setSupportIRLiveness(true);
-        engineConfiguration.setFunctionConfiguration(functionConfiguration);
-        //初始化引擎
-        errorCode = faceEngine.init(engineConfiguration);
-        isTrue(errorCode == ErrorInfo.MOK.getValue(), "初始化引擎失败");
-        return faceEngine;
-    }
-
-
-    /**
-     * 人脸检测、特征提取
-     *
-     * @param faceEngine
-     * @param bytes
-     * @return
-     */
-    public byte[] featureData(FaceEngine faceEngine, byte[] bytes) {
-        //人脸检测
-        ImageInfo imageInfo = getRGBData(bytes);
-        List<FaceInfo> faceInfoList = new ArrayList<FaceInfo>();
-        faceEngine.detectFaces(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList);
-        //特征提取
-        FaceFeature faceFeature = new FaceFeature();
-        faceEngine.extractFaceFeature(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList.get(0), faceFeature);
-        return faceFeature.getFeatureData();
-    }
-
-
-    /**
-     * 特征比对
-     *
-     * @param targeFace
-     * @param sourceFace
-     * @return
-     */
-    public boolean featureComparison(FaceEngine faceEngine, byte[] targeFace, byte[] sourceFace) {
-        //特征比对
-        FaceFeature targetFaceFeature = new FaceFeature();
-        targetFaceFeature.setFeatureData(targeFace);
-        FaceFeature sourceFaceFeature = new FaceFeature();
-        sourceFaceFeature.setFeatureData(sourceFace);
-        FaceSimilar faceSimilar = new FaceSimilar();
-        faceEngine.compareFaceFeature(targetFaceFeature, sourceFaceFeature, faceSimilar);
-        float score = faceSimilar.getScore();
-        if (score > 0.8) {
-            return true;
-        }
-        return false;
-    }
-
-    public void unInit(FaceEngine faceEngine) {
-        faceEngine.unInit();
-    }
-
-    public String getOsName() {
-        String os = System.getProperty("os.name");
-        String osName = os.toLowerCase().startsWith("win") ? "/face_lib/win64" : "/face_lib/linux";
-        return osName;
-    }
-
-
-    private void isTrue(boolean b, String errorMsg) {
-        if (!b) {
-            throw new AppException(errorMsg);
-        }
-    }
-
-}
+//package com.mortals.xhx.common.utils;
+//
+//import com.arcsoft.face.*;
+//import com.arcsoft.face.enums.DetectMode;
+//import com.arcsoft.face.enums.DetectOrient;
+//import com.arcsoft.face.enums.ErrorInfo;
+//import com.arcsoft.face.toolkit.ImageInfo;
+//import com.mortals.framework.exception.AppException;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import static com.arcsoft.face.toolkit.ImageFactory.getRGBData;
+//
+//@Slf4j
+//@Component
+//public class FaceUtil {
+//
+//    public FaceEngine initFace(String appId, String sdkKey) {
+//        FaceEngine faceEngine = new FaceEngine(getClass().getResource(getOsName()).getPath());
+//        //激活引擎
+//        int errorCode = faceEngine.activeOnline(appId, sdkKey);
+//        isTrue(!(errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()), "引擎激活失败");
+//        ActiveFileInfo activeFileInfo = new ActiveFileInfo();
+//        errorCode = faceEngine.getActiveFileInfo(activeFileInfo);
+//        isTrue(!(errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()), "获取激活文件信息失败");
+//        //引擎配置
+//        EngineConfiguration engineConfiguration = new EngineConfiguration();
+//        engineConfiguration.setDetectMode(DetectMode.ASF_DETECT_MODE_IMAGE);
+//        engineConfiguration.setDetectFaceOrientPriority(DetectOrient.ASF_OP_ALL_OUT);
+//        engineConfiguration.setDetectFaceMaxNum(10);
+//        engineConfiguration.setDetectFaceScaleVal(16);
+//        //功能配置
+//        FunctionConfiguration functionConfiguration = new FunctionConfiguration();
+//        functionConfiguration.setSupportAge(true);
+//        functionConfiguration.setSupportFace3dAngle(true);
+//        functionConfiguration.setSupportFaceDetect(true);
+//        functionConfiguration.setSupportFaceRecognition(true);
+//        functionConfiguration.setSupportGender(true);
+//        functionConfiguration.setSupportLiveness(true);
+//        functionConfiguration.setSupportIRLiveness(true);
+//        engineConfiguration.setFunctionConfiguration(functionConfiguration);
+//        //初始化引擎
+//        errorCode = faceEngine.init(engineConfiguration);
+//        isTrue(errorCode == ErrorInfo.MOK.getValue(), "初始化引擎失败");
+//        return faceEngine;
+//    }
+//
+//
+//    /**
+//     * 人脸检测、特征提取
+//     *
+//     * @param faceEngine
+//     * @param bytes
+//     * @return
+//     */
+//    public byte[] featureData(FaceEngine faceEngine, byte[] bytes) {
+//        //人脸检测
+//        ImageInfo imageInfo = getRGBData(bytes);
+//        List<FaceInfo> faceInfoList = new ArrayList<FaceInfo>();
+//        faceEngine.detectFaces(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList);
+//        //特征提取
+//        FaceFeature faceFeature = new FaceFeature();
+//        faceEngine.extractFaceFeature(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList.get(0), faceFeature);
+//        return faceFeature.getFeatureData();
+//    }
+//
+//
+//    /**
+//     * 特征比对
+//     *
+//     * @param targeFace
+//     * @param sourceFace
+//     * @return
+//     */
+//    public boolean featureComparison(FaceEngine faceEngine, byte[] targeFace, byte[] sourceFace) {
+//        //特征比对
+//        FaceFeature targetFaceFeature = new FaceFeature();
+//        targetFaceFeature.setFeatureData(targeFace);
+//        FaceFeature sourceFaceFeature = new FaceFeature();
+//        sourceFaceFeature.setFeatureData(sourceFace);
+//        FaceSimilar faceSimilar = new FaceSimilar();
+//        faceEngine.compareFaceFeature(targetFaceFeature, sourceFaceFeature, faceSimilar);
+//        float score = faceSimilar.getScore();
+//        if (score > 0.8) {
+//            return true;
+//        }
+//        return false;
+//    }
+//
+//    public void unInit(FaceEngine faceEngine) {
+//        faceEngine.unInit();
+//    }
+//
+//    public String getOsName() {
+//        String os = System.getProperty("os.name");
+//        String osName = os.toLowerCase().startsWith("win") ? "/face_lib/win64" : "/face_lib/linux";
+//        return osName;
+//    }
+//
+//
+//    private void isTrue(boolean b, String errorMsg) {
+//        if (!b) {
+//            throw new AppException(errorMsg);
+//        }
+//    }
+//
+//}

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICacheService;
-import com.mortals.xhx.ManagerBaseApplication;
 import com.mortals.xhx.common.code.DxTypeEnum;
 import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
@@ -24,12 +23,8 @@ import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.module.site.service.SiteThemeMatterService;
 import com.mortals.xhx.module.site.service.SiteThemeService;
 import com.mortals.xhx.utils.SpringUtils;
-import lombok.AllArgsConstructor;
-import lombok.CustomLog;
 import lombok.extern.apachecommons.CommonsLog;
-import lombok.extern.slf4j.Slf4j;
 
-import javax.xml.transform.Source;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -91,7 +86,7 @@ public class SyncGovMatterDetailThread implements Runnable {
             //重新添加
             for (SiteEntity site : siteEntities) {
                 List<SiteMatterEntity> siteMatterList = matterEntityList.stream().map(item -> {
-                    return matterService.switchMatterToSiteMatterr(item, site, context).getData();
+                    return matterService.switchMatterToSiteMatter(item, site, context).getData();
                 }).filter(f -> f != null).collect(Collectors.toList());
 
                 List<List<SiteMatterEntity>> partition = ListUtil.partition(siteMatterList, 100);

base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

@@ -55,7 +55,15 @@ public class DemoStartedService implements IApplicationStartedService {
         SyncTreeSiteThread syncTreeSiteThread = new SyncTreeSiteThread(contextTemp);
         ThreadPool.getInstance().execute(syncTreeSiteThread);
 
-        if(ObjectUtils.isEmpty(userFeign)){
+
+        userService.find(new UserQuery()).forEach(user->{
+            Context context = new Context();
+            context.setUser(user);
+            ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
+        });
+
+
+/*        if(ObjectUtils.isEmpty(userFeign)){
             logger.info("userFeign未加载,加载本地用户");
             userService.find(new UserQuery()).forEach(user->{
                 Context context = new Context();
@@ -64,9 +72,9 @@ public class DemoStartedService implements IApplicationStartedService {
             });
 
             return;
-        }
+        }*/
 
-        userFeign.list(new UserPdu()).getData().getData().stream().forEach(userPdu->{
+/*        userFeign.list(new UserPdu()).getData().getData().stream().forEach(userPdu->{
             Context context = new Context();
 
             UserEntity entity = new UserEntity();
@@ -75,7 +83,7 @@ public class DemoStartedService implements IApplicationStartedService {
 
             context.setUser(entity);
             ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
-        });
+        });*/
     }
 
     @Override

base-manager/src/main/java/com/mortals/xhx/face/factory/FaceEnginePoolFactory.java

-package com.mortals.xhx.face.factory;
-
-import com.arcsoft.face.ActiveFileInfo;
-import com.arcsoft.face.EngineConfiguration;
-import com.arcsoft.face.FaceEngine;
-import com.arcsoft.face.FunctionConfiguration;
-import com.arcsoft.face.enums.DetectMode;
-import com.arcsoft.face.enums.DetectOrient;
-import com.arcsoft.face.enums.ErrorInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.pool2.BasePooledObjectFactory;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
-
-@Slf4j
-public class FaceEnginePoolFactory  extends BasePooledObjectFactory<FaceEngine> {
-
-    private String appId;
-    private String sdkKey;
-    private String sdkLibPath;
-
-    public FaceEnginePoolFactory(String appId, String sdkKey, String sdkLibPath) {
-        this.appId = appId;
-        this.sdkKey = sdkKey;
-        this.sdkLibPath = sdkLibPath;
-        //this.sdkLibPath = "D:\\face\\win64";
-    }
-
-    /**
-     * 在对象池中创建对象
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public FaceEngine create() throws Exception {
-        FaceEngine faceEngine = new FaceEngine(sdkLibPath);
-        //激活引擎
-        int errorCode = faceEngine.activeOnline(appId, sdkKey);
-        if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
-            log.warn("引擎激活失败");
-        }
-        ActiveFileInfo activeFileInfo=new ActiveFileInfo();
-        errorCode = faceEngine.getActiveFileInfo(activeFileInfo);
-        if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
-            log.warn("获取激活文件信息失败");
-        }
-        //引擎配置
-        EngineConfiguration engineConfiguration = new EngineConfiguration();
-        engineConfiguration.setDetectMode(DetectMode.ASF_DETECT_MODE_IMAGE);
-        engineConfiguration.setDetectFaceOrientPriority(DetectOrient.ASF_OP_ALL_OUT);
-        engineConfiguration.setDetectFaceMaxNum(10);
-        engineConfiguration.setDetectFaceScaleVal(16);
-        //功能配置
-        FunctionConfiguration functionConfiguration = new FunctionConfiguration();
-        functionConfiguration.setSupportAge(true);
-        functionConfiguration.setSupportFace3dAngle(true);
-        functionConfiguration.setSupportFaceDetect(true);
-        functionConfiguration.setSupportFaceRecognition(true);
-        functionConfiguration.setSupportGender(true);
-        functionConfiguration.setSupportLiveness(true);
-        functionConfiguration.setSupportIRLiveness(true);
-        engineConfiguration.setFunctionConfiguration(functionConfiguration);
-        //初始化引擎
-        errorCode = faceEngine.init(engineConfiguration);
-
-        if (errorCode != ErrorInfo.MOK.getValue()) {
-            log.error("初始化引擎失败");
-        }
-        return faceEngine;
-    }
-
-    /**
-     * 包装对象
-     * @param faceEngine
-     * @return
-     */
-    @Override
-    public PooledObject<FaceEngine> wrap(FaceEngine faceEngine) {
-        return new DefaultPooledObject<>(faceEngine);
-    }
-    /**
-     * 销毁对象
-     * @param faceEngine 对象池
-     * @throws Exception 异常
-     */
-    @Override
-    public void destroyObject(PooledObject<FaceEngine> faceEngine) throws Exception {
-        super.destroyObject(faceEngine);
-    }
-
-    /**
-     * 校验对象是否可用
-     * @param faceEngine 对象池
-     * @return 对象是否可用结果，boolean
-     */
-    @Override
-    public boolean validateObject(PooledObject<FaceEngine> faceEngine) {
-        return super.validateObject(faceEngine);
-    }
-
-    /**
-     * 激活钝化的对象系列操作
-     * @param faceEngine 对象池
-     * @throws Exception 异常信息
-     */
-    @Override
-    public void activateObject(PooledObject<FaceEngine> faceEngine) throws Exception {
-        super.activateObject(faceEngine);
-    }
-
-    /**
-     * 钝化未使用的对象
-     * @param faceEngine 对象池
-     * @throws Exception 异常信息
-     */
-    @Override
-    public void passivateObject(PooledObject<FaceEngine> faceEngine) throws Exception {
-        super.passivateObject(faceEngine);
-    }
-
-}
+//package com.mortals.xhx.face.factory;
+//
+//import com.arcsoft.face.ActiveFileInfo;
+//import com.arcsoft.face.EngineConfiguration;
+//import com.arcsoft.face.FaceEngine;
+//import com.arcsoft.face.FunctionConfiguration;
+//import com.arcsoft.face.enums.DetectMode;
+//import com.arcsoft.face.enums.DetectOrient;
+//import com.arcsoft.face.enums.ErrorInfo;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.pool2.BasePooledObjectFactory;
+//import org.apache.commons.pool2.PooledObject;
+//import org.apache.commons.pool2.impl.DefaultPooledObject;
+//
+//@Slf4j
+//public class FaceEnginePoolFactory  extends BasePooledObjectFactory<FaceEngine> {
+//
+//    private String appId;
+//    private String sdkKey;
+//    private String sdkLibPath;
+//
+//    public FaceEnginePoolFactory(String appId, String sdkKey, String sdkLibPath) {
+//        this.appId = appId;
+//        this.sdkKey = sdkKey;
+//        this.sdkLibPath = sdkLibPath;
+//        //this.sdkLibPath = "D:\\face\\win64";
+//    }
+//
+//    /**
+//     * 在对象池中创建对象
+//     * @return
+//     * @throws Exception
+//     */
+//    @Override
+//    public FaceEngine create() throws Exception {
+//        FaceEngine faceEngine = new FaceEngine(sdkLibPath);
+//        //激活引擎
+//        int errorCode = faceEngine.activeOnline(appId, sdkKey);
+//        if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
+//            log.warn("引擎激活失败");
+//        }
+//        ActiveFileInfo activeFileInfo=new ActiveFileInfo();
+//        errorCode = faceEngine.getActiveFileInfo(activeFileInfo);
+//        if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
+//            log.warn("获取激活文件信息失败");
+//        }
+//        //引擎配置
+//        EngineConfiguration engineConfiguration = new EngineConfiguration();
+//        engineConfiguration.setDetectMode(DetectMode.ASF_DETECT_MODE_IMAGE);
+//        engineConfiguration.setDetectFaceOrientPriority(DetectOrient.ASF_OP_ALL_OUT);
+//        engineConfiguration.setDetectFaceMaxNum(10);
+//        engineConfiguration.setDetectFaceScaleVal(16);
+//        //功能配置
+//        FunctionConfiguration functionConfiguration = new FunctionConfiguration();
+//        functionConfiguration.setSupportAge(true);
+//        functionConfiguration.setSupportFace3dAngle(true);
+//        functionConfiguration.setSupportFaceDetect(true);
+//        functionConfiguration.setSupportFaceRecognition(true);
+//        functionConfiguration.setSupportGender(true);
+//        functionConfiguration.setSupportLiveness(true);
+//        functionConfiguration.setSupportIRLiveness(true);
+//        engineConfiguration.setFunctionConfiguration(functionConfiguration);
+//        //初始化引擎
+//        errorCode = faceEngine.init(engineConfiguration);
+//
+//        if (errorCode != ErrorInfo.MOK.getValue()) {
+//            log.error("初始化引擎失败");
+//        }
+//        return faceEngine;
+//    }
+//
+//    /**
+//     * 包装对象
+//     * @param faceEngine
+//     * @return
+//     */
+//    @Override
+//    public PooledObject<FaceEngine> wrap(FaceEngine faceEngine) {
+//        return new DefaultPooledObject<>(faceEngine);
+//    }
+//    /**
+//     * 销毁对象
+//     * @param faceEngine 对象池
+//     * @throws Exception 异常
+//     */
+//    @Override
+//    public void destroyObject(PooledObject<FaceEngine> faceEngine) throws Exception {
+//        super.destroyObject(faceEngine);
+//    }
+//
+//    /**
+//     * 校验对象是否可用
+//     * @param faceEngine 对象池
+//     * @return 对象是否可用结果，boolean
+//     */
+//    @Override
+//    public boolean validateObject(PooledObject<FaceEngine> faceEngine) {
+//        return super.validateObject(faceEngine);
+//    }
+//
+//    /**
+//     * 激活钝化的对象系列操作
+//     * @param faceEngine 对象池
+//     * @throws Exception 异常信息
+//     */
+//    @Override
+//    public void activateObject(PooledObject<FaceEngine> faceEngine) throws Exception {
+//        super.activateObject(faceEngine);
+//    }
+//
+//    /**
+//     * 钝化未使用的对象
+//     * @param faceEngine 对象池
+//     * @throws Exception 异常信息
+//     */
+//    @Override
+//    public void passivateObject(PooledObject<FaceEngine> faceEngine) throws Exception {
+//        super.passivateObject(faceEngine);
+//    }
+//
+//}

base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppVo.java

@@ -27,5 +27,9 @@ public class AppVo extends BaseEntityLong {
      * 自主应用访问地址
      */
     private String custUrl;
+    /**
+     * 图标访问地址
+     */
+    private String appIconUrl;
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java

@@ -86,12 +86,11 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
             List<AppEntity> appEntityList = this.find(new AppQuery().appCode(item.getAppCode()), context);
             item.setApplianceSiteScope(appEntityList.size());
             item.setSiteIdList(appEntityList.stream().map(AppEntity::getSiteId).collect(Collectors.toList()));
-
             //构建访问地址
             SiteEntity siteEntity = siteService.getCache(item.getSiteId().toString());
+            String domainUrl = GlobalSysInfo.getParamValue(Constant.PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
             if (!ObjectUtils.isEmpty(siteEntity)) {
                 //请求地址 http://domian/app/siteCode/appcode/html
-                String domainUrl = GlobalSysInfo.getParamValue(Constant.PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
                 item.setCustUrl(UrlBuilder.of(domainUrl)
                         .addPath(CUSTAPP_ROOT_PATH)
                         .addPath(siteEntity.getSiteCode())
@@ -101,10 +100,10 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
             } else {
                 item.setCustUrl("");
             }
-
-
+            //构建图标地址
+            item.setAppIconUrl(UrlBuilder.of(domainUrl)
+                    .addPath(item.getAppIconPath()).build());
         });
-
         super.findAfter(params, pageInfo, context, list);
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java

@@ -5,16 +5,12 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
-import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.model.vo.MatterInfo;
 import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteMatterQuery;
-import org.apache.poi.ss.formula.functions.T;
-import org.w3c.dom.Document;
 
 import java.util.Map;
 
@@ -58,14 +54,21 @@ public interface MatterService extends ICRUDService<MatterEntity, Long> {
     Rest<String> buildMatterDetail(MatterEntity matterEntity, Context context);
 
     /**
-     * 添加业务到站点
+     * 添加事项到站点事项
      *
      * @param matterEntity
      * @param context
      */
-    Rest<SiteMatterEntity> switchMatterToSiteMatterr(MatterEntity matterEntity, SiteEntity siteEntity, Context context);
-
+    Rest<SiteMatterEntity> switchMatterToSiteMatter(MatterEntity matterEntity, SiteEntity siteEntity, Context context);
 
+    /**
+     * 查找差集子项
+     * @param matterQuery
+     * @param pageInfo
+     * @param context
+     * @return
+     * @throws AppException
+     */
     Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException;
 
     Result<MatterInfo> findMicroList(MatterQuery matterQuery, PageInfo pageInfo, Context context) throws AppException;

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -11,7 +11,6 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
-import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.xhx.base.framework.config.InterceptorConfig;
@@ -32,11 +31,11 @@ import com.mortals.xhx.module.matters.model.MattersEntity;
 import com.mortals.xhx.module.matters.model.MattersQuery;
 import com.mortals.xhx.module.matters.service.MattersDetailService;
 import com.mortals.xhx.module.matters.service.MattersService;
-import com.mortals.xhx.module.site.model.SiteEntity;
-import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteMatterQuery;
+import com.mortals.xhx.module.site.model.*;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import com.mortals.xhx.module.site.service.SiteService;
+import com.mortals.xhx.module.site.service.SiteThemeMatterService;
+import com.mortals.xhx.module.site.service.SiteThemeService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jsoup.Jsoup;
@@ -89,14 +88,52 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     private DeptService deptService;
     @Autowired
     private MatterExtService matterExtService;
+    @Autowired
+    private SiteThemeMatterService siteThemeMatterService;
+    @Autowired
+    private SiteThemeService siteThemeService;
 
 
     @Override
     protected void saveBefore(MatterEntity entity, Context context) throws AppException {
+        //判断如果是自定义事项，需要更新区域编码
+        if (SourceEnum.自定义.getValue().equals(entity.getSource())) {
+            if (!ObjectUtils.isEmpty(entity.getSiteId())) {
+                SiteEntity siteEntity = siteService.get(entity.getSiteId(), context);
+                entity.setAreaCode(siteEntity.getAreaCode());
+            }
 
+        }
         super.saveBefore(entity, context);
     }
 
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveAfter(MatterEntity entity, Context context) throws AppException {
+        //主题添加自定义关联
+        if (!ObjectUtils.isEmpty(entity.getThemeCode())) {
+            SiteThemeEntity siteThemeEntity = siteThemeService.selectOne(new SiteThemeQuery().siteId(entity.getSiteId()).themeCode(entity.getThemeCode()));
+            SiteThemeMatterEntity siteThemeMatterEntity = new SiteThemeMatterEntity();
+            siteThemeMatterEntity.initAttrValue();
+            siteThemeMatterEntity.setThemeCode(entity.getThemeCode());
+            siteThemeMatterEntity.setSiteId(entity.getSiteId());
+            siteThemeMatterEntity.setSource(entity.getSource());
+            siteThemeMatterEntity.setMatterId(entity.getId());
+            siteThemeMatterEntity.setMatterCode(entity.getMatterNo());
+            siteThemeMatterEntity.setMatterName(entity.getMatterName());
+            siteThemeMatterEntity.setUserType(siteThemeEntity == null ? "2" : siteThemeEntity.getUserType());
+            siteThemeMatterEntity.setCreateTime(new Date());
+            siteThemeMatterEntity.setCreateUserId(this.getContextUserId(context));
+            siteThemeMatterService.save(siteThemeMatterEntity, context);
+        }
+
+        super.saveAfter(entity, context);
+    }
+
     @Override
     protected void updateBefore(MatterEntity entity, Context context) throws AppException {
 
@@ -169,7 +206,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         SiteMatterEntity siteMatterEntity = siteMatterService.selectOne(new SiteMatterQuery().siteId(siteId).matterId(item.getId()));
         if (ObjectUtils.isEmpty(siteMatterEntity)) {
             SiteEntity siteEntity = siteService.getCache(siteId.toString());
-            Rest<SiteMatterEntity> rest = switchMatterToSiteMatterr(item, siteEntity, context);
+            Rest<SiteMatterEntity> rest = switchMatterToSiteMatter(item, siteEntity, context);
             if (rest.getCode() == YesNoEnum.YES.getValue()) {
                 return rest.getData();
             }
@@ -178,7 +215,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     }
 
     @Override
-    public Rest<SiteMatterEntity> switchMatterToSiteMatterr(MatterEntity item, SiteEntity siteEntity, Context context) {
+    public Rest<SiteMatterEntity> switchMatterToSiteMatter(MatterEntity item, SiteEntity siteEntity, Context context) {
         try {
             DeptEntity deptEntity = deptService.getExtCache(item.getDeptCode());
             SiteMatterEntity siteMatterEntity = new SiteMatterEntity();

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -12,8 +12,11 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.framework.config.InterceptorConfig;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.JointInfoShowEnum;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterService;
+import com.mortals.xhx.module.site.model.SiteThemeQuery;
+import com.mortals.xhx.module.site.service.SiteThemeService;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -44,6 +47,8 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     @Autowired
     private InterceptorConfig interceptorConfig;
 
+    private SiteThemeService siteThemeService;
+
     public MatterController() {
         super.setFormClass(MatterForm.class);
         super.setModuleDesc("基础事项");
@@ -84,6 +89,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         this.addDict(model, "parson", paramService.getParamBySecondOrganize("Matter", "parson"));
         this.addDict(model, "lengal", paramService.getParamBySecondOrganize("Matter", "lengal"));
         this.addDict(model, "source", paramService.getParamBySecondOrganize("Matter", "source"));
+        this.addDict(model, "jointInfoShow", JointInfoShowEnum.getEnumMap());
 
         Setting baseInfoSetting = interceptorConfig.getBaseInfoSetting();
         Map<String, String> baseInfoMap = new HashMap<>();
@@ -102,7 +108,9 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
             }
         });
         this.addDict(model, "sqclInfo", sqclInfoMap);
-
+        //theme
+        Map<String, String> themeMap = siteThemeService.find(new SiteThemeQuery()).stream().collect(Collectors.toMap(x -> x.getThemeCode(), y -> y.getThemeName(), (o, n) -> n));
+        this.addDict(model, "theme", themeMap);
         super.init(model, context);
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

 package com.mortals.xhx.module.skin.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -81,10 +82,10 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
             item.setSkinFieldList(skinFieldEntities);
 
             if (!ObjectUtils.isEmpty(item.getPreviewImagePath())) {
-                item.setPreviewImagePath(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") + item.getPreviewImagePath());
+                item.setPreviewImagePath(StrUtil.removeAllLineBreaks(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") )+ item.getPreviewImagePath());
             }
             if (!ObjectUtils.isEmpty(item.getCssFilePath())) {
-                item.setCssFilePath(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") + item.getCssFilePath());
+                item.setCssFilePath(StrUtil.removeAllLineBreaks(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") )+ item.getCssFilePath());
             }
         });
         super.findAfter(entity, pageInfo, context, list);
@@ -92,7 +93,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
 
     private void updateUrl(SkinFieldEntity field) {
         if ("2".equals(field.getFieldType())) {
-            field.setFieldValue(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") + field.getFieldValue());
+            field.setFieldValue(StrUtil.removeAllLineBreaks(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/")) + field.getFieldValue());
         }
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

 package com.mortals.xhx.module.skin.web;
+import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -89,7 +90,7 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
 
     private void updateUrl(SkinFieldEntity field) {
         if ("2".equals(field.getFieldType())) {
-            field.setFieldValue(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/") + field.getFieldValue());
+            field.setFieldValue(StrUtil.removeAllLineBreaks(GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/")) + field.getFieldValue());
         }
     }
 

base-manager/src/main/resources/logback-spring.xml

@@ -56,13 +56,13 @@
     <!-- level 用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。如果未设置此属性，那么当前logger将会继承上级的级别-->
     <!-- additivity 是否向上级logger传递打印信息。默认是true。false：表示只用当前logger的appender-ref。true：表示当前logger的appender-ref和rootLogger的appender-ref都有效。-->
 
-    <logger name="com.mortals" level="INFO" additivity="false">
+    <logger name="com.mortals" level="${logLevel}" additivity="false">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>
     </logger>
 
-    <logger name="com.mortals.xhx.module" level="debug" additivity="false">
+    <logger name="com.mortals.xhx.module" level="${logLevel}" additivity="false">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -15,11 +15,9 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###自助终端应用列表
 POST {{baseUrl}}/app/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "idList":[19,22,20],
     "page":1,
     "size":-1
 }

base-manager/src/test/java/com/mortals/httpclient/business/BusinessMatterController.http

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "page": 1,
-  "siteBusinessName": "%不动产抵押登记%",
+  "matterId": 123,
   "siteId": 53,
   "size": 10
 }

base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http

@@ -20,7 +20,9 @@ POST {{baseUrl}}/matter/list
 Content-Type: application/json
 
 {
-  "idList": [1,2],
+  "siteId": "",
+  "matterName": "%对墓穴占地面积超过标准的处罚%",
+  "deptCode":"",
   "page": 1,
   "size": 10
 }
@@ -30,7 +32,7 @@ POST {{baseUrl}}/micro/matter/list
 Content-Type: application/json
 
 {
-  "idList": [1,2],
+  "matterName": "%对墓穴占地面积超过标准的处罚%",
   "page": 1,
   "size": 10
 }
@@ -124,7 +126,7 @@ client.global.set("Matter_id", JSON.parse(response.body).data.id);
 %}
 
 ###基础事项查看
-GET {{baseUrl}}/matter/info?id=1
+GET {{baseUrl}}/matter/info?id=5809
 Accept: application/json
 
 ###基础事项编辑

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

@@ -4,7 +4,8 @@ POST {{baseUrl}}/site/matter/list
 Content-Type: application/json
 
 {
-    "siteId":21 ,
+    "siteId":35,
+    "matterId": 5809,
     "page":1,
     "size":10
 }

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

@@ -15,15 +15,10 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###主题列表
 POST {{baseUrl}}/site/theme/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "siteId":149,
-    "userType":"0ee9bm",
-    "themeCode":"p2seel",
-    "themeName":"2unqht",
-    "updatetime":"1669132800000"
+    "siteId":3,
     "page":1,
     "size":10
 }

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

@@ -4,7 +4,7 @@ Content-Type: application/json
 
 {
 "loginName":"admin",
-"password":"admin",
+"password":"adsmile",
 "securityCode":"8888"
 }
 
@@ -15,19 +15,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###站点主题事项列表
 POST {{baseUrl}}/site/theme/matter/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "siteId":41,
-    "siteName":"fzbhd9",
-    "matterId":736,
-    "matterName":"dhnjnq",
-    "matterCode":"g61fxt",
-    "userType":"xd2eec",
-    "themeCode":"60d2h2",
-    "themeName":"gcfnnz",
-    "source":261,
+    "siteId":3,
+    "matterId":5809,
     "page":1,
     "size":10
 }
@@ -55,7 +47,7 @@ client.global.set("SiteThemeMatter_id", JSON.parse(response.body).data.id);
 %}
 
 ###站点主题事项查看
-GET {{baseUrl}}/site/theme/matter/info?id={{SiteThemeMatter_id}}
+GET {{baseUrl}}/site/theme/matter/info?id=52237
 Authorization: {{authToken}}
 Accept: application/json
 

deploy.sh

@@ -272,8 +272,8 @@ socket=/tmp/mysql.sock
   #bin/mysqld --initialize-insecure --user=mysql --datadir=${MYSQL_DATA_PATH} --basedir=${MYSQL_EXECPATH} --socket=/tmp/mysql.sock
 
   #创建软连接
-  rm -m /etc/init.d/mysql
-  rm -m /usr/bin/mysql
+  rm -f /etc/init.d/mysql
+  rm -f /usr/bin/mysql
   ln -s ${MYSQL_EXECPATH}/support-files/mysql.server /etc/init.d/mysql
   ln -s ${MYSQL_EXECPATH}/bin/mysql /usr/bin/mysql
 #  export PATH=$PATH:${MYSQL_EXECPATH}/bin
@@ -282,6 +282,8 @@ socket=/tmp/mysql.sock
 #  mysql -uroot -p123 <${BASEDIR}/soft/${MYSQL}/user.sql
 #  sed -i "s/skip-grant-tables/#skip-grant-tables/g" ${MYSQL_CONF_PATH}
   #service mysql restart
+
+  writelog $MYSQL_SERVICE
   echo"
 [Unit]
 Description=MySQL Server
@@ -298,7 +300,7 @@ ExecReload= /etc/init.d/mysql restart
 LimitNOFILE = 5000
 [Install]
 WantedBy=multi-user.target
-  ">${MYSQL_CONF_PATH}
+  ">${MYSQL_SERVICE}
 
   systemctl enable mysql
   systemctl daemon-reload

pom.xml

@@ -25,6 +25,16 @@
         <common-lib.version>0.0.1-SNAPSHOT</common-lib.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+
+        </repository>
+
+    </repositories>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -93,6 +103,15 @@
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                 </configuration>
             </plugin>
+
+            <!-- 打包跳过测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file

portal-manager-ui/admin/package-lock.json

@@ -19,6 +19,7 @@
         "highlight.js": "^11.5.1",
         "js-export-excel": "^1.1.4",
         "lodash": "^4.17.21",
+        "moment": "^2.29.4",
         "qs": "^6.10.3",
         "vue": "^2.6.14",
         "vue-highlightjs": "^1.3.3",
@@ -35,7 +36,8 @@
         "less": "^4.0.0",
         "less-loader": "^8.0.0",
         "postcss": "^8.4.12",
-        "vue-template-compiler": "^2.6.14"
+        "vue-template-compiler": "^2.6.14",
+        "webpack-bundle-analyzer": "^4.7.0"
       }
     },
     "node_modules/@achrinza/node-ipc": {

portal-manager-ui/admin/package.json

@@ -38,7 +38,8 @@
     "less": "^4.0.0",
     "less-loader": "^8.0.0",
     "postcss": "^8.4.12",
-    "vue-template-compiler": "^2.6.14"
+    "vue-template-compiler": "^2.6.14",
+    "webpack-bundle-analyzer": "^4.7.0"
   },
   "browserslist": [
     "> 1%",

portal-manager/pom.xml

@@ -34,7 +34,7 @@
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
 				<package.environment>test</package.environment>
-				<skipDeploy>false</skipDeploy>
+				<skipUi>false</skipUi>
 			</properties>
 		</profile>
 		<profile>
@@ -54,7 +54,7 @@
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<package.environment>test</package.environment>
-				<skipDeploy>false</skipDeploy>
+				<skipUi>true</skipUi>
 			</properties>
 		</profile>
 		<profile>
@@ -74,30 +74,30 @@
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<package.environment>build</package.environment>
-				<skipDeploy>false</skipDeploy>
+				<skipUi>true</skipUi>
 			</properties>
 		</profile>
-
 		<profile>
 			<id>yibin</id>
 			<properties>
 				<profiles.active>yibin</profiles.active>
 				<profiles.server.path>/zwfw</profiles.server.path>
 				<profiles.publish.path>/home/publish</profiles.publish.path>
-				<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+				<profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-				<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username>
-				<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
+				<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+				<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
 				<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+				<profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<package.environment>yibin</package.environment>
-				<skipDeploy>false</skipDeploy>
+				<skipUi>true</skipUi>
 			</properties>
 		</profile>
+
 	</profiles>
 	<properties>
 	</properties>
@@ -246,7 +246,7 @@
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.6.0</version>
 				<configuration>
-					<skip>${skipDeploy}</skip>
+					<skip>${skipUi}</skip>
 				</configuration>
 				<executions>
 					<execution>
@@ -309,7 +309,7 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<skipAssembly>${skipDeploy}</skipAssembly>
+							<skipAssembly>${skipUi}</skipAssembly>
 							<finalName>${project.artifactId}-ui</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<descriptors>

smart-gateway/pom.xml

@@ -88,20 +88,20 @@
                 <profiles.server.ip>192.168.2.144</profiles.server.ip>
                 <profiles.server.port>17214</profiles.server.port>
                 <profiles.nginx.port>11078</profiles.nginx.port>
-                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+                <profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
                 <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
                 <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
                 <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
                 <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+                <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
                 <profiles.log.level>INFO</profiles.log.level>
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
-
             </properties>
         </profile>
+
     </profiles>
 
     <properties>