From 34799c9c89375e00a364f76e3415708bc7f9b38c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 3 Sep 2020 16:24:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9F=9F=E5=90=8D=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/CodeServiceImpl.java | 4 ++-- .../src/main/resources/bootstrap.yml | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 020dcf8782..611c1a05b4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -575,12 +575,12 @@ public class CodeServiceImpl implements CodeService { //设置服务器域名 WxResult modifyDomain = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set"); if (!modifyDomain.success()) { - throw new RenException(modifyDomain.getErrorCode(), modifyDomain.getErrorMsg()); + log.error(modifyDomain.getErrorMsg()); } //设置业务域名 WxResult setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set"); if (!setWebviewDomain.success()) { - throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg()); + log.error(modifyDomain.getErrorMsg()); } }); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index d52b94a564..9a8fdb81a6 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -123,6 +123,14 @@ third: - https://epmet-dev.elinkservice.cn - https://epmet-test.elinkservice.cn webviewDomain: - - udp://epmet-cloud.elinkservice.cn - - udp://epmet-dev.elinkservice.cn - - udp://epmet-test.elinkservice.cn \ No newline at end of file + - epmet-ext.elinkservice.cn + - epmet-ext1.elinkservice.cn + - epmet-ext2.elinkservice.cn + - epmet-ext3.elinkservice.cn + - epmet-ext4.elinkservice.cn + - epmet-ext5.elinkservice.cn + - epmet-ext6.elinkservice.cn + - epmet-ext7.elinkservice.cn + - epmet-ext8.elinkservice.cn + - epmet-ext9.elinkservice.cn + - epmet-ext10.elinkservice.cn \ No newline at end of file From 0f6a9bd7ebbbf7a5bab72bd5a0600f83ae8f33d2 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 3 Sep 2020 16:31:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index a2a223a704..ba2f972f3a 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.135 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.137 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index b9b3cde204..2d090fb332 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.136 + 0.0.137 com.epmet From cac92dc42293543d6d234e83694e5f042bae9c19 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 3 Sep 2020 16:38:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9F=9F=E5=90=8D=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 9a8fdb81a6..4a3e82e619 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -123,14 +123,14 @@ third: - https://epmet-dev.elinkservice.cn - https://epmet-test.elinkservice.cn webviewDomain: - - epmet-ext.elinkservice.cn - - epmet-ext1.elinkservice.cn - - epmet-ext2.elinkservice.cn - - epmet-ext3.elinkservice.cn - - epmet-ext4.elinkservice.cn - - epmet-ext5.elinkservice.cn - - epmet-ext6.elinkservice.cn - - epmet-ext7.elinkservice.cn - - epmet-ext8.elinkservice.cn - - epmet-ext9.elinkservice.cn - - epmet-ext10.elinkservice.cn \ No newline at end of file + - https://epmet-ext.elinkservice.cn + - https://epmet-ext1.elinkservice.cn + - https://epmet-ext2.elinkservice.cn + - https://epmet-ext3.elinkservice.cn + - https://epmet-ext4.elinkservice.cn + - https://epmet-ext5.elinkservice.cn + - https://epmet-ext6.elinkservice.cn + - https://epmet-ext7.elinkservice.cn + - https://epmet-ext8.elinkservice.cn + - https://epmet-ext9.elinkservice.cn + - https://epmet-ext10.elinkservice.cn \ No newline at end of file From f7be4ec65b8cbedd4f6380725482711805280e7c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 3 Sep 2020 16:41:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index ba2f972f3a..1028ad0be9 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.137 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.138 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 2d090fb332..6eadb9e5f2 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.137 + 0.0.138 com.epmet