diff --git a/api-gateway/src/main/resources/application-prod.yml b/api-gateway/src/main/resources/application-prod.yml new file mode 100644 index 0000000..f520edc --- /dev/null +++ b/api-gateway/src/main/resources/application-prod.yml @@ -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 \ No newline at end of file diff --git a/api-gateway/src/main/resources/logback.xml b/api-gateway/src/main/resources/logback.xml index e45398c..17ef8e7 100644 --- a/api-gateway/src/main/resources/logback.xml +++ b/api-gateway/src/main/resources/logback.xml @@ -9,9 +9,9 @@ - /home/hocloud/logs/api-gateway/api-gateway.log + /www/zzkjcloud/logs/api-gateway/api-gateway.log - /home/hocloud/logs/api-gateway/api-gateway.%d{yyyy-MM-dd}-%i.log + /www/zzkjcloud/logs/api-gateway/api-gateway.%d{yyyy-MM-dd}-%i.log 10 10 @@ -29,9 +29,9 @@ - /home/hocloud/logs/business-service/business-service-error.log + /www/zzkjcloud/logs/business-service/business-service-error.log - /home/hocloud/logs/business-service/business-service-error.%d{yyyy-MM-dd}-%i.log + /www/zzkjcloud/logs/business-service/business-service-error.%d{yyyy-MM-dd}-%i.log 10 diff --git a/data-collect-service/pom.xml b/data-collect-service/pom.xml index a0759e3..3737436 100644 --- a/data-collect-service/pom.xml +++ b/data-collect-service/pom.xml @@ -140,6 +140,9 @@ org.springframework.boot spring-boot-maven-plugin 2.2.12.RELEASE + + true + org.apache.maven.plugins @@ -151,5 +154,4 @@ - \ No newline at end of file diff --git a/data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java b/data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java index 089b05d..2984758 100644 --- a/data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java +++ b/data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java @@ -114,7 +114,19 @@ public class MqttConfigUtil { "+/device/5d4297256f02ebc2", "+/device/67aa37e699e1e08f", "+/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" }; /** diff --git a/data-collect-service/src/main/resources/application-prod.yml b/data-collect-service/src/main/resources/application-prod.yml index 7ae2e46..e9559e2 100644 --- a/data-collect-service/src/main/resources/application-prod.yml +++ b/data-collect-service/src/main/resources/application-prod.yml @@ -47,7 +47,7 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.0.142:8848 datasource: 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 @@ -63,7 +63,7 @@ spring: redis: port: 6379 #端口 timeout: 3000ms #连接超时 - host: 1.95.153.121 #单机 + host: 192.168.0.236 #单机 password: zzkj@688737 database: 0 lettuce: diff --git a/data-collect-service/src/main/resources/bootstrap.yml b/data-collect-service/src/main/resources/bootstrap.yml index 70b93ba..a96210a 100644 --- a/data-collect-service/src/main/resources/bootstrap.yml +++ b/data-collect-service/src/main/resources/bootstrap.yml @@ -53,7 +53,7 @@ largeScreen: #mqtt接外部数据使用 mqtt1: url: tcp://1.95.131.171:1883 - userName: root + userName: admin passWord: zzkj@688737 timeout: 5000 keepAlive: 60 diff --git a/data-collect-service/src/main/resources/logback.xml b/data-collect-service/src/main/resources/logback.xml index 3bf5896..0dafb43 100644 --- a/data-collect-service/src/main/resources/logback.xml +++ b/data-collect-service/src/main/resources/logback.xml @@ -9,9 +9,9 @@ - /home/hocloud/logs/datacollect-service/datacollect-service.log + /www/zzkjcloud/logs/datacollect-service/datacollect-service.log - /home/hocloud/logs/datacollect-service/datacollect-service.%d{yyyy-MM-dd}-%i.log + /www/zzkjcloud/logs/datacollect-service/datacollect-service.%d{yyyy-MM-dd}-%i.log 10 - /home/hocloud/logs/datacollect-service/datacollect-service-error.log + /www/zzkjcloud/logs/datacollect-service/datacollect-service-error.log - /home/hocloud/logs/datacollect-service/datacollect-service-error.%d{yyyy-MM-dd}-%i.log + /www/zzkjcloud/logs/datacollect-service/datacollect-service-error.%d{yyyy-MM-dd}-%i.log 10 diff --git a/file-center/pom.xml b/file-center/pom.xml index a59a8e7..8a0aa5b 100644 --- a/file-center/pom.xml +++ b/file-center/pom.xml @@ -205,6 +205,9 @@ org.springframework.boot spring-boot-maven-plugin 2.2.12.RELEASE + + true + org.apache.maven.plugins diff --git a/file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java b/file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java index 9b2b9c9..d0ff660 100644 --- a/file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java +++ b/file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java @@ -117,7 +117,18 @@ public class MqttConfigUtil { "+/device/67aa37e699e1e08f", "+/device/ea0ebfbfa1487bd2", "+/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" }; /** diff --git a/file-center/src/main/resources/application-dev.yml b/file-center/src/main/resources/application-dev.yml index 1c612c9..1da622b 100644 --- a/file-center/src/main/resources/application-dev.yml +++ b/file-center/src/main/resources/application-dev.yml @@ -7,9 +7,9 @@ server: #mqtt mqtt: - url: tcp://1.95.170.86:1883 + url: tcp://1.95.131.171:1883 userName: admin - passWord: zzkj688737 + passWord: zzkj@688737 timeout: 5000 keepAlive: 60 diff --git a/file-center/src/main/resources/application-prod.yml b/file-center/src/main/resources/application-prod.yml index bdec2ec..1f3cf9a 100644 --- a/file-center/src/main/resources/application-prod.yml +++ b/file-center/src/main/resources/application-prod.yml @@ -7,9 +7,9 @@ server: #mqtt mqtt: - url: tcp://1.95.131.171:1883 + url: tcp://123.60.190.77:1883 # hz线上环境MQTT userName: admin - passWord: zzkj@688737 + passWord: public timeout: 5000 keepAlive: 60 @@ -58,7 +58,7 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.0.142:8848 datasource: 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 diff --git a/file-center/src/main/resources/logback.xml b/file-center/src/main/resources/logback.xml index 19d81c8..3a58838 100644 --- a/file-center/src/main/resources/logback.xml +++ b/file-center/src/main/resources/logback.xml @@ -9,9 +9,9 @@ - /home/hocloud/logs/file-center/file-center.log + /www/zzkjcloud/logs/file-center/file-center.log - /home/hocloud/logs/file-center/file-center.%d{yyyy-MM-dd}-%i.log + /www/zzkjcloud/logs/file-center/file-center.%d{yyyy-MM-dd}-%i.log 10 7 @@ -29,9 +29,9 @@ - /home/hocloud/logs/flowable-center/flowable-center-error.log + /www/zzkjcloud/logs/flowable-center/flowable-center-error.log - /home/hocloud/logs/flowable-center/flowable-center-error.%d{yyyy-MM-dd}-%i.log + /www/zzkjcloud/logs/flowable-center/flowable-center-error.%d{yyyy-MM-dd}-%i.log 7 diff --git a/pom.xml b/pom.xml index 1cb12c3..1f6cf52 100644 --- a/pom.xml +++ b/pom.xml @@ -166,11 +166,11 @@ provided - - io.jsonwebtoken - jjwt - ${jjwt.version} - + + + + + org.projectlombok @@ -335,16 +335,16 @@ ${ip2region.version} - - org.apache.skywalking - apm-toolkit-logback-1.x - ${apm-toolkit.version} - - - org.apache.skywalking - apm-toolkit-trace - ${apm-toolkit.version} - + + + + + + + + + + 10 @@ -29,9 +29,9 @@ - /home/hocloud/logs/xxl-job/xxl-job-error.log + /www/zzkjcloud/logs/xxl-job/xxl-job-error.log - /home/hocloud/logs/xxl-job/xxl-job-error.%d{yyyy-MM-dd}-%i.log + /www/zzkjcloud/logs/xxl-job/xxl-job-error.%d{yyyy-MM-dd}-%i.log 10