整理配置文件

amos-boot-system-equip/pom.xml

@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>amos-boot-system-equip</artifactId>
-  <version>3.6.0.6</version>
+  <version>1.0.0.16</version>
   <dependencies>
       <dependency>
 			<groupId>com.amosframework.boot</groupId>

amos-boot-system-equip/src/main/resources/application.properties

@@ -122,6 +122,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 
 
 
+logging.config=classpath:logback-${spring.profiles.active}.xml
 
 
 # 权限标识-物联区域

amos-boot-system-equip/src/main/resources/logback-dev.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/jcs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>7</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>30mb</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+<!--            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n</pattern>-->
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+
+
+    <logger name="org.redisson" level="DEBUG"/>
+    <logger name="org.apache.activemq" level="INFO"/>
+    <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
+
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+     
+    	<appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>

amos-boot-system-fas/src/main/resources/logback-dev.xml

@@ -37,7 +37,12 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
+    <logger name="org.redisson" level="DEBUG"/>
+    <logger name="org.apache.activemq" level="DEBUG"/>
     <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
 
     <!-- 日志输出级别 -->
     <root level="DEBUG">

amos-boot-system-jcs/pom.xml

@@ -9,7 +9,7 @@
 
 
   <artifactId>amos-boot-system-jcs</artifactId>
-
+    <version>1.0.0.16</version>
 
   <dependencies>
         <dependency>

amos-boot-system-jcs/src/main/resources/application-dev.properties

 ## DB properties:
-spring.datasource.url=jdbc:mysql://172.16.10.211:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.3.6:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=Yeejoin@2020
+spring.datasource.password=cz123456
 
 ## eureka properties:
-eureka.client.serviceUrl.defaultZone=http://172.16.10.211:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.211:10001/eureka/
 
 #redis 基础配置
 spring.redis.database=0
@@ -24,6 +24,7 @@ spring.redis.lettuce.shutdown-timeout=100
 
 
 
+
 #单机集群判断 cluster集群 single单机
 spring.redis.mode=cluster
 
@@ -40,6 +41,8 @@ spring.redis.cluster.retry-interval=1500
 
 
 
+
+
 ## ES properties:
 biz.elasticsearch.address=172.16.10.211
 spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
@@ -73,3 +76,5 @@ file.url=http://39.98.45.134:9000/
 video.url=https://11.11.16.4:443/
 ifc.url=http://11.11.16.17/IFCInterface
 ifc.call-back.localIp=11.11.16.1
+
+personAgencyCode=STATE_GRID
\ No newline at end of file

amos-boot-system-jcs/src/main/resources/application-single.properties

@@ -45,10 +45,7 @@ eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
 
 ## redis properties:
-spring.redis.lettuce.pool.max-active=200
-spring.redis.lettuce.pool.max-wait=-1
-spring.redis.lettuce.pool.max-idle=10
-spring.redis.lettuce.pool.min-idle=0
+
 spring.redis.expire.time=300
 #在重启服务的过程中是否清空缓存的标识符 --2021-09-09
 my.spring.redis.cache.isclean=false
@@ -151,7 +148,7 @@ eureka.client.serviceUrl.defaultZone=http://172.16.3.6:10001/eureka/
 
 
 #redis 基础配置
-spring.redis.database=0
+spring.redis.database=1
 # 连接超时时长ms
 spring.redis.timeout=10000
 spring.redis.password=

amos-boot-system-jcs/src/main/resources/logback-dev.xml

@@ -35,10 +35,14 @@
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
     <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
 
+
+    <logger name="org.redisson" level="DEBUG"/>
     <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.springframework" level="DEBUG"/>
     <logger name="org.typroject" level="DEBUG"/>
     <logger name="com.yeejoin" level="DEBUG"/>
+
+
     <!-- 日志输出级别 -->
     <root level="INFO">
      

amos-boot-system-knowledgebase/pom.xml

@@ -7,7 +7,7 @@
     <version>1.0.0</version>
   </parent>
   <artifactId>amos-boot-system-knowledgebase</artifactId>
-  <version>1.0.1.9</version>
+    <version>1.0.0.16</version>
   
   <dependencies>
         <dependency>

amos-boot-system-knowledgebase/src/main/resources/logback-dev.xml

@@ -37,7 +37,13 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
+    <logger name="org.redisson" level="DEBUG"/>
+    <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
+
 
     <!-- 日志输出级别 -->
     <root level="DEBUG">

amos-boot-system-latentdanger/src/main/resources/logback-dev.xml

@@ -37,10 +37,10 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
-    <logger name="org.springframework" level="DEBUG"/>
 
-    <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+    <logger name="org.redisson" level="DEBUG"/>
     <logger name="org.apache.activemq" level="INFO"/>
