Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_bugfix_ljj

2 years ago · a7fdde788d
42 changed files with 159 additions and 52 deletions
--- a/doc/epmet-cloud.md
+++ b/doc/epmet-cloud.md
@ -10,4 +10,11 @@
 例如：有A、B2个服务，并且A调用B，如果我们只需要开发A服务，那本地只启动A服务即可，A调用B的时候，会调用服务器的B服务。
 如果需要开发AB2个服务，那么将A中的FeignClient的url属性指向localhost。
 PS:目前正在测试通过负载均衡器和本地环境变量实现动态修改目标服务IP，成功之后就不需要再修改FeignClient的url，配置一下环境变量即可，到时候具体说
-```
+```
+
+
+## 私有化部署 
+##### 需要开放哪些域名
+
+- epmet-cloud.elinkservice.cn   微信交互代理
+- dysmsapi.aliyuncs.com   阿里云短信
--- a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/admin"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/admin"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>

--- a/epmet-auth/src/main/resources/logback-spring.xml
+++ b/epmet-auth/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/auth"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/auth"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-gateway/src/main/resources/logback-spring.xml
+++ b/epmet-gateway/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/gateway"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gateway"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/data-aggregator"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-aggregator"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/data-report"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-report"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/data-statistical"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-statistical"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/activiti"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/activiti"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>

--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/common-service"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/common-service"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/demo"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/demo"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>

--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/ext"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/ext"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/heart"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/heart"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/job"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/job"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/message"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/message"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/oss"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oss"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/point"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/point"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/third"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/third"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/gov-access"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-access"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>

--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/gov-grid"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-grid"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/gov-issue"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-issue"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/gov-mine"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-mine"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/gov-org"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-org"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/gov-project"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-project"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/gov-voice"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-voice"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml
@ -11,7 +11,7 @@
            article_content ac
        WHERE
            ac.DEL_FLAG = '0'
-          AND ac.ID = #{articleId}
+          AND ac.ARTICLE_ID = #{articleId}
    </select>

 </mapper>
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/open-data"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/open-data"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>

--- a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/oper-access"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-access"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/oper-crm"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-crm"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/oper-customize"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-customize"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/resi-group"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-group"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/resi-guide"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-guide"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/resi-hall"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-hall"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/resi-home"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-home"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/resi-mine"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-mine"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/resi-partymember"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-partymember"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/resi-voice"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-voice"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java
@ -0,0 +1,35 @@
+package com.epmet.remote;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * epmet用户远程服务工具
+ */
+@Component
+public class EpmetUserRemoteService implements ResultDataResolver {
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+    /**
+     * 查询当前登录用户信息
+     * @return
+     */
+    public LoginUserDetailsResultDTO getLoginUserDetails() {
+        //    不传组织id，则基于当前组织查询
+        LoginUserDetailsFormDTO loinUserForm = new LoginUserDetailsFormDTO();
+        loinUserForm.setApp(EpmetRequestHolder.getLoginUserApp());
+        loinUserForm.setClient(EpmetRequestHolder.getLoginUserClient());
+        loinUserForm.setUserId(EpmetRequestHolder.getLoginUserId());
+        LoginUserDetailsResultDTO loginUserDetailsResultDTO = getResultDataOrThrowsException(epmetUserOpenFeignClient.getLoginUserDetails(loinUserForm), ServiceConstant.GOV_ORG_SERVER,
+                null, null, "查询当前工作人员所属组织信息失败");
+        return loginUserDetailsResultDTO;
+    }
+}
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@ -61,6 +61,17 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     **/
    void upTable(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);

