设置业务域名和服务器域名

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java

@@ -0,0 +1,41 @@
+package com.epmet.dto.form;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/20 13:44
+ */
+@Data
+public class ModifyDomainFormDTO implements Serializable {
+	private static final long serialVersionUID = -1995778975498383130L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 客户端类型
+	 */
+	private String clientType;
+	/**
+	 * request 合法域名
+	 */
+	private List<String> requestDomain;
+	/**
+	 * socket 合法域名
+	 */
+	private List<String> wsRequestDomain;
+	/**
+	 * uploadFile 合法域名
+	 */
+	private List<String> uploadDomain;
+	/**
+	 * downloadFile 合法域名
+	 */
+	private List<String> downloadDomain;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WebviewDomainFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/19 17:46
+ */
+@Data
+public class WebviewDomainFormDTO implements Serializable {
+	private static final long serialVersionUID = 8022056850984848597L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 客户端类型
+	 */
+	private String clientType;
+	/**
+	 * 业务域名
+	 */
+	private List<String> webViewDomain;
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/SettingController.java

@@ -0,0 +1,51 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ModifyDomainFormDTO;
+import com.epmet.dto.form.WebviewDomainFormDTO;
+import com.epmet.service.SettingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/20 13:50
+ */
+@RestController
+@RequestMapping("setting")
+public class SettingController {
+	@Autowired
+	private SettingService settingService;
+
+	/**
+	 * 设置服务器域名
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2020/8/20 13:51
+	 */
+	@PostMapping("modifydomain")
+	public Result modifyDomain(@RequestBody ModifyDomainFormDTO formDTO) {
+		settingService.modifyDomain(formDTO);
+		return new Result<>();
+	}
+
+	/**
+	 * 设置业务域名
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2020/8/20 13:51
+	 */
+	@PostMapping("setwebviewdomain")
+	public Result setWebviewDomain(@RequestBody WebviewDomainFormDTO formDTO) {
+		settingService.setWebviewDomain(formDTO);
+		return new Result<>();
+	}
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SettingService.java

@@ -0,0 +1,31 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.ModifyDomainFormDTO;
+import com.epmet.dto.form.WebviewDomainFormDTO;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/20 11:11
+ */
+public interface SettingService {
+	/**
+	 * 设置服务器域名
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/8/20 13:46
+	 */
+	void modifyDomain(ModifyDomainFormDTO formDTO);
+
+	/**
+	 * 设置业务域名
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/8/19 17:49
+	 */
+	void setWebviewDomain(WebviewDomainFormDTO formDTO);
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SettingServiceImpl.java

@@ -0,0 +1,63 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.dao.AuthorizationInfoDao;
+import com.epmet.dto.AuthorizationInfoDTO;
+import com.epmet.dto.form.ModifyDomainFormDTO;
+import com.epmet.dto.form.WebviewDomainFormDTO;
+import com.epmet.service.SettingService;
+import com.epmet.wxapi.param.WxMaModifyDomainReq;
+import com.epmet.wxapi.param.WxMaSetWebviewDomainReq;
+import com.epmet.wxapi.result.WxResult;
+import com.epmet.wxapi.service.WxMaSettingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/20 11:11
+ */
+@Service
+public class SettingServiceImpl implements SettingService {
+	@Autowired
+	private AuthorizationInfoDao authorizationInfoDao;
+	@Autowired
+	private WxMaSettingService wxMaSettingService;
+
+	@Override
+	public void modifyDomain(ModifyDomainFormDTO formDTO) {
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
+		if (null == authInfo) {
+			throw new RenException("未授权");
+		}
+		WxMaModifyDomainReq request = new WxMaModifyDomainReq();
+		request.setDownloadDomain(formDTO.getDownloadDomain());
+		request.setRequestDomain(formDTO.getRequestDomain());
+		request.setWsRequestDomain(formDTO.getWsRequestDomain());
+		request.setUploadDomain(formDTO.getUploadDomain());
+		//设置业务域名
+		WxResult setDomain = wxMaSettingService.modifyDomain(authInfo.getAuthorizerAccessToken(), request);
+		if (!setDomain.success()) {
+			throw new RenException(setDomain.getErrorCode(), setDomain.getErrorMsg());
+		}
+	}
+
+	@Override
+	public void setWebviewDomain(WebviewDomainFormDTO formDTO) {
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
+		if (null == authInfo) {
+			throw new RenException("未授权");
+		}
+		WxMaSetWebviewDomainReq request = new WxMaSetWebviewDomainReq();
+		request.setAction("set");
+		request.setWebViewDomain(formDTO.getWebViewDomain());
+		//设置业务域名
+		WxResult setWebviewDomain = wxMaSettingService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), request);
+		if (!setWebviewDomain.success()) {
+			throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
+		}
+	}
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaSettingService.java

@@ -1,11 +1,10 @@
 package com.epmet.wxapi.service;
 
-import com.epmet.wxapi.param.WxAddCategoryReq;
+import com.epmet.wxapi.param.*;
-import com.epmet.wxapi.param.WxBindTesterReq;
-import com.epmet.wxapi.param.WxDelCategoryReq;
-import com.epmet.wxapi.param.WxModifyCategoryReq;
 import com.epmet.wxapi.result.*;
 
+import java.util.List;
+
 /**
  * 小程序修改服务器地址、类目管理、成员管理 API（大部分只能是第三方平台调用）
  *
@@ -24,6 +23,17 @@ public interface WxMaSettingService {
 	 */
 	WxResult<WxMaModifyDomainResult> modifyDomain(String accessToken, String action);
 
+	/**
+	 * 设置服务器域名
+	 *
+	 * @param accessToken
+	 * @param request
+	 * @return com.epmet.wxapi.result.WxResult
+	 * @author zhaoqifeng
+	 * @date 2020/7/16 17:21
+	 */
+	WxResult modifyDomain(String accessToken, WxMaModifyDomainReq request);
+
 	/**
 	 * 设置业务域名
 	 *
@@ -35,6 +45,17 @@ public interface WxMaSettingService {
 	 */
 	WxResult<WxMaSetWebviewDomainResult> setWebviewDomain(String accessToken, String action);
 
+	/**
+	 * 设置业务域名
+	 *
+	 * @param accessToken
+	 * @param request
+	 * @return com.epmet.wxapi.result.WxResult
+	 * @author zhaoqifeng
+	 * @date 2020/8/19 17:52
+	 */
+	WxResult setWebviewDomain(String accessToken, WxMaSetWebviewDomainReq request);
+
 	/**
 	 * 获取可以设置的所有类目
 	 *
@@ -109,4 +130,5 @@ public interface WxMaSettingService {
 	 * @date 2020/8/18 15:45
 	 */
 	WxResult unBindTester(String accessToken, WxBindTesterReq request);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaSettingServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.wxapi.constant.WxMaCodeConstant;
 import com.epmet.wxapi.constant.WxMaSettingConstant;
 import com.epmet.wxapi.enums.WxMaErrorMsgEnum;
 import com.epmet.wxapi.param.*;
@@ -14,6 +15,8 @@ import com.google.gson.GsonBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author zhaoqifeng
  * @dscription
@@ -51,6 +54,23 @@ public class WxMaSettingServiceImpl implements WxMaSettingService {
 		return result;
 	}
 
+	@Override
+	public WxResult modifyDomain(String accessToken, WxMaModifyDomainReq request) {
+		WxResult result = new WxResult<>();
+		String url = WxMaCodeConstant.MODIFY_DOMAIN_URL + "?" + "access_token=" + accessToken;
+		Result<String> modifyResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request));
+		if (!modifyResult.success()) {
+			result.setErrorCode(modifyResult.getCode());
+			result.setErrorMsg(modifyResult.getMsg());
+			return result;
+		}
+		Gson gson = new Gson();
+		WxMaModifyDomainResult domainResult = gson.fromJson(modifyResult.getData(), WxMaModifyDomainResult.class);
+		result.setErrorCode(domainResult.getErrcode());
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(domainResult.getErrcode()));
+		return result;
+	}
+
 	@Override
 	public WxResult<WxMaSetWebviewDomainResult> setWebviewDomain(String accessToken, String action) {
 		WxResult<WxMaSetWebviewDomainResult> result = new WxResult<>();
@@ -72,6 +92,23 @@ public class WxMaSettingServiceImpl implements WxMaSettingService {
 		return result;
 	}
 
+	@Override
+	public WxResult setWebviewDomain(String accessToken, WxMaSetWebviewDomainReq request) {
+		WxResult result = new WxResult<>();
+		String url = WxMaCodeConstant.SET_WEBVIEW_DOMAIN_URL + "?" + "access_token=" + accessToken;
+		Result<String> modifyResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request));
+		if (!modifyResult.success()) {
+			result.setErrorCode(modifyResult.getCode());
+			result.setErrorMsg(modifyResult.getMsg());
+			return result;
+		}
+		Gson gson = new Gson();
+		WxMaSetWebviewDomainResult domainResult = gson.fromJson(modifyResult.getData(), WxMaSetWebviewDomainResult.class);
+		result.setErrorCode(domainResult.getErrcode());
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(domainResult.getErrcode()));
+		return result;
+	}
+
 	@Override
 	public WxResult<WxGetAllCategoriesResult> getAllCategories(String accessToken) {
 		WxResult<WxGetAllCategoriesResult> result = new WxResult<>();