From f4f89692ffc2f7a547f903d27278b8c12756f49b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 24 Apr 2023 13:10:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4Logba?=
 =?UTF-8?q?ck=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E6=89=A7=E8=A1=8Cjvm=E5=8F=82=E6=95=B0=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5=E3=80=82=E9=BB=98=E8=AE=A4./logs/myservice=E3=80=82?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8C=87=E5=AE=9A=E6=96=B9=E5=BC=8F=EF=BC=9A?=
 =?UTF-8?q?-Dlog.dir=3D/Volumes/data/epmetlog=EF=BC=8C=E5=88=99=E4=BC=9A?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=88=B0/Volumes/data/epmetlog/myservice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-admin-server/src/main/resources/logback-spring.xml   | 3 ++-
 epmet-auth/src/main/resources/logback-spring.xml               | 3 ++-
 epmet-gateway/src/main/resources/logback-spring.xml            | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../data-report-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../epmet-demo-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../epmet-ext-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../epmet-heart-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../epmet-job-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../epmet-message-server/src/main/resources/logback-spring.xml | 3 ++-
 .../epmet-oss-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../epmet-point-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../epmet-third-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../gov-access-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../gov-grid-server/src/main/resources/logback-spring.xml      | 3 ++-
 .../gov-issue-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../gov-mine-server/src/main/resources/logback-spring.xml      | 3 ++-
 .../gov-org-server/src/main/resources/logback-spring.xml       | 3 ++-
 .../gov-project-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../gov-voice-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../oper-access-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../oper-crm-server/src/main/resources/logback-spring.xml      | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../resi-group-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../resi-guide-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../resi-hall-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../resi-home-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../resi-mine-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../resi-voice-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../epmet-user-server/src/main/resources/logback-spring.xml    | 3 ++-
 35 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
index 3d27fa4d07..2b7d942e79 100644
--- 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"/>
 
diff --git a/epmet-auth/src/main/resources/logback-spring.xml b/epmet-auth/src/main/resources/logback-spring.xml
index 3ddc774384..10e7129112 100644
--- 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"/>
diff --git a/epmet-gateway/src/main/resources/logback-spring.xml b/epmet-gateway/src/main/resources/logback-spring.xml
index 1e050e9686..652ce500c4 100644
--- 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"/>
diff --git 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
index c639482221..d1cb010d4f 100644
--- 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"/>
diff --git 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
index 86de057fc6..53c7e59c69 100644
--- 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"/>
diff --git 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
index 7d2b7648a3..c320f80c0d 100644
--- 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"/>
diff --git 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
index 280e9f4bb2..c639444cee 100644
--- 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"/>
 
diff --git 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
index dbd4fe85bb..9102439017 100644
--- 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"/>
diff --git 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
index 1b8b94ba78..4f79c1b027 100644
--- 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"/>
 
diff --git 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
index 8f428f8d5f..aa0f9f0a7b 100644
--- 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"/>
diff --git 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
index b03ee98c4c..2239f625db 100644
--- 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"/>
diff --git 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
index 36cbaf8d12..999b42342b 100644
--- 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"/>
diff --git 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
index 338e0b9495..ddb20915c4 100644
--- 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"/>
diff --git 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
index 8a71d1a810..d18ef07d28 100644
--- 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"/>
diff --git 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
index e279b43303..81366ebe09 100644
--- 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"/>
diff --git 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
index f8e2164fb7..70dde2e876 100644
--- 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"/>
diff --git 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
index 9070f33f63..521b890c6c 100644
--- 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"/>
 
diff --git 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
index b54d66f380..d0e5f2b64c 100644
--- 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"/>
diff --git 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
index 26e92fef88..d31ef9d410 100644
--- 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"/>
diff --git 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
index 33466c3178..31d1a8af02 100644
--- 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"/>
diff --git 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
index f366605fba..5371a1f541 100644
--- 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"/>
diff --git 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
index a1e8c5f1b0..ad19a235ae 100644
--- 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"/>
diff --git 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
index 6c230be6bf..c26e31a513 100644
--- 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"/>
diff --git 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
index 36ddc6f222..03c538fdc0 100644
--- 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"/>
 