+    /**
+     * @description: 选择性更新（只更新不为null的）
+     * @param tableName:
+     * @param id:
+     * @param map:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/4/23 9:03 PM
+     */
+    void updateTableSelective(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
+
    List<Map<String, Object>> selectListResiMap(@Param("customerId") String customerId,
                                                @Param("formCode") String formCode,
                                                @Param("conditions") List<ResiUserQueryValueDTO> conditions,
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@ -547,7 +547,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res

                if (existingResiMap != null) {
                    // 修改居民信息
-                    icResiUserDao.upTable(tableName, existingResiMap.get("ID"), columnAndValues);
+                    icResiUserDao.updateTableSelective(tableName, existingResiMap.get("ID"), columnAndValues);

                    // 任意组织维度一个发生变化，则放到调动居民缓存中
                    ResiImportChangedData transferData;
@ -747,7 +747,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                if (CollectionUtils.isNotEmpty(subInfos)) {
                    Map<String, Object> subInfo = subInfos.get(0);
                    // 附加信息存在，更新附加表内容
-                    icResiUserDao.upTable(targetTableName, subInfo.get("ID").toString(), columnAndValues);
+                    icResiUserDao.updateTableSelective(targetTableName, subInfo.get("ID").toString(), columnAndValues);
                } else {
                    // 新增附加表信息
                    columnAndValues.put("CREATED_BY", currentUserId);
@ -1577,7 +1577,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
    private void updateMainTableResiTypeFlag(IcResiUserTableEnum icResiUserTableEnum, String resiUserId) {
        HashMap<String, Boolean> map = new HashMap<>();
        map.put(icResiUserTableEnum.getMainTableFlagColumnName(), true);
-        icResiUserDao.upTable(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
+        icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
    }

    /**
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@ -708,7 +708,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
            throw new RenException(String.format("居民信息修改，获取基础信息失败，基础信息Id->", resiUserId));
        }
        //2022-1-18 信息修改判断基础信息表人员网格、小区、楼栋、单元、房屋维度数据以及十八类的类别数据是否变化，相应生成变更记录和变更明细数据  sun  start
-        icUserChangeRecord(tokenDto, entity, map);
+        icUserChangeRecord(entity, map);
        //2022-1-18  sun end
        //2.更新主表数据
        if (map.size() > NumConstant.ONE) {
@ -789,10 +789,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Author sun
-     * @Description 居民信息修改--生成变更记录和变更明细
-     **/
-    private void icUserChangeRecord(TokenDto tokenDto, IcResiUserEntity entity, LinkedHashMap<String, String> map) {
+     * @description: 生成居民变更记录
+     * @param null:
+     * @return
+     * @author: sun
+     */
+    public void icUserChangeRecord(IcResiUserEntity entity, LinkedHashMap<String, String> map) {
+        // prepare
+        String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+        String staffId = EpmetRequestHolder.getLoginUserId();
+
        java.util.Date date = new java.util.Date();
        //1.判断维度数据是否修改【网格、小区、楼栋、单元、房间有变化则先走人员调动逻辑】
        if ((map.containsKey("GRID_ID") && !entity.getGridId().equals(map.get("GRID_ID"))) || (map.containsKey("VILLAGE_ID") && !entity.getVillageId().equals(map.get("VILLAGE_ID")))
@ -809,13 +815,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
            formDTO.setNewHouseId(map.containsKey("HOME_ID") ? map.get("HOME_ID") : entity.getHomeId());
            formDTO.setTransferTime(date);
            formDTO.setIdEdit(false);
-            formDTO.setCustomerId(tokenDto.getCustomerId());
-            formDTO.setStaffId(tokenDto.getUserId());
+            formDTO.setCustomerId(customerId);
+            formDTO.setStaffId(staffId);
            icUserTransferRecordService.add(formDTO);
        }
        //2.判断类别数据是否修改[类别修改的变更明细里边存修改后的新值，是就存1否就存-1]
        IcResiCategoryStatsConfigDTO sfdto = new IcResiCategoryStatsConfigDTO();
-        sfdto.setCustomerId(tokenDto.getCustomerId());
+        sfdto.setCustomerId(customerId);
        Result<List<IcResiCategoryStatsConfigDTO>> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(sfdto);
        if (!categoryListResult.success()) {
            throw new RenException("居民信息修改，获取客户居民类别预警配置表数据失败");
@ -840,7 +846,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                afterChangeName.append(dto.getLabel()).append(":").append("1".equals(newVlaue) ? "是" : "否").append(";");
                //变更明细里边存修改后的新值，是就存1否就存-1
                categoryEntity = new IcUserChangeDetailedEntity();
-                categoryEntity.setCustomerId(tokenDto.getCustomerId());
+                categoryEntity.setCustomerId(customerId);
                categoryEntity.setPids(entity.getPids());
                categoryEntity.setAgencyId(entity.getAgencyId());
                categoryEntity.setGridId(map.containsKey("GRID_ID") ? map.get("GRID_ID") : entity.getGridId());
@ -859,9 +865,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
        //居民信息修改中有类别修改的才会生成变更记录和变更明细
        if (list.size() > NumConstant.ZERO) {
            //变更记录
-            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-            changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
-            changeRecordEntity.setOperatorId(tokenDto.getUserId());
+            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+            changeRecordEntity.setCustomerId(customerId);
+            changeRecordEntity.setOperatorId(staffId);
            changeRecordEntity.setIcUserId(entity.getId());
            changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
            changeRecordEntity.setIcUserName(map.containsKey("NAME") ? map.get("NAME") : entity.getName());
--- a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
@ -3,7 +3,8 @@
    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
    <include resource="logback-base.xml"/>

-    <property name="log.path" value="logs/epmetuser"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/epmetuser"/>

    <springProperty scope="context" name="appname" source="spring.application.name"/>
    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@ -73,6 +73,19 @@
        WHERE id = #{id}
    </update>

+    <!-- 选择性更新（只更新不为null的） -->
+    <update id="updateTableSelective">
+        UPDATE ${tableName}
+        SET
+        <foreach collection="map.entrySet()" index="key" item="value" separator=",">
+            <if test="value != null and value != ''">
+                ${key} = #{value}
+            </if>
+        </foreach>
+        ,UPDATED_TIME = NOW()
+        WHERE id = #{id}
+    </update>
+

    <select id="selectListMapById" parameterType="map" resultType="map">
        select * from ic_resi_user where del_flag='0' and id=#{icResiUserId} and customer_id=#{customerId}