Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/application-pertest.yml

@@ -46,12 +46,8 @@ spring:
       sys-log: test.topic.sys.log
       chemical-classify-warning: test.topic.chemical.classify.warning
       equip-check-msg: test.topic.equip.check.msg
-      env-work-msg: test.topic.env.work.msg
-      food-work-msg: test.topic.food.work.msg
-      food-statistics-customer-contract: test.topic.food.statistics.customer.contract
-      food-statistics-contract-progress: test.topic.food.statistics.contract.progress
-      food-statistics-sample-progress: test.topic.food.statistics.sample.progress
       report-make-msg: test.topic.report.make.msg
+      soil-work-msg: test.topic.soil.work.msg
 
 # 对象存储配置
 oss:

src/main/resources/application-pro.yml

@@ -29,12 +29,8 @@ spring:
       sys-log: pro.topic.sys.log
       chemical-classify-warning: pro.topic.chemical.classify.warning
       equip-check-msg: pro.topic.equip.check.msg
-      env-work-msg: pro.topic.env.work.msg
-      food-work-msg: pro.topic.food.work.msg
-      food-statistics-customer-contract: pro.topic.food.statistics.customer.contract
-      food-statistics-contract-progress: pro.topic.food.statistics.contract.progress
-      food-statistics-sample-progress: pro.topic.food.statistics.sample.progress
       report-make-msg: pro.topic.report.make.msg
+      soil-work-msg: pro.topic.soil.work.msg
   redis:
     database: 0
     host: 124.70.154.133

src/main/resources/log4j2-pro.xml

@@ -59,7 +59,7 @@
         <AsyncLogger name="org.apache.ibatis" level="error" includeLocation="true"/>
         <AsyncLogger name="org.springframework.web" level="error" includeLocation="true"/>
         <!--root的logger-->
-        <AsyncRoot level="debug" includeLocation="true">
+        <AsyncRoot level="error" includeLocation="true">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="InfoLog"/>
             <AppenderRef ref="ErrorLog"/>