区分正式与测试配置修改
This commit is contained in:
58
api-gateway/src/main/resources/application-prod.yml
Normal file
58
api-gateway/src/main/resources/application-prod.yml
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
#网关
|
||||||
|
server:
|
||||||
|
port: 8001
|
||||||
|
|
||||||
|
spring:
|
||||||
|
application:
|
||||||
|
name: api-gateway
|
||||||
|
cloud:
|
||||||
|
nacos:
|
||||||
|
username: nacos
|
||||||
|
password: nacos
|
||||||
|
discovery:
|
||||||
|
server-addr: 192.168.0.142:8848
|
||||||
|
#路由配置
|
||||||
|
gateway:
|
||||||
|
routes:
|
||||||
|
#用户中心
|
||||||
|
- id: user_center_route
|
||||||
|
uri: lb://user-center
|
||||||
|
predicates:
|
||||||
|
- Path=/api/sys/**
|
||||||
|
#业务中心
|
||||||
|
- id: business_route
|
||||||
|
uri: lb://business-service
|
||||||
|
predicates:
|
||||||
|
- Path=/api/business/**
|
||||||
|
#数据采集
|
||||||
|
- id: datacollect_route
|
||||||
|
uri: lb://datacollect-service
|
||||||
|
predicates:
|
||||||
|
- Path=/api/datacollect/**
|
||||||
|
#定时任务中心
|
||||||
|
- id: xxl_job_admin_route
|
||||||
|
uri: lb://xxl-job-admin
|
||||||
|
predicates:
|
||||||
|
- Path=/job-admin/**
|
||||||
|
#多媒体文件
|
||||||
|
- id: file_center_route
|
||||||
|
uri: lb://file-center
|
||||||
|
predicates:
|
||||||
|
- Path=/api/media/**
|
||||||
|
|
||||||
|
#告警和流程中心
|
||||||
|
- id: flow_center_route
|
||||||
|
uri: lb://flowable-center
|
||||||
|
predicates:
|
||||||
|
- Path=/api/flow/**
|
||||||
|
|
||||||
|
#actuator监控检查配置
|
||||||
|
management:
|
||||||
|
endpoint:
|
||||||
|
health:
|
||||||
|
show-details: always
|
||||||
|
health:
|
||||||
|
redis:
|
||||||
|
enabled: false
|
||||||
|
#需要校验:true ,不需要校验:false
|
||||||
|
isCheckLicence: false
|
||||||
@ -9,9 +9,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/api-gateway/api-gateway.log</file>
|
<file>/www/zzkjcloud/logs/api-gateway/api-gateway.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/api-gateway/api-gateway.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/api-gateway/api-gateway.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
||||||
|
|||||||
@ -126,6 +126,9 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<version>2.2.12.RELEASE</version>
|
<version>2.2.12.RELEASE</version>
|
||||||
|
<configuration>
|
||||||
|
<includeSystemScope>true</includeSystemScope>
|
||||||
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|||||||
@ -17,7 +17,7 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 192.168.0.142:8848
|
||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://192.168.0.236:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
|
url: jdbc:mysql://192.168.0.236:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
|
||||||
|
|||||||
@ -9,9 +9,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/business-service/business-service.log</file>
|
<file>/www/zzkjcloud/logs/business-service/business-service.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/business-service/business-service.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/business-service/business-service.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<!--180天-->
|
<!--180天-->
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
@ -29,9 +29,9 @@
|
|||||||
|
|
||||||
<!--Error级别-->
|
<!--Error级别-->
|
||||||
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/business-service/business-service-error.log</file>
|
<file>/www/zzkjcloud/logs/business-service/business-service-error.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/business-service/business-service-error.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/business-service/business-service-error.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<!--180天-->
|
<!--180天-->
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
|
|||||||
@ -140,6 +140,9 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<version>2.2.12.RELEASE</version>
|
<version>2.2.12.RELEASE</version>
|
||||||
|
<configuration>
|
||||||
|
<includeSystemScope>true</includeSystemScope>
|
||||||
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@ -151,5 +154,4 @@
|
|||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@ -114,7 +114,19 @@ public class MqttConfigUtil {
|
|||||||
"+/device/5d4297256f02ebc2",
|
"+/device/5d4297256f02ebc2",
|
||||||
"+/device/67aa37e699e1e08f",
|
"+/device/67aa37e699e1e08f",
|
||||||
"+/device/ea0ebfbfa1487bd2",
|
"+/device/ea0ebfbfa1487bd2",
|
||||||
"+/device/aa8a43d326dddb3f"
|
"+/device/aa8a43d326dddb3f",
|
||||||
|
"+/device/82d40d7dbcfc884e",
|
||||||
|
"+/device/34ee15e05a3133bc",
|
||||||
|
"+/device/ee2508ba91664376",
|
||||||
|
"+/device/48c18f2a756dcc28",
|
||||||
|
"+/device/056d38ac91f61ffd",
|
||||||
|
"+/device/60f2bbbc054bfa03",
|
||||||
|
"+/device/50fdebcf6eb85a49",
|
||||||
|
"+/device/227a752b9bfb6b02",
|
||||||
|
"+/device/d60a05bcd086f160",
|
||||||
|
"+/device/f3c813d5e3d7fd99",
|
||||||
|
"+/device/cd6cb4a64b42bda5",
|
||||||
|
"+/device/436de647bbf01b22"
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -47,7 +47,7 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 192.168.0.142:8848
|
||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://192.168.0.236:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
|
url: jdbc:mysql://192.168.0.236:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
|
||||||
@ -63,7 +63,7 @@ spring:
|
|||||||
redis:
|
redis:
|
||||||
port: 6379 #端口
|
port: 6379 #端口
|
||||||
timeout: 3000ms #连接超时
|
timeout: 3000ms #连接超时
|
||||||
host: 1.95.153.121 #单机
|
host: 192.168.0.236 #单机
|
||||||
password: zzkj@688737
|
password: zzkj@688737
|
||||||
database: 0
|
database: 0
|
||||||
lettuce:
|
lettuce:
|
||||||
|
|||||||
@ -53,7 +53,7 @@ largeScreen:
|
|||||||
#mqtt接外部数据使用
|
#mqtt接外部数据使用
|
||||||
mqtt1:
|
mqtt1:
|
||||||
url: tcp://1.95.131.171:1883
|
url: tcp://1.95.131.171:1883
|
||||||
userName: root
|
userName: admin
|
||||||
passWord: zzkj@688737
|
passWord: zzkj@688737
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
keepAlive: 60
|
keepAlive: 60
|
||||||
|
|||||||
@ -9,9 +9,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/datacollect-service/datacollect-service.log</file>
|
<file>/www/zzkjcloud/logs/datacollect-service/datacollect-service.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/datacollect-service/datacollect-service.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/datacollect-service/datacollect-service.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
||||||
@ -28,9 +28,9 @@
|
|||||||
|
|
||||||
<!--Error级别-->
|
<!--Error级别-->
|
||||||
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/datacollect-service/datacollect-service-error.log</file>
|
<file>/www/zzkjcloud/logs/datacollect-service/datacollect-service-error.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/datacollect-service/datacollect-service-error.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/datacollect-service/datacollect-service-error.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<!--180天-->
|
<!--180天-->
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
|
|||||||
@ -205,6 +205,9 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<version>2.2.12.RELEASE</version>
|
<version>2.2.12.RELEASE</version>
|
||||||
|
<configuration>
|
||||||
|
<includeSystemScope>true</includeSystemScope>
|
||||||
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|||||||
@ -117,7 +117,18 @@ public class MqttConfigUtil {
|
|||||||
"+/device/67aa37e699e1e08f",
|
"+/device/67aa37e699e1e08f",
|
||||||
"+/device/ea0ebfbfa1487bd2",
|
"+/device/ea0ebfbfa1487bd2",
|
||||||
"+/device/aa8a43d326dddb3f",
|
"+/device/aa8a43d326dddb3f",
|
||||||
"1/device/+"
|
"+/device/82d40d7dbcfc884e",
|
||||||
|
"+/device/34ee15e05a3133bc",
|
||||||
|
"+/device/ee2508ba91664376",
|
||||||
|
"+/device/48c18f2a756dcc28",
|
||||||
|
"+/device/056d38ac91f61ffd",
|
||||||
|
"+/device/60f2bbbc054bfa03",
|
||||||
|
"+/device/50fdebcf6eb85a49",
|
||||||
|
"+/device/227a752b9bfb6b02",
|
||||||
|
"+/device/d60a05bcd086f160",
|
||||||
|
"+/device/f3c813d5e3d7fd99",
|
||||||
|
"+/device/cd6cb4a64b42bda5",
|
||||||
|
"+/device/436de647bbf01b22"
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -7,9 +7,9 @@ server:
|
|||||||
|
|
||||||
#mqtt
|
#mqtt
|
||||||
mqtt:
|
mqtt:
|
||||||
url: tcp://1.95.170.86:1883
|
url: tcp://1.95.131.171:1883
|
||||||
userName: admin
|
userName: admin
|
||||||
passWord: zzkj688737
|
passWord: zzkj@688737
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
keepAlive: 60
|
keepAlive: 60
|
||||||
|
|
||||||
|
|||||||
@ -7,9 +7,9 @@ server:
|
|||||||
|
|
||||||
#mqtt
|
#mqtt
|
||||||
mqtt:
|
mqtt:
|
||||||
url: tcp://1.95.131.171:1883
|
url: tcp://123.60.190.77:1883 # hz线上环境MQTT
|
||||||
userName: admin
|
userName: admin
|
||||||
passWord: zzkj@688737
|
passWord: public
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
keepAlive: 60
|
keepAlive: 60
|
||||||
|
|
||||||
@ -58,7 +58,7 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 192.168.0.142:8848
|
||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://192.168.0.236:3306/file_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
|
url: jdbc:mysql://192.168.0.236:3306/file_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
|
||||||
|
|||||||
@ -9,9 +9,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/file-center/file-center.log</file>
|
<file>/www/zzkjcloud/logs/file-center/file-center.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/file-center/file-center.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/file-center/file-center.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
||||||
|
|||||||
@ -63,6 +63,9 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<version>2.2.12.RELEASE</version>
|
<version>2.2.12.RELEASE</version>
|
||||||
|
<configuration>
|
||||||
|
<includeSystemScope>true</includeSystemScope>
|
||||||
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|||||||
@ -14,7 +14,7 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 192.168.0.142:8848
|
||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://192.168.0.236:3306/flow_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
|
url: jdbc:mysql://192.168.0.236:3306/flow_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
|
||||||
@ -31,7 +31,7 @@ spring:
|
|||||||
redis:
|
redis:
|
||||||
port: 6379 #端口
|
port: 6379 #端口
|
||||||
timeout: 300000ms #连接超时
|
timeout: 300000ms #连接超时
|
||||||
host: 1.95.153.121 #单机
|
host: 192.168.0.236 #单机
|
||||||
password: zzkj@688737
|
password: zzkj@688737
|
||||||
database: 0
|
database: 0
|
||||||
lettuce:
|
lettuce:
|
||||||
|
|||||||
@ -9,9 +9,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/flowable-center/flowable-center.log</file>
|
<file>/www/zzkjcloud/logs/flowable-center/flowable-center.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/flowable-center/flowable-center.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/flowable-center/flowable-center.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<!--180天-->
|
<!--180天-->
|
||||||
<maxHistory>7</maxHistory>
|
<maxHistory>7</maxHistory>
|
||||||
@ -29,9 +29,9 @@
|
|||||||
|
|
||||||
<!--Error级别-->
|
<!--Error级别-->
|
||||||
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/flowable-center/flowable-center-error.log</file>
|
<file>/www/zzkjcloud/logs/flowable-center/flowable-center-error.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/flowable-center/flowable-center-error.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/flowable-center/flowable-center-error.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<!--180天-->
|
<!--180天-->
|
||||||
<maxHistory>7</maxHistory>
|
<maxHistory>7</maxHistory>
|
||||||
|
|||||||
30
pom.xml
30
pom.xml
@ -166,11 +166,11 @@
|
|||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--JWT-->
|
<!--JWT-->
|
||||||
<dependency>
|
<!-- <dependency>-->
|
||||||
<groupId>io.jsonwebtoken</groupId>
|
<!-- <groupId>io.jsonwebtoken</groupId>-->
|
||||||
<artifactId>jjwt</artifactId>
|
<!-- <artifactId>jjwt</artifactId>-->
|
||||||
<version>${jjwt.version}</version>
|
<!-- <version>${jjwt.version}</version>-->
|
||||||
</dependency>
|
<!-- </dependency>-->
|
||||||
<!--Lombok-->
|
<!--Lombok-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
@ -335,16 +335,16 @@
|
|||||||
<version>${ip2region.version}</version>
|
<version>${ip2region.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- skywalking 整合 logback -->
|
<!-- skywalking 整合 logback -->
|
||||||
<dependency>
|
<!-- <dependency>-->
|
||||||
<groupId>org.apache.skywalking</groupId>
|
<!-- <groupId>org.apache.skywalking</groupId>-->
|
||||||
<artifactId>apm-toolkit-logback-1.x</artifactId>
|
<!-- <artifactId>apm-toolkit-logback-1.x</artifactId>-->
|
||||||
<version>${apm-toolkit.version}</version>
|
<!-- <version>${apm-toolkit.version}</version>-->
|
||||||
</dependency>
|
<!-- </dependency>-->
|
||||||
<dependency>
|
<!-- <dependency>-->
|
||||||
<groupId>org.apache.skywalking</groupId>
|
<!-- <groupId>org.apache.skywalking</groupId>-->
|
||||||
<artifactId>apm-toolkit-trace</artifactId>
|
<!-- <artifactId>apm-toolkit-trace</artifactId>-->
|
||||||
<version>${apm-toolkit.version}</version>
|
<!-- <version>${apm-toolkit.version}</version>-->
|
||||||
</dependency>
|
<!-- </dependency>-->
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
<!--<build>
|
<!--<build>
|
||||||
|
|||||||
@ -11,11 +11,11 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 192.168.0.142:8848
|
||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
|
driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
|
||||||
url: jdbc:TAOS-RS://1.95.153.121:6041/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
|
url: jdbc:TAOS-RS://192.168.0.236:6041/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
|
||||||
username: root
|
username: root
|
||||||
password: taosdata
|
password: taosdata
|
||||||
druid:
|
druid:
|
||||||
@ -29,7 +29,7 @@ spring:
|
|||||||
redis:
|
redis:
|
||||||
port: 6379 #端口
|
port: 6379 #端口
|
||||||
timeout: 3000ms #连接超时
|
timeout: 3000ms #连接超时
|
||||||
host: 1.95.153.121 #单机
|
host: 192.168.0.236 #单机
|
||||||
password: zzkj@688737
|
password: zzkj@688737
|
||||||
database: 0
|
database: 0
|
||||||
|
|
||||||
|
|||||||
@ -9,9 +9,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/td-service/td-service.log</file>
|
<file>/www/zzkjcloud/logs/td-service/td-service.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/td-service/td-service.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/td-service/td-service.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
||||||
@ -27,9 +27,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/td-service/td-service-error.log</file>
|
<file>/www/zzkjcloud/logs/td-service/td-service-error.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/td-service/td-service-error.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/td-service/td-service-error.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
||||||
|
|||||||
@ -18,7 +18,7 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 192.168.0.142:8848
|
||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://192.168.0.236:3306/user_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
|
url: jdbc:mysql://192.168.0.236:3306/user_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
|
||||||
@ -38,7 +38,7 @@ spring:
|
|||||||
redis:
|
redis:
|
||||||
port: 6379 #端口
|
port: 6379 #端口
|
||||||
timeout: 3000ms #连接超时
|
timeout: 3000ms #连接超时
|
||||||
host: 1.95.153.121 #单机
|
host: 192.168.0.236 #单机
|
||||||
password: zzkj@688737
|
password: zzkj@688737
|
||||||
database: 0
|
database: 0
|
||||||
lettuce:
|
lettuce:
|
||||||
|
|||||||
@ -9,9 +9,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/user-center/user-center.log</file>
|
<file>/www/zzkjcloud/logs/user-center/user-center.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/user-center/user-center.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/user-center/user-center.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
||||||
@ -27,9 +27,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/user-center/user-center-error.log</file>
|
<file>/www/zzkjcloud/logs/user-center/user-center-error.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/user-center/user-center-error.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>//www/zzkjcloud/logs/user-center/user-center-error.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
<!-- 除按日志记录之外,还配置了日志文件不能超过2M,若超过2M,日志文件会以索引0开始,
|
||||||
|
|||||||
@ -8,7 +8,7 @@ management.health.mail.enabled=false
|
|||||||
|
|
||||||
spring.application.name=xxl-job-admin
|
spring.application.name=xxl-job-admin
|
||||||
###nacos
|
###nacos
|
||||||
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
|
spring.cloud.nacos.discovery.server-addr=192.168.0.142:8848
|
||||||
### resources
|
### resources
|
||||||
spring.mvc.servlet.load-on-startup=0
|
spring.mvc.servlet.load-on-startup=0
|
||||||
spring.mvc.static-path-pattern=/static/**
|
spring.mvc.static-path-pattern=/static/**
|
||||||
@ -26,7 +26,7 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
|
|||||||
#mybatis.type-aliases-package=com.xxl.job.admin.core.model
|
#mybatis.type-aliases-package=com.xxl.job.admin.core.model
|
||||||
|
|
||||||
### xxl-job, datasource
|
### xxl-job, datasource
|
||||||
spring.datasource.url=jdbc:mysql://1.95.153.121:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
spring.datasource.url=jdbc:mysql://192.168.0.236:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||||
spring.datasource.username=xxl_job
|
spring.datasource.username=xxl_job
|
||||||
spring.datasource.password=zzkj@688737
|
spring.datasource.password=zzkj@688737
|
||||||
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||||
|
|||||||
@ -33,6 +33,6 @@ xxl:
|
|||||||
address:
|
address:
|
||||||
ip: 127.0.0.1
|
ip: 127.0.0.1
|
||||||
port: 9999
|
port: 9999
|
||||||
logpath: /home/hocloud/logs/xxl-job/
|
logpath: /www/zzkjcloud/logs/xxl-job/
|
||||||
logretentiondays: 30
|
logretentiondays: 30
|
||||||
|
|
||||||
|
|||||||
@ -9,12 +9,12 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 192.168.0.142:8848
|
||||||
#Redis
|
#Redis
|
||||||
redis:
|
redis:
|
||||||
port: 6379 #端口
|
port: 6379 #端口
|
||||||
timeout: 3000ms #连接超时
|
timeout: 3000ms #连接超时
|
||||||
host: 1.95.153.121 #单机
|
host: 192.168.0.236 #单机
|
||||||
password: zzkj@688737
|
password: zzkj@688737
|
||||||
database: 0
|
database: 0
|
||||||
lettuce:
|
lettuce:
|
||||||
|
|||||||
@ -9,9 +9,9 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/xxl-job/xxl-job.log</file>
|
<file>/www/zzkjcloud/logs/xxl-job/xxl-job.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/xxl-job/xxl-job.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/xxl-job/xxl-job.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<!--180天-->
|
<!--180天-->
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
@ -29,9 +29,9 @@
|
|||||||
|
|
||||||
<!--Error级别-->
|
<!--Error级别-->
|
||||||
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>/home/hocloud/logs/xxl-job/xxl-job-error.log</file>
|
<file>/www/zzkjcloud/logs/xxl-job/xxl-job-error.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<fileNamePattern>/home/hocloud/logs/xxl-job/xxl-job-error.%d{yyyy-MM-dd}-%i.log
|
<fileNamePattern>/www/zzkjcloud/logs/xxl-job/xxl-job-error.%d{yyyy-MM-dd}-%i.log
|
||||||
</fileNamePattern>
|
</fileNamePattern>
|
||||||
<!--180天-->
|
<!--180天-->
|
||||||
<maxHistory>10</maxHistory>
|
<maxHistory>10</maxHistory>
|
||||||
|
|||||||
Reference in New Issue
Block a user