diff --git 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
index e22bb16a66..080c035973 100644
--- 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"/>
diff --git 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
index b670ba07bf..5a0f538ff1 100644
--- 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"/>
diff --git 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
index cedd663d22..40a734010f 100644
--- 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"/>
diff --git 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
index 6a517afaff..bbc34e798a 100644
--- 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"/>
diff --git 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
index 126316c645..a42f347111 100644
--- 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"/>
diff --git 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
index a5db66cb09..049506c162 100644
--- 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"/>
diff --git 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
index 0b5eedfde0..490067bb31 100644
--- 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"/>
diff --git 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
index f797654dbd..a0c67122f7 100644
--- 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"/>
diff --git 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
index b8b3161188..1bc47d8520 100644
--- 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"/>
diff --git 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
index 408ee874df..a69c72cdd0 100644
--- 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"/>
diff --git a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
index 899eed6c7a..a3b40f72e6 100644
--- 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"/>

From 758c77c7cf3cd5a0be55f0cc8c67a6624594a96b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 24 Apr 2023 13:40:08 +0800
Subject: [PATCH 2/2] 1.fix

---
 .../main/java/com/epmet/dao/IcSpecialDao.java    |  3 ++-
 .../impl/LingShanSpecialCrowdServiceImpl.java    |  6 ++++--
 .../src/main/resources/mapper/IcSpecialDao.xml   | 16 +++++++++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java
index c1b47971f2..81ac6f0eba 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java
@@ -14,7 +14,8 @@ public interface IcSpecialDao extends BaseDao<IcSpecialEntity> {
     public IcSpecialEntity selectByResiId(@Param("resiId") String resiId);
 
     List<LingShanSpecialCrowdListResultDTO> listSpecialCrowd(@Param("orgIdPath") String orgIdPath,
-                                                             @Param("agencyId") String agencyId,
+                                                             @Param("orgId") String orgId,
+                                                             @Param("orgType") String orgType,
                                                              @Param("specialType") String specialType,
                                                              @Param("name") String name,
                                                              @Param("mobile") String mobile,
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java
index 1f3c3a6b83..58b343808f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java
@@ -612,10 +612,12 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
         if (StringUtils.isNotBlank(orgId)) {
             orgIdPath = CustomerOrgRedis.getOrgIdPath(orgId, orgType);
         } else {
-             orgIdPath = epmetUserRemoteService.getLoginUserDetails().getOrgIdPath();
+             // 前端没传递，那就用当前staff所属的
+            orgIdPath = epmetUserRemoteService.getLoginUserDetails().getOrgIdPath();
+            orgType = "agency";
         }
         PageHelper.startPage(pageNo, pageSize);
-        List<LingShanSpecialCrowdListResultDTO> l = icSpecialDao.listSpecialCrowd(orgIdPath, orgType, specialType, name, mobile, idCard);
+        List<LingShanSpecialCrowdListResultDTO> l = icSpecialDao.listSpecialCrowd(orgIdPath, orgId, orgType, specialType, name, mobile, idCard);
         // List<LingShanSpecialCrowdListResultDTO> l = specialCrowdPersonTypeDao.listSpecialCrowds(orgIdPath, orgType, specialType, name, mobile, idCard);
         l.forEach(i -> {
             IcResiUserDTO resi = icResiUserDao.getResiUserByIdCard(i.getIdCard(), customerId);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml
index 7fe616b679..5d66f2482f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml
@@ -18,19 +18,25 @@
              , s.SPECIAL_RQLB SPECIAL_TYPES_STR
         from ic_resi_user r
                  inner join ic_special s on (r.ID = s.IC_RESI_USER and s.DEL_FLAG = 0)
-        where r.DEL_FLAG = 0
+        where
+            r.DEL_FLAG = 0
+            and (r.PIDS like CONCAT(#{orgIdPath}, '%')
+                <if test="orgType == 'agency'">
+                    or r.AGENCY_ID = #{orgId}
+                </if>
+                <if test="orgType == 'grid'">
+                    or r.GRID_ID = #{orgId}
+                </if>
+            )
             <if test="name != null and name != ''">
                 and r.NAME like CONCAT('%', #{name}, '%')
             </if>
             <if test="specialType != null and specialType != ''">
-                and s.SPECIAL_RQLB like #{specialType}
+                and s.SPECIAL_RQLB like CONCAT('%', #{specialType}, '%')
             </if>
             <if test="idCard != null and idCard != ''">
                 and r.ID_CARD like CONCAT('%', #{idCard}, '%')
             </if>
-            <if test="orgIdPath != null and orgIdPath != ''">
-                and r.PIDS like CONCAT(#{orgIdPath}, '%') or r.AGENCY_ID = #{agencyId}
-            </if>
             <if test="mobile != null and mobile != ''">
                 and r.MOBILE like CONCAT('%', #{mobile}, '%')
             </if>