From 7e4b38eedd3081f1777e27187895bd0dffed65c3 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 19:07:56 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95?= 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..b1f52e0 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: 8.139.5.211:30731 config: # 配置中心地址 - server-addr: qiuguo-nacos.qiuguo-iot:8848 + server-addr: 8.139.5.211:30731 # 配置文件格式 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..b1f52e0 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: 8.139.5.211:30731 config: # 配置中心地址 - server-addr: qiuguo-nacos.qiuguo-iot:8848 + server-addr: 8.139.5.211:30731 # 配置文件格式 file-extension: yml # 共享配置 From 4455a37bb819d2582b2e97ca3ee65531b7c4784d Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 19:29:47 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/user/deploy/deploy.yaml | 2 +- docker/modules/websocket/deploy/deploy.yaml | 2 +- docker/qiuguo/gateway/deploy/deploy.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/modules/user/deploy/deploy.yaml b/docker/modules/user/deploy/deploy.yaml index 3220cf5..dc87dfa 100644 --- a/docker/modules/user/deploy/deploy.yaml +++ b/docker/modules/user/deploy/deploy.yaml @@ -24,7 +24,7 @@ spec: imagePullSecrets: - name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码 containers: - - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-user-api-SNAPSHOT-v$BUILD_NUMBER + - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-user-api-SNAPSHOT-v1.0.0 readinessProbe: httpGet: path: /actuator/health diff --git a/docker/modules/websocket/deploy/deploy.yaml b/docker/modules/websocket/deploy/deploy.yaml index 8b63314..7154dc7 100644 --- a/docker/modules/websocket/deploy/deploy.yaml +++ b/docker/modules/websocket/deploy/deploy.yaml @@ -24,7 +24,7 @@ spec: imagePullSecrets: - name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码 containers: - - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-websocket-api-SNAPSHOT-v$BUILD_NUMBER + - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-box-websocket-api-SNAPSHOT-v1.0.0 readinessProbe: httpGet: path: /actuator/health diff --git a/docker/qiuguo/gateway/deploy/deploy.yaml b/docker/qiuguo/gateway/deploy/deploy.yaml index 968e92d..398306b 100644 --- a/docker/qiuguo/gateway/deploy/deploy.yaml +++ b/docker/qiuguo/gateway/deploy/deploy.yaml @@ -24,7 +24,7 @@ spec: imagePullSecrets: - name: aliyun-hub-register #提前在项目下配置访问阿里云的账号密码 containers: - - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-gateway-SNAPSHOT-v$BUILD_NUMBER + - image: $REGISTRY/$DOCKERHUB_NAMESPACE/qiuguo-iot:iot-gateway-SNAPSHOT-v1.0.0 readinessProbe: httpGet: path: /actuator/health From 239b301e0522e962648e8c44e9c5daa5100ab907 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 19:35:10 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-websocket-api/src/main/resources/bootstrap.yml | 3 --- 1 file changed, 3 deletions(-) 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 3efcfb7a724a9b97a01fa9e89291abb6cfc9dfe3 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 19:44:56 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/websocket/dockerfile | 2 +- .../iot-box-websocket-api/src/main/resources/bootstrap.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/modules/websocket/dockerfile b/docker/modules/websocket/dockerfile index 68a8ac7..66f8c44 100644 --- a/docker/modules/websocket/dockerfile +++ b/docker/modules/websocket/dockerfile @@ -13,4 +13,4 @@ WORKDIR /home/qiuguo COPY ./jar/iot-box-websocket-api.jar /home/qiuguo/iot-box-websocket-api.jar # 启动网关服务 #ENTRYPOINT ["java","-jar","iot-box-websocket-api.jar"] -CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=prod"] +CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=dev"] 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 db57474..55312fd 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,5 +1,8 @@ server: port: 8080 spring: + profiles: + # 环境配置 + active: prod application: name: qiuguo-iot-box-websocket \ No newline at end of file From aa03efba4c026acaaaa5aa72f386fbc53094d748 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 19:50:35 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-websocket-api/src/main/resources/bootstrap.yml | 3 --- 1 file changed, 3 deletions(-) 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 91433bcf7e34817ba68fdd5b926c5ce5aff3f559 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 20:00:12 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/websocket/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/modules/websocket/dockerfile b/docker/modules/websocket/dockerfile index 66f8c44..083e5ef 100644 --- a/docker/modules/websocket/dockerfile +++ b/docker/modules/websocket/dockerfile @@ -13,4 +13,4 @@ WORKDIR /home/qiuguo COPY ./jar/iot-box-websocket-api.jar /home/qiuguo/iot-box-websocket-api.jar # 启动网关服务 #ENTRYPOINT ["java","-jar","iot-box-websocket-api.jar"] -CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=dev"] +CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=test"] From bbf1202507eeb02db03da7ec14d7dbead7754c1f Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 20:10:33 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-websocket-api/src/main/resources/bootstrap-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-test.yml b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-test.yml index e13472b..b6445fc 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-test.yml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-test.yml @@ -11,4 +11,4 @@ spring: file-extension: yml # 共享配置 shared-configs: - - application-dev.${spring.cloud.nacos.config.file-extension} \ No newline at end of file + - application.${spring.cloud.nacos.config.file-extension} \ No newline at end of file From 7aa9325a241528f72baeefdd852f0afc799e2a4e Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 20:14:37 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-websocket-api/src/main/resources/bootstrap-test.yml | 2 +- .../iot-box-websocket-api/src/main/resources/bootstrap.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-test.yml b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-test.yml index b6445fc..e13472b 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-test.yml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-test.yml @@ -11,4 +11,4 @@ spring: file-extension: yml # 共享配置 shared-configs: - - application.${spring.cloud.nacos.config.file-extension} \ No newline at end of file + - application-dev.${spring.cloud.nacos.config.file-extension} \ 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 db57474..aa084ee 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,5 +1,7 @@ server: port: 8080 spring: + profiles: + active: test application: name: qiuguo-iot-box-websocket \ No newline at end of file From 79843b3b364bb0d4b2a230f33f6c9b1eb0fdf033 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 20:34:19 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=AE=97=E6=B3=95lac?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/qiuguo/iot/third/service/LacNlpService.java | 2 +- .../iot-box-websocket-api/src/main/resources/bootstrap.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/LacNlpService.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/LacNlpService.java index 53d05b5..0e238ef 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/LacNlpService.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/LacNlpService.java @@ -62,7 +62,7 @@ public class LacNlpService implements INlp { @Override public Mono geSingletNlp(String value) { - if(SpringUtil.getProperty("lac.type").equals("suanfa")){ + if(!SpringUtil.getProperty("lac.type").equals("suanfa")){ return getHubFaLac(value); } return getSuanFaLac(value); 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 aa084ee..44d79cb 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 @@ -2,6 +2,6 @@ server: port: 8080 spring: profiles: - active: test + active: dev application: name: qiuguo-iot-box-websocket \ No newline at end of file From 4aea5295e9d52a49aad5dee1cf7817925ba3d713 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 20:34:36 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=AE=97=E6=B3=95lac?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-websocket-api/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 44d79cb..aa084ee 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 @@ -2,6 +2,6 @@ server: port: 8080 spring: profiles: - active: dev + active: test application: name: qiuguo-iot-box-websocket \ No newline at end of file From cecc439dc5c759b3ceef0a91c69841baadbdb9b5 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 20:56:59 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8D=E5=90=8Cdocke?= =?UTF-8?q?r=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/websocket/dockerfile_test | 16 ++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 -- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 docker/modules/websocket/dockerfile_test diff --git a/docker/modules/websocket/dockerfile_test b/docker/modules/websocket/dockerfile_test new file mode 100644 index 0000000..68a8ac7 --- /dev/null +++ b/docker/modules/websocket/dockerfile_test @@ -0,0 +1,16 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER qiuguo + +# 挂载目录 +VOLUME /home/qiuguo +# 创建目录 +RUN mkdir -p /home/qiuguo +# 指定路径 +WORKDIR /home/qiuguo +# 复制jar文件到路径 +COPY ./jar/iot-box-websocket-api.jar /home/qiuguo/iot-box-websocket-api.jar +# 启动网关服务 +#ENTRYPOINT ["java","-jar","iot-box-websocket-api.jar"] +CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=prod"] 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 aa084ee..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,7 +1,5 @@ server: port: 8080 spring: - profiles: - active: test application: name: qiuguo-iot-box-websocket \ No newline at end of file From 6a93f12b980fca348593c6f2a7f03430454fef44 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 20:59:09 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8D=E5=90=8Cdocke?= =?UTF-8?q?r=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/websocket/dockerfile | 2 +- docker/modules/websocket/dockerfile_test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/modules/websocket/dockerfile b/docker/modules/websocket/dockerfile index 083e5ef..68a8ac7 100644 --- a/docker/modules/websocket/dockerfile +++ b/docker/modules/websocket/dockerfile @@ -13,4 +13,4 @@ WORKDIR /home/qiuguo COPY ./jar/iot-box-websocket-api.jar /home/qiuguo/iot-box-websocket-api.jar # 启动网关服务 #ENTRYPOINT ["java","-jar","iot-box-websocket-api.jar"] -CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=test"] +CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=prod"] diff --git a/docker/modules/websocket/dockerfile_test b/docker/modules/websocket/dockerfile_test index 68a8ac7..083e5ef 100644 --- a/docker/modules/websocket/dockerfile_test +++ b/docker/modules/websocket/dockerfile_test @@ -13,4 +13,4 @@ WORKDIR /home/qiuguo COPY ./jar/iot-box-websocket-api.jar /home/qiuguo/iot-box-websocket-api.jar # 启动网关服务 #ENTRYPOINT ["java","-jar","iot-box-websocket-api.jar"] -CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=prod"] +CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=test"] From c316f831b9b4532348b84cd089a79ad38dd000cb Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 21:10:26 +0800 Subject: [PATCH 13/16] =?UTF-8?q?user=20gateway=E5=A2=9E=E5=8A=A0test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/modules/user/dockerfile_test | 16 ++++++++++++++++ docker/qiuguo/gateway/dockerfile_test | 16 ++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 docker/modules/user/dockerfile_test create mode 100644 docker/qiuguo/gateway/dockerfile_test diff --git a/docker/modules/user/dockerfile_test b/docker/modules/user/dockerfile_test new file mode 100644 index 0000000..d0a4e3e --- /dev/null +++ b/docker/modules/user/dockerfile_test @@ -0,0 +1,16 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER qiuguo + +# 挂载目录 +VOLUME /home/qiuguo +# 创建目录 +RUN mkdir -p /home/qiuguo +# 指定路径 +WORKDIR /home/qiuguo +# 复制jar文件到路径 +COPY ./jar/iot-box-user-api.jar /home/qiuguo/iot-box-user-api.jar +# 启动网关服务 +#ENTRYPOINT ["java","-jar","iot-box-user-api.jar"] +CMD ["sh","-c", "java -jar iot-box-user-api.jar --spring.profiles.active=test"] diff --git a/docker/qiuguo/gateway/dockerfile_test b/docker/qiuguo/gateway/dockerfile_test new file mode 100644 index 0000000..516cdd3 --- /dev/null +++ b/docker/qiuguo/gateway/dockerfile_test @@ -0,0 +1,16 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER qiuguo + +# 挂载目录 +VOLUME /home/qiuguo +# 创建目录 +RUN mkdir -p /home/qiuguo +# 指定路径 +WORKDIR /home/qiuguo +# 复制jar文件到路径 +COPY ./jar/iot-gateway.jar /home/qiuguo/iot-gateway.jar +# 启动网关服务 +#ENTRYPOINT ["java","-jar","iot-gateway.jar"] +CMD ["sh","-c", "java -jar iot-gateway.jar --spring.profiles.active=test"] 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 db57474..9607fc6 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,5 +1,7 @@ server: port: 8080 spring: + profiles: + active: prod application: name: qiuguo-iot-box-websocket \ No newline at end of file From f7ce7e3a7773a6f30c299d3510237dca0ee6ab08 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 21:15:34 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89websocket=20prod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-websocket-api/src/main/resources/bootstrap.yml | 2 -- 1 file changed, 2 deletions(-) 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 9607fc6..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,7 +1,5 @@ server: port: 8080 spring: - profiles: - active: prod application: name: qiuguo-iot-box-websocket \ No newline at end of file From d9c1bdbe9a9a839ca534c1ecb1625732b5659228 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 21 Oct 2023 21:46:31 +0800 Subject: [PATCH 15/16] =?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 From 3f1f391869071031e2842293456bf8695c1d621a Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 23 Oct 2023 13:41:49 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89temp=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tmp/SystemTalkBindUserController.java | 88 ------------------- 1 file changed, 88 deletions(-) delete mode 100644 iot-modules/iot-customer-http-api/src/test/tmp/SystemTalkBindUserController.java diff --git a/iot-modules/iot-customer-http-api/src/test/tmp/SystemTalkBindUserController.java b/iot-modules/iot-customer-http-api/src/test/tmp/SystemTalkBindUserController.java deleted file mode 100644 index 3e82723..0000000 --- a/iot-modules/iot-customer-http-api/src/test/tmp/SystemTalkBindUserController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.admin.service.impl; - - - -import org.apache.commons.lang3.StringUtils; -import java.util.Date; -/** -*