+    <logger name="org.springframework" level="DEBUG"/>
     <logger name="org.typroject" level="DEBUG"/>
     <logger name="com.yeejoin" level="DEBUG"/>
 

amos-boot-system-maintenance/pom.xml

@@ -7,6 +7,7 @@
     <version>1.0.0</version>
   </parent>
   <artifactId>amos-boot-system-maintenance</artifactId>
+    <version>1.0.0.16</version>
  <dependencies>
      <dependency>
 		<groupId>com.amosframework.boot</groupId>

amos-boot-system-maintenance/src/main/resources/logback-dev.xml

@@ -37,7 +37,12 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
+    <logger name="org.redisson" level="DEBUG"/>
+    <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
 
     <!-- 日志输出级别 -->
     <root level="DEBUG">

amos-boot-system-patrol/pom.xml

@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>amos-boot-system-patrol</artifactId>
-  <version>3.0.6</version>
+    <version>1.0.0.16</version>
 
   <dependencies>
      <dependency>

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -584,6 +584,7 @@
 		p. NAME,
 		p.id,
 		p.point_no,
+		p.point_no nonum ,
 		CASE p. LEVEL
 		WHEN '1' THEN
 		'一级'
@@ -636,6 +637,7 @@
 	<resultMap id="checkPtListResultMap" type="com.yeejoin.amos.patrol.business.entity.mybatis.CheckPtListBo">
 		 <result property="pointID" column="id" />
 		 <result property="no" column="point_no" />
+		<result property="nonum" column="nonum" />
 		 <result property="realTimeStatus" column="status" />
 		 <result property="groupName" column="department_name" />
 		 <result property="realName" column="userName" />

amos-boot-system-patrol/src/main/resources/logback-dev.xml

@@ -37,7 +37,12 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
+    <logger name="org.redisson" level="DEBUG"/>
+    <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
 
     <!-- 日志输出级别 -->
     <root level="DEBUG">

amos-boot-system-precontrol/pom.xml

@@ -8,6 +8,7 @@
     <version>1.0.0</version>
   </parent>
   <artifactId>amos-boot-system-precontrol</artifactId>
+    <version>1.0.0.16</version>
   <name>amos-boot-system-precontrol</name>
   <url>http://maven.apache.org</url>
   <properties>

amos-boot-system-supervision/pom.xml

@@ -9,6 +9,8 @@
 		<version>1.0.0</version>
 	</parent>
 	<artifactId>amos-boot-system-supervision</artifactId>
+	<version>1.0.0.16</version>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.amosframework.boot</groupId>

amos-boot-system-supervision/src/main/resources/logback-dev.xml

@@ -37,7 +37,12 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
+    <logger name="org.redisson" level="DEBUG"/>
+    <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
 
     <!-- 日志输出级别 -->
     <root level="INFO">

amos-boot-utils/amos-boot-utils-jpush/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>amos-boot-utils-jpush</artifactId>
-
+	<version>1.0.0.16</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.amosframework.boot</groupId>

amos-boot-utils/amos-boot-utils-jpush/src/main/resources/application.properties

@@ -6,6 +6,7 @@ spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.serialization.write-dates-as-timestamps=true
 
+logging.config=classpath:logback-${spring.profiles.active}.xml
 
 ##  ӽӿĵ֤
 knife4j.enable=true
@@ -23,12 +24,3 @@ spring.boot.admin.client.password=a1234560
 management.security.enabled=false
 management.endpoints.web.exposure.include=*
 
-spring.security.user.name=admin
-spring.security.user.password=a1234560
-spring.boot.admin.client.enabled=true
-spring.boot.admin.client.instance.metadata.user.name=${spring.security.user.name}
-spring.boot.admin.client.instance.metadata.user.password=${spring.security.user.password}
-spring.boot.admin.client.username=admin
-spring.boot.admin.client.password=a1234560
-management.security.enabled=false
-management.endpoints.web.exposure.include=*
\ No newline at end of file

amos-boot-utils/amos-boot-utils-jpush/src/main/resources/logback-dev.xml

@@ -37,7 +37,12 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
+    <logger name="org.redisson" level="DEBUG"/>
+    <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
 
     <!-- 日志输出级别 -->
     <root level="DEBUG">

amos-boot-utils/amos-boot-utils-video/pom.xml

@@ -4,6 +4,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>amos-boot-utils-video</artifactId>
+	<version>1.0.0.16</version>
 	<parent>
 		<artifactId>amos-boot-utils</artifactId>
 		<groupId>com.amosframework.boot</groupId>

amos-boot-utils/amos-boot-utils-video/src/main/resources/logback-dev.xml

@@ -37,7 +37,12 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
+    <logger name="org.redisson" level="DEBUG"/>
+    <logger name="org.apache.activemq" level="DEBUG"/>
     <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
 
     <!-- 日志输出级别 -->
     <root level="DEBUG">