From d3bcb1f05ca4407de1679bea7cbf1a58159edcfd Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 13 Aug 2020 09:54:42 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/service/impl/CodeServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d07bf811bf..4d6ba89fbf 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
@@ -388,7 +388,7 @@ public class CodeServiceImpl implements CodeService {
 			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
 		}
 		//将之前上传信息删除
-		codeCustomerService.deleteCode(formDTO.getCustomerId(), codeCustomerDTO.getClientType());
+		codeCustomerService.deleteCode(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType());
 
 		//更新代码表状态
 		codeCustomerDTO.setStatus(CodeConstant.RELEASE_SUCCESS);

From 12759b3f0e0b373837f76c7924b765dd332fdb5b Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 13 Aug 2020 10:18:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/UploadListResultDTO.java   | 4 ++++
 .../src/main/resources/mapper/PaCustomerDao.xml               | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java
index 82d88b084a..7151394b94 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java
@@ -27,6 +27,10 @@ public class UploadListResultDTO implements Serializable {
 	 * 客户名
 	 */
 	private String customerName;
+	/**
+	 * 小程序名
+	 */
+	private String miniName;
 	/**
 	 * 居民端resi 工作端work
 	 */
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
index b14f2a4764..40d5efbc3a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
@@ -83,11 +83,15 @@
     </select>
     <select id="selectInitCustomerList" resultType="com.epmet.dto.result.UploadListResultDTO" parameterType="com.epmet.dto.form.UploadListFormDTO">
         SELECT pc.ID AS "customerId",
+               mi.NICK_NAME AS "miniName",
                pc.CUSTOMER_NAME,
                ai.CLIENT_TYPE,
                ai.AUTHORIZER_APPID AS "appId"
         FROM pa_customer pc
         INNER JOIN authorization_info ai ON pc.ID = ai.CUSTOMER_ID AND ai.DEL_FLAG = 0
+        INNER JOIN mini_info mi ON ai.CUSTOMER_ID = mi.CUSTOMER_ID
+        AND ai.CLIENT_TYPE = mi.CLIENT_TYPE
+        AND mi.DEL_FLAG = 0
         WHERE pc.DEL_FLAG = 0
             AND pc.SOURCE = #{source}
             AND pc.IS_INITIALIZE = 1

From b28cde0b0fce94a2db70936d047501b8bb6e0fbc Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 13 Aug 2020 13:51:00 +0800
Subject: [PATCH 3/6] heart +1        user +1

---
 .../epmet-heart-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml             | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml      | 2 +-
 epmet-user/epmet-user-server/pom.xml                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
index b06037a0ba..40f1e509f5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.48
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.49
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index 9a7c7f559c..a2185d6b09 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.48</version>
+    <version>0.0.49</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index 100b22ed13..614297ad11 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.114
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.115
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 3a3ae82237..c97c10d46f 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.114</version>
+    <version>0.3.115</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 2f8c454cb7b9148ef2b1f69267902e06baf0057b Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Thu, 13 Aug 2020 15:27:24 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=83=A8=E7=BD=B2heart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-heart-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
index 40f1e509f5..ba3776d6fe 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.49
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.50
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index a2185d6b09..5b2fef6ae2 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.49</version>
+    <version>0.0.50</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

From 0ec274261ccd5aaf8cba62c26a125cfaeaba49f9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 13 Aug 2020 16:15:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/CodeAuditResultDTO.java     | 16 +++-
 .../com/epmet/dto/form/CodeCommonFormDTO.java |  1 +
 .../com/epmet/dto/result/DomainResultDTO.java | 21 ++++++
 .../com/epmet/dto/result/ReasonResultDTO.java |  8 ++
 .../com/epmet/controller/CodeController.java  | 12 +++
 .../epmet/entity/CodeAuditResultEntity.java   | 10 +++
 .../java/com/epmet/service/CodeService.java   | 18 +++++
 .../epmet/service/impl/CodeServiceImpl.java   | 73 ++++++++++++++++---
 .../wxapi/result/WxMaModifyDomainResult.java  | 33 +++++++++
 .../result/WxMaSetWebviewDomainResult.java    | 27 +++++++
 .../epmet/wxapi/service/WxMaCodeService.java  |  6 +-
 .../service/impl/WxMaCodeServiceImpl.java     | 28 ++++---
 12 files changed, 228 insertions(+), 25 deletions(-)
 create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DomainResultDTO.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaModifyDomainResult.java
 create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaSetWebviewDomainResult.java

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
index a79140593e..910ded04de 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
@@ -68,9 +68,23 @@ public class CodeAuditResultDTO implements Serializable {
 	 */
 	private String screenShot;
 
+	/**
+	 * 素材地址
+	 */
 	private String screenShotUrl;
 
-    /**
+	/**
+	 * 反馈内容
+	 */
+	private String feedbackInfo;
+
+	/**
+	 * 反馈素材
+	 */
+	private String feedbackStuff;
+
+
+	/**
      * 乐观锁
      */
 	private Integer revision;
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java
index 9f7f31bcac..391a0d217b 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java
@@ -20,6 +20,7 @@ public class CodeCommonFormDTO implements Serializable {
 	 * 代码ID
 	 */
 	private String codeId;
+	private String clientType;
 	private String grayPercentage;
 	private String path;
 	private Integer page = 1;
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DomainResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DomainResultDTO.java
new file mode 100644
index 0000000000..207dc326e6
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DomainResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/13 16:02
+ */
+@Data
+public class DomainResultDTO implements Serializable {
+	private static final long serialVersionUID = -2534293858061449973L;
+	private List<String> requestDomain;
+	private List<String> wsRequestDomain;
+	private List<String> uploadDomain;
+	private List<String> downloadDomain;
+	private List<String> webViewDomain;
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ReasonResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ReasonResultDTO.java
index e2d9d1c2ad..4eae30d0bd 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ReasonResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ReasonResultDTO.java
@@ -23,6 +23,14 @@ public class ReasonResultDTO implements Serializable {
 	 * 失败的小程序截图url
 	 */
 	private List<String> screenshotUrl;
+	/**
+	 * 反馈内容，至多 200 字
+	 */
+	private String feedbackInfo;
+	/**
+	 * 反馈素材
+	 */
+	private String feedbackStuff;
 	/**
 	 * 提交审核时间
 	 */
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java
index b03a808edf..01014d7564 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java
@@ -208,6 +208,18 @@ public class CodeController {
 		return new Result<>();
 	}
 
+	@PostMapping("setdomains")
+	public Result setDomains(@RequestBody CodeCommonFormDTO formDTO) {
+		codeService.setDomains(formDTO);
+		return new Result<>();
+	}
+
+	@PostMapping("getdomain")
+	public Result<DomainResultDTO> getDomains(@RequestBody CodeCommonFormDTO formDTO) {
+		DomainResultDTO result = codeService.getDomains(formDTO);
+		return new Result<DomainResultDTO>().ok(result);
+	}
+
 	@PostMapping("customers")
 	public Result<PageData> getCustomerList(@RequestBody UploadListFormDTO formDTO) {
 		PageData pageData = codeService.getCustomerList(formDTO);
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
index 8ad218032f..164b8a97bb 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
@@ -70,5 +70,15 @@ public class CodeAuditResultEntity extends BaseEpmetEntity {
 
 	private String screenShotUrl;
 
+	/**
+	 * 反馈内容
+	 */
+	private String feedbackInfo;
+
+	/**
+	 * 反馈素材
+	 */
+	private String feedbackStuff;
+
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java
index ae2240010c..38e409d79b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java
@@ -154,6 +154,24 @@ public interface CodeService {
 	 */
 	void setDomain(String customerId);
 
+	/**
+	 * 设置服务器域名和业务域名
+	 * @author zhaoqifeng
+	 * @date 2020/8/6 15:34
+	 * @param formDTO
+	 * @return int
+	 */
+	void setDomains(CodeCommonFormDTO formDTO);
+
+	/**
+	 * 获取服务器域名和业务域名
+	 * @author zhaoqifeng
+	 * @date 2020/8/6 15:34
+	 * @param formDTO
+	 * @return DomainResultDTO
+	 */
+	DomainResultDTO getDomains(CodeCommonFormDTO formDTO);
+
 	/**
 	 * 已初始化客户列表
 	 * @author zhaoqifeng
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 4d6ba89fbf..216330a6e3 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
@@ -269,12 +269,14 @@ public class CodeServiceImpl implements CodeService {
 		}
 		//调用微信API上提交审核
 		WxMaCodeSubmitAuditRequest request = new WxMaCodeSubmitAuditRequest();
-		request.setVersionDesc(formDTO.getVersionDesc());
+		if(StringUtils.isBlank(formDTO.getFeedbackInfo())) {
+			request.setVersionDesc(formDTO.getVersionDesc());
+			request.setItemList(formDTO.getItemList());
+			request.setPreviewInfo(formDTO.getPreviewInfo());
+			request.setUgcDeclare(formDTO.getUgcDeclare());
+		}
 		request.setFeedbackInfo(formDTO.getFeedbackInfo());
 		request.setFeedbackStuff(formDTO.getFeedbackStuff());
-		request.setItemList(formDTO.getItemList());
-		request.setPreviewInfo(formDTO.getPreviewInfo());
-		request.setUgcDeclare(formDTO.getUgcDeclare());
 		WxResult<String> wxResult = wxMaCodeService.submitAudit(authInfo.getAuthorizerAccessToken(), request);
 		if (!wxResult.success()) {
 			saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(),
@@ -303,6 +305,9 @@ public class CodeServiceImpl implements CodeService {
 			codeAuditResultDTO.setResult(CodeConstant.AUDITING);
 			codeAuditResultService.save(codeAuditResultDTO);
 		} else {
+			codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
+			codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
+			codeAuditResultService.update(codeAuditResultDTO);
 			codeAuditResultService.deleteById(codeAuditResultDTO.getId());
 			codeAuditResultDTO = new CodeAuditResultDTO();
 			codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
@@ -447,6 +452,8 @@ public class CodeServiceImpl implements CodeService {
 					codeAuditResultService.update(dto);
 				}
 				result.setScreenshotUrl(urlList);
+				result.setFeedbackInfo(dto.getFeedbackInfo());
+				result.setFeedbackStuff(dto.getFeedbackStuff());
 			} else {
 				String[] url = dto.getScreenShotUrl().split("[|]");
 				List<String> urlList = new ArrayList<>(url.length);
@@ -562,18 +569,64 @@ public class CodeServiceImpl implements CodeService {
 		}
 		authInfoList.forEach(authInfo -> {
 			//设置服务器域名
-			WxResult wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken());
-			if (!wxResult.success()) {
-				throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+			WxResult<WxMaModifyDomainResult> modifyDomain = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set");
+			if (!modifyDomain.success()) {
+				throw new RenException(modifyDomain.getErrorCode(), modifyDomain.getErrorMsg());
 			}
 			//设置业务域名
-			wxResult = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken());
-			if (!wxResult.success()) {
-				throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+			WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set");
+			if (!setWebviewDomain.success()) {
+				throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
 			}
 		});
 	}
 
+	@Override
+	public void setDomains(CodeCommonFormDTO formDTO) {
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
+		if (null == authInfo) {
+			throw new RenException("未授权");
+		}
+		//设置服务器域名
+		WxResult<WxMaModifyDomainResult> wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set");
+		if (!wxResult.success()) {
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
+		//设置业务域名
+		WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set");
+		if (!setWebviewDomain.success()) {
+			throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
+		}
+	}
+
+	@Override
+	public DomainResultDTO getDomains(CodeCommonFormDTO formDTO) {
+		DomainResultDTO resultDTO = new DomainResultDTO();
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
+		if (null == authInfo) {
+			throw new RenException("未授权");
+		}
+		//设置服务器域名
+		WxResult<WxMaModifyDomainResult> wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "get");
+		if (!wxResult.success()) {
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
+		resultDTO.setDownloadDomain(wxResult.getData().getDownloadDomain());
+		resultDTO.setRequestDomain(wxResult.getData().getRequestDomain());
+		resultDTO.setUploadDomain(wxResult.getData().getUploadDomain());
+		resultDTO.setWsRequestDomain(wxResult.getData().getWsRequestDomain());
+
+		//设置业务域名
+		WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "get");
+		if (!setWebviewDomain.success()) {
+			throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
+		}
+		resultDTO.setWebViewDomain(setWebviewDomain.getData().getWebViewDomain());
+		return resultDTO;
+	}
+
 	@Override
 	public PageData getCustomerList(UploadListFormDTO formDTO) {
 		return paCustomerService.getCustomerList(formDTO);
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaModifyDomainResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaModifyDomainResult.java
new file mode 100644
index 0000000000..4f5606eb06
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaModifyDomainResult.java
@@ -0,0 +1,33 @@
+package com.epmet.wxapi.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/13 15:46
+ */
+@NoArgsConstructor
+@Data
+public class WxMaModifyDomainResult implements Serializable {
+
+	private static final long serialVersionUID = 8602059705480008729L;
+	/**
+	 * errcode : 0
+	 */
+	private Integer errcode;
+	private String errmsg;
+	@SerializedName("requestdomain")
+	private List<String> requestDomain;
+	@SerializedName("wsrequestdomain")
+	private List<String> wsRequestDomain;
+	@SerializedName("uploaddomain")
+	private List<String> uploadDomain;
+	@SerializedName("downloaddomain")
+	private List<String> downloadDomain;
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaSetWebviewDomainResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaSetWebviewDomainResult.java
new file mode 100644
index 0000000000..6700e03b7a
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaSetWebviewDomainResult.java
@@ -0,0 +1,27 @@
+package com.epmet.wxapi.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/13 15:53
+ */
+@NoArgsConstructor
+@Data
+public class WxMaSetWebviewDomainResult implements Serializable {
+
+	private static final long serialVersionUID = -5871654910653283111L;
+	/**
+	 * errcode : 0
+	 */
+	private Integer errcode;
+	private String errmsg;
+	@SerializedName("webviewdomain")
+	private List<String> webViewDomain;
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java
index df405b12e9..1918e79603 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java
@@ -123,21 +123,23 @@ public interface WxMaCodeService {
 	 * 设置服务器域名
 	 *
 	 * @param accessToken
+	 * @param action
 	 * @return com.epmet.wxapi.result.WxResult
 	 * @author zhaoqifeng
 	 * @date 2020/7/16 17:21
 	 */
-	WxResult modifyDomain(String accessToken);
+	WxResult<WxMaModifyDomainResult> modifyDomain(String accessToken, String action);
 
 	/**
 	 * 设置业务域名
 	 *
 	 * @param accessToken
+	 * @param action
 	 * @return com.epmet.wxapi.result.WxResult
 	 * @author zhaoqifeng
 	 * @date 2020/7/16 17:22
 	 */
-	WxResult setWebviewDomain(String accessToken);
+	WxResult<WxMaSetWebviewDomainResult> setWebviewDomain(String accessToken, String action);
 
 	/**
 	 * 上传临时素材
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java
index ce18ca880c..87b7afb0f6 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java
@@ -231,11 +231,11 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	}
 
 	@Override
-	public WxResult modifyDomain(String accessToken) {
-		WxResult result = new WxResult();
+	public WxResult<WxMaModifyDomainResult> modifyDomain(String accessToken, String action) {
+		WxResult<WxMaModifyDomainResult> result = new WxResult<>();
 		String url = WxMaCodeConstant.MODIFY_DOMAIN_URL + "?" + "access_token=" + accessToken;
 		WxMaModifyDomainReq request = new WxMaModifyDomainReq();
-		request.setAction("set");
+		request.setAction(action);
 		request.setRequestDomain(wxMaDomainDTO.getRequestDomain());
 		request.setUploadDomain(wxMaDomainDTO.getUploadDomain());
 		request.setWsRequestDomain(wxMaDomainDTO.getWsRequestDomain());
@@ -246,18 +246,20 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 			result.setErrorMsg(modifyResult.getMsg());
 			return result;
 		}
-		JSONObject jsonObject = JSONObject.parseObject(modifyResult.getData());
-		result.setErrorCode(jsonObject.getInteger(ERR_CODE));
-		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE)));
+		Gson gson = new Gson();
+		WxMaModifyDomainResult domainResult = gson.fromJson(modifyResult.getData(), WxMaModifyDomainResult.class);
+		result.setErrorCode(domainResult.getErrcode());
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(domainResult.getErrcode()));
+		result.setData(domainResult);
 		return result;
 	}
 
 	@Override
-	public WxResult setWebviewDomain(String accessToken) {
-		WxResult result = new WxResult();
+	public WxResult<WxMaSetWebviewDomainResult> setWebviewDomain(String accessToken, String action) {
+		WxResult<WxMaSetWebviewDomainResult> result = new WxResult<>();
 		String url = WxMaCodeConstant.SET_WEBVIEW_DOMAIN_URL + "?" + "access_token=" + accessToken;
 		WxMaSetWebviewDomainReq request = new WxMaSetWebviewDomainReq();
-		request.setAction("set");
+		request.setAction(action);
 		request.setWebViewDomain(wxMaDomainDTO.getWebviewDomain());
 		Result<String> modifyResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request));
 		if (!modifyResult.success()) {
@@ -265,9 +267,11 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 			result.setErrorMsg(modifyResult.getMsg());
 			return result;
 		}
-		JSONObject jsonObject = JSONObject.parseObject(modifyResult.getData());
-		result.setErrorCode(jsonObject.getInteger(ERR_CODE));
-		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE)));
+		Gson gson = new Gson();
+		WxMaSetWebviewDomainResult domainResult = gson.fromJson(modifyResult.getData(), WxMaSetWebviewDomainResult.class);
+		result.setErrorCode(domainResult.getErrcode());
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(domainResult.getErrcode()));
+		result.setData(domainResult);
 		return result;
 	}
 

From 3811356b05ce7c244670e0398f036e15296906c2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 13 Aug 2020 16:23:13 +0800
Subject: [PATCH 6/6] =?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-dev.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-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
index 250b240692..4bd3602a2f 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.124
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.125
     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 6149dc735d..9bf16b4e2d 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 @@
 <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.124</version>
+    <version>0.0.125</version>
 
     <parent>
         <groupId>com.epmet</groupId>