-* 系统问答和用户绑定关系Controller类 -*

-* -* @author wulin -* @since 2023-10-23 -*/ - -@RestController -@Slf4j -@RequestMapping("/SystemTalkBindUser") -public class SystemTalkBindUserController{ - - - @Autowired - private SystemTalkBindUserService systemTalkBindUserService; - @PostMapping("/info") - public Mono selectSystemTalkBindUserByRequest(@RequestBody SystemTalkBindUserRequest request){ - return systemTalkBindUserService.selectSystemTalkBindUserByRequest(request).map(d -> {return new SystemTalkBindUserResp(d);}); - } - - - - @PostMapping("/list") - public Mono> selectSystemTalkBindUsersByRequest(@RequestBody SystemTalkBindUserRequest request){ - return systemTalkBindUserService.selectSystemTalkBindUsersByRequest(request).map(d -> { - PagerResult result = new PagerResult<>(); - result.setPageIndex(d.getPageIndex()); - result.setPageSize(d.getPageSize()); - result.setTotal(d.getTotal()); - List ds = d.getData().stream().map(new Function() { - @Override - public SystemTalkBindUserResp apply(SystemTalkBindUserEntity entity) { - return new SystemTalkBindUserResp(entity); - } - } - - ).collect(Collectors.toList()); - result.setData(ds); - return result; - }); - } - - - - @GetMapping("/id") - public Mono selectSystemTalkBindUserById(@RequestParam Long id){ - return systemTalkBindUserService.selectSystemTalkBindUserById(id).map(d -> {return new SystemTalkBindUserResp(d);}); - } - - - - @PostMapping("/save") - public Mono insertSystemTalkBindUser(@RequestBody SystemTalkBindUserEntity entity){ - return systemTalkBindUserService.insertSystemTalkBindUser(entity); - } - - - - @PostMapping("/update") - public Mono updateSystemTalkBindUserById(@RequestBody SystemTalkBindUserEntity entity){ - return systemTalkBindUserService.updateSystemTalkBindUserById(entity); - } - - - - @PostMapping("/updateCover") - public Mono updateCoverSystemTalkBindUserById(@RequestBody SystemTalkBindUserEntity entity){ - return systemTalkBindUserService.updateCoverSystemTalkBindUserById(entity); - } - - - - @PostMapping("/delete") - public Mono deleteSystemTalkBindUserById(@RequestParam Long id){ - return systemTalkBindUserService.deleteSystemTalkBindUserById(id); - } - - - -}