From 228dd7d04f8adb04901eb57fd1212c6ab9d90b87 Mon Sep 17 00:00:00 2001 From: zhangqy Date: Sat, 21 Oct 2023 21:12:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iot-gateway/src/main/resources/bootstrap.yml | 2 +- iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml | 3 --- .../iot-box-websocket-api/src/main/resources/bootstrap.yml | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/iot-gateway/src/main/resources/bootstrap.yml b/iot-gateway/src/main/resources/bootstrap.yml index 9999314..f9397b8 100644 --- a/iot-gateway/src/main/resources/bootstrap.yml +++ b/iot-gateway/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: spring: profiles: # 环境配置 - active: prod + active: test application: name: qiuguo-iot-gateway diff --git a/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml index 75c3680..303ef87 100644 --- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml +++ b/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml @@ -1,8 +1,5 @@ server: port: 8080 spring: - profiles: - # 环境配置 - active: prod application: name: qiuguo-iot-box-user-api \ No newline at end of file diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap.yml b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap.yml index 55312fd..db57474 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap.yml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap.yml @@ -1,8 +1,5 @@ server: port: 8080 spring: - profiles: - # 环境配置 - active: prod application: name: qiuguo-iot-box-websocket \ No newline at end of file From 9e7cfb6f9e18cf255ccbcf1775645fa20abdd906 Mon Sep 17 00:00:00 2001 From: zhangqy Date: Sat, 21 Oct 2023 21:17:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-user-api/src/main/resources/bootstrap-prod.yml | 4 ++-- .../src/main/resources/bootstrap-prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml index fce8d46..6d97184 100644 --- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml +++ b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml @@ -3,10 +3,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: qiuguo-nacos.qiuguo-iot:8848 + server-addr: qiuguo-nacos.qiuguo-cloud:8848 config: # 配置中心地址 - server-addr: qiuguo-nacos.qiuguo-iot:8848 + server-addr: qiuguo-nacos.qiuguo-cloud:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-prod.yml b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-prod.yml index fce8d46..6d97184 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-prod.yml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-prod.yml @@ -3,10 +3,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: qiuguo-nacos.qiuguo-iot:8848 + server-addr: qiuguo-nacos.qiuguo-cloud:8848 config: # 配置中心地址 - server-addr: qiuguo-nacos.qiuguo-iot:8848 + server-addr: qiuguo-nacos.qiuguo-cloud:8848 # 配置文件格式 file-extension: yml # 共享配置 From 3ed895c974ed48168ee591550cf95a87ab4b257e Mon Sep 17 00:00:00 2001 From: zhangqy Date: Sat, 21 Oct 2023 21:24:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/user/deploy/deploy.yaml | 8 ++++---- docker/modules/websocket/deploy/deploy.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/modules/user/deploy/deploy.yaml b/docker/modules/user/deploy/deploy.yaml index 3220cf5..4ce1a95 100644 --- a/docker/modules/user/deploy/deploy.yaml +++ b/docker/modules/user/deploy/deploy.yaml @@ -29,9 +29,9 @@ spec: httpGet: path: /actuator/health port: 8080 - timeoutSeconds: 10 - failureThreshold: 30 - periodSeconds: 5 + timeoutSeconds: 30 + failureThreshold: 120 + periodSeconds: 10 imagePullPolicy: Always name: app ports: @@ -45,7 +45,7 @@ spec: terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always - terminationGracePeriodSeconds: 30 + terminationGracePeriodSeconds: 120 --- apiVersion: v1 kind: Service diff --git a/docker/modules/websocket/deploy/deploy.yaml b/docker/modules/websocket/deploy/deploy.yaml index 8b63314..06b7f16 100644 --- a/docker/modules/websocket/deploy/deploy.yaml +++ b/docker/modules/websocket/deploy/deploy.yaml @@ -29,9 +29,9 @@ spec: httpGet: path: /actuator/health port: 8080 - timeoutSeconds: 10 - failureThreshold: 30 - periodSeconds: 5 + timeoutSeconds: 30 + failureThreshold: 120 + periodSeconds: 15 imagePullPolicy: Always name: app ports: @@ -45,7 +45,7 @@ spec: terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always - terminationGracePeriodSeconds: 30 + terminationGracePeriodSeconds: 120 --- apiVersion: v1 kind: Service From d9c1bdbe9a9a839ca534c1ecb1625732b5659228 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 21:46:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=98=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/{logback-pro.xml => logback-prod.xml} | 0 .../src/main/resources/{logback-pro.xml => logback-prod.xml} | 0 .../src/main/resources/{logback-pro.xml => logback-prod.xml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename iot-modules/iot-admin-http-api/src/main/resources/{logback-pro.xml => logback-prod.xml} (100%) rename iot-modules/iot-box-user-api/src/main/resources/{logback-pro.xml => logback-prod.xml} (100%) rename iot-modules/iot-box-websocket-api/src/main/resources/{logback-pro.xml => logback-prod.xml} (100%) diff --git a/iot-modules/iot-admin-http-api/src/main/resources/logback-pro.xml b/iot-modules/iot-admin-http-api/src/main/resources/logback-prod.xml similarity index 100% rename from iot-modules/iot-admin-http-api/src/main/resources/logback-pro.xml rename to iot-modules/iot-admin-http-api/src/main/resources/logback-prod.xml diff --git a/iot-modules/iot-box-user-api/src/main/resources/logback-pro.xml b/iot-modules/iot-box-user-api/src/main/resources/logback-prod.xml similarity index 100% rename from iot-modules/iot-box-user-api/src/main/resources/logback-pro.xml rename to iot-modules/iot-box-user-api/src/main/resources/logback-prod.xml diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/logback-pro.xml b/iot-modules/iot-box-websocket-api/src/main/resources/logback-prod.xml similarity index 100% rename from iot-modules/iot-box-websocket-api/src/main/resources/logback-pro.xml rename to iot-modules/iot-box-websocket-api/src/main/resources/logback-prod.xml