配置文件大改，按照最新的docker、k8s、windows安装包配置进行修改

jeecg-module-system/jeecg-system-start/Dockerfile

@@ -15,6 +15,5 @@ EXPOSE 8520
 
 #ADD ./src/main/resources/jeecg ./config/jeecg
 ADD ./jeecg-system-start-3.4.3.jar ./
-ADD ./application-prod.yml ./
 
-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.4.3.jar
+CMD java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.4.3.jar

jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml

@@ -4,10 +4,10 @@ server:
 spring:
   ##mqtt配置
   mqtt:
-    username: admin
-    password: admin123
-    host-url: tcp://172.21.92.202:1883
-    clientId: mqttId555
+    username: interlock
+    password: xrabbitmq_interlock_passwordx
+    host-url: tcp://rabbitmq:1883
+    clientId: interlock
     completionTimeout: 3000
     timeout: 1000
     keepalive: 20
@@ -17,27 +17,41 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:postgresql://172.21.92.202:10001/interlock?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: postgres
-          password: UvWrDBLgS5_bx4UvHhhs
+          url: jdbc:postgresql://postgres:5432/interlock?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: interlock
+          password: xinterlock_passwordx
           driver-class-name: org.postgresql.Driver
 
   #redis 配置
   redis:
-    database: 0
-    host: 172.21.92.202
-    port: 10004
-    password: Pvqh91w1GZBW2l86ptAW
+    database: x_redis_database_x
+    host: redis
+    port: 6379
+    password: xREDIS_PASSWORDx
 
 jeecg:
   #分布式锁配置
   redisson:
-    address: http://172.21.92.202:10004
-    password: Pvqh91w1GZBW2l86ptAW
+    address: http://redis:6379
+    password: xREDIS_PASSWORDx
     type: STANDALONE
     enabled: true
 
 postgresql:
-  url: jdbc:postgresql://172.21.92.202:10001/interlock
-  username: postgres
-  password: UvWrDBLgS5_bx4UvHhhs
+  url: jdbc:postgresql://postgres:5432/interlock
+  username: interlock
+  password: xinterlock_passwordx
+
+iotedge:
+  ip: iotedge-api
+  port: 8080
+
+sso:
+  ip: sso
+  port: 8080
+  username: ssopassroot@email.com
+  password: P@ssw0rd
+
+notification:
+  ip: notification
+  port: 3000

jeecg-module-system/jeecg-system-start/src/main/resources/application-k8s.yml

@@ -4,9 +4,9 @@ server:
 spring:
   ##mqtt配置
   mqtt:
-    username: admin
-    password: v7iAfQSjXlnLU96GZIUppKNu
-    host-url: tcp://172.21.92.181:1883
+    username: {{ $.Values.rabbitmq_mqtt.vhost }}:{{ $.Values.rabbitmq_mqtt.username }}
+    password: {{ $.Values.rabbitmq_mqtt.password }}
+    host-url: tcp://{{ $.Values.rabbitmq_mqtt.url }}:{{ $.Values.rabbitmq_mqtt.port }}
     clientId: mqttId555
     completionTimeout: 3000
     timeout: 1000
@@ -17,27 +17,41 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:postgresql://10.224.0.102:5432/interlock?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: postgres
-          password: DLSZZKWQhA96REZmquUn4OVN
+          url: jdbc:postgresql://{{ $.Values.postgres.url }}:{{ $.Values.postgres.port }}/{{ $.Values.postgres.database }}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: {{ $.Values.postgres.username }}
+          password: {{ $.Values.postgres.password }}
           driver-class-name: org.postgresql.Driver
 
   #redis 配置
   redis:
-    database: 0
-    host: redis-master.ensaas-db.svc.cluster.local
-    port: 6379
-    password: mVfTxu4qrGUZuydHVvKqd0CJ
+    database: {{ $.Values.redis.database }}
+    host: {{ $.Values.redis.url }}
+    port: {{ $.Values.redis.port }}
+    password: {{ $.Values.redis.password }}
 
 jeecg:
   #分布式锁配置
   redisson:
-    address: http://redis-master.ensaas-db.svc.cluster.local:6379
-    password: mVfTxu4qrGUZuydHVvKqd0CJ
+    address: http://{{ $.Values.redis.url }}:{{ $.Values.redis.port }}
+    password: {{ $.Values.redis.password }}
     type: STANDALONE
     enabled: true
 
 postgresql:
-  url: jdbc:postgresql://10.224.0.102:5432/interlock
-  username: postgres
-  password: DLSZZKWQhA96REZmquUn4OVN
+  url: jdbc:postgresql://{{ $.Values.postgres.url }}:{{ $.Values.postgres.port }}/{{ $.Values.postgres.database }}
+  username: {{ $.Values.postgres.username }}
+  password: {{ $.Values.postgres.password }}
+
+iotedge:
+  ip: {{ $.Values.iotedge.url }}
+  port: {{ $.Values.iotedge.port }}
+
+sso:
+  ip: {{ $.Values.sso.url }}
+  port: {{ $.Values.sso.port }}
+  username: {{ $.Values.sso.username }}
+  password: {{ $.Values.sso.password }}
+
+notification:
+  ip: {{ $.Values.notification.url }}
+  port: {{ $.Values.notification.port }}

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -4,8 +4,8 @@ server:
 spring:
   ##mqtt配置
   mqtt:
-    username: 8d08a3db8d454034a4c1aa31c171e487:22bfa49104084271b0bd0cf31e6773d0
-    password: fefb05def48f49899bbfb3a7e1d095ce
+    username: mqtt_usr
+    password: mqtt_pwd
     host-url: tcp://127.0.0.1:1883
     clientId: mqttId111
     completionTimeout: 3000
@@ -17,9 +17,9 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:postgresql://127.0.0.1:5436/interlock?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:postgresql://127.0.0.1:postgres_port/interlock?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: postgres
-          password: cfc1280b9735f2a1d67
+          password: postgres_pwd
           driver-class-name: org.postgresql.Driver
 
   #redis 配置
@@ -38,6 +38,20 @@ jeecg:
     enabled: true
 
 postgresql:
-  url: jdbc:postgresql://127.0.0.1:5436/interlock
+  url: jdbc:postgresql://127.0.0.1:postgres_port/interlock
   username: postgres
-  password: cfc1280b9735f2a1d67
+  password: postgres_pwd
+
+iotedge:
+  ip: 127.0.0.1
+  port: iotedge_port
+
+sso:
+  ip: 127.0.0.1
+  port: sso_port
+  username: sso_usr
+  password: sso_pwd
+
+notification:
+  ip: 127.0.0.1
+  port: notification_port

jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml

@@ -68,7 +68,7 @@
 
 	<!-- 日志输出级别 -->
 <!--	打包时修改该配置 改成ERROR-->
-	<root level="INFO">
+	<root level="ERROR">
 		<appender-ref ref="STDOUT" />
 		<appender-ref ref="FILE" />
 		<appender-ref ref="HTML" />