Merge branch 'dev' into release

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 # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.136</version>
+    <version>0.0.137</version>
 
     <parent>
         <groupId>com.epmet</groupId>

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<WxMaModifyDomainResult> modifyDomain = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set");
 			if (!modifyDomain.success()) {
-				throw new RenException(modifyDomain.getErrorCode(), modifyDomain.getErrorMsg());
+				log.error(modifyDomain.getErrorMsg());
 			}
 			//设置业务域名
 			WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set");
 			if (!setWebviewDomain.success()) {
-				throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
+				log.error(modifyDomain.getErrorMsg());
 			}
 		});
 	}

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
+      - 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