diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
index 3ad3c2297..dc33d573b 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
@@ -37,6 +37,22 @@ public class WxAuthorizerInfo implements Serializable {
private Integer authorizationStatus;
@io.swagger.annotations.ApiModelProperty(value="授权时间",name="authTime")
private Date authTime;
+ @io.swagger.annotations.ApiModelProperty(value="微信基础版本设置状态,0为已设置,1为设置失败",name="baseStatus")
+ private Integer baseStatus;
+ @io.swagger.annotations.ApiModelProperty(value="微信基础版本设置时间",name="baseTime")
+ private Date baseTime;
+ @io.swagger.annotations.ApiModelProperty(value="微信服务器域名版本设置状态,0为已设置,1为设置失败",name="domainStatus")
+ private Integer domainStatus;
+ @io.swagger.annotations.ApiModelProperty(value="微信服务器域名版本设置时间",name="domainTime")
+ private Date domainTime;
+ @io.swagger.annotations.ApiModelProperty(value="微信服务器业务域名版本设置状态,0为已设置,1为设置失败",name="webdomainStatus")
+ private Integer webdomainStatus;
+ @io.swagger.annotations.ApiModelProperty(value="微信服务器业务域名版本设置时间",name="webdomainTime")
+ private Date webdomainTime;
+ @io.swagger.annotations.ApiModelProperty(value="微信小程序模板设置状态,0为已设置,1为设置失败",name="templateStatus")
+ private Integer templateStatus;
+ @io.swagger.annotations.ApiModelProperty(value="微信小程序模板设置时间",name="templateTime")
+ private Date templateTime;
@io.swagger.annotations.ApiModelProperty(value="当前版本",name="currentVersion")
private String currentVersion;
@io.swagger.annotations.ApiModelProperty(value="当前版本描述",name="currentDesc")
@@ -57,6 +73,14 @@ public class WxAuthorizerInfo implements Serializable {
,UpdateTime_ASC("`update_time` ASC"),UpdateTime_DESC("`update_time` DESC")
,AuthorizationStatus_ASC("`authorization_status` ASC"),AuthorizationStatus_DESC("`authorization_status` DESC")
,AuthTime_ASC("`auth_time` ASC"),AuthTime_DESC("`auth_time` DESC")
+ ,BaseStatus_ASC("`base_status` ASC"),BaseStatus_DESC("`base_status` DESC")
+ ,BaseTime_ASC("`base_time` ASC"),BaseTime_DESC("`base_time` DESC")
+ ,DomainStatus_ASC("`domain_status` ASC"),DomainStatus_DESC("`domain_status` DESC")
+ ,DomainTime_ASC("`domain_time` ASC"),DomainTime_DESC("`domain_time` DESC")
+ ,WebDomainStatus_ASC("`webdomain_status` ASC"),WebDomainStatus_DESC("`webdomain_status` DESC")
+ ,WebDomainTime_ASC("`webdomain_time` ASC"),WebDomainTime_DESC("`webdomain_time` DESC")
+ ,TemplateStatus_ASC("`template_status` ASC"),TemplateStatus_DESC("`template_status` DESC")
+ ,TemplateTime_ASC("`template_time` ASC"),TemplateTime_DESC("`template_time` DESC")
,CurrentVersion_ASC("`current_version` ASC"),CurrentVersion_DESC("`current_version` DESC")
,CurrentDesc_ASC("`current_desc` ASC"),CurrentDesc_DESC("`current_desc` DESC")
,ReleaseTime_ASC("`release_time` ASC"),ReleaseTime_DESC("`release_time` DESC")
diff --git a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml
index c4fdec14e..138a9c9df 100644
--- a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml
@@ -11,13 +11,23 @@
+
+
+
+
+
+
+
+
- `id`,`authorizer_appid`,`head_img`,`alias`,`qrcode_url`,`create_time`,`authorization_status`,`auth_time`,`current_version`,`current_desc`,`release_time`
+ `id`,`authorizer_appid`,`head_img`,`alias`,`qrcode_url`,`create_time`,`authorization_status`,`auth_time`,
+ `base_status`, `base_time`, `domain_status`, `domain_time`, `webdomain_status`, `webdomain_time`, `template_status`, `template_time`,
+ `current_version`,`current_desc`,`release_time`
@@ -49,6 +59,30 @@
and `auth_time` = #{authTime}
+
+ and `base_status` = #{baseStatus}
+
+
+ and `base_time` = #{baseTime}
+
+
+ and `domain_status` = #{domainStatus}
+
+
+ and `domain_time` = #{domainTime}
+
+
+ and `webdomain_status` = #{webdomainStatus}
+
+
+ and `webdomain_time` = #{webdomainTime}
+
+
+ and `template_status` = #{templateStatus}
+
+
+ and `template_time` = #{templateTime}
+
and `current_version` = #{currentVersion}
@@ -89,6 +123,14 @@
+
+
+
+
+
+
+
+
@@ -99,6 +141,10 @@
ai.`id`,ai.`authorizer_appid`,ai.`head_img`,ai.`alias`,ai.`qrcode_url`,ai.`create_time`,ai.`update_time`,
ai.`authorization_status`,ai.`auth_time`,
+ ai.`base_status`,ai.`base_time`,
+ ai.`domain_status`,ai.`domain_time`,
+ ai.`webdomain_status`,ai.`webdomain_time`,
+ ai.`template_status`,ai.`template_time`,
ai.`current_version`,ai.`current_desc`,ai.`release_time`,
a.`type`,a.`name`
@@ -120,6 +166,33 @@
and ai.`authorization_status` = #{authorizationStatus}
+
+ and ai.`auth_time` = #{authTime}
+
+
+ and ai.`base_status` = #{baseStatus}
+
+
+ and ai.`base_time` = #{baseTime}
+
+
+ and ai.`domain_status` = #{domainStatus}
+
+
+ and ai.`domain_time` = #{domainTime}
+
+
+ and ai.`webdomain_status` = #{webdomainStatus}
+
+
+ and ai.`webdomain_time` = #{webdomainTime}
+
+
+ and ai.`template_status` = #{templateStatus}
+
+
+ and ai.`template_time` = #{templateTime}
+
and ai.`current_version` = #{currentVersion}
diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java
index e160336d4..972d3210d 100644
--- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java
+++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java
@@ -45,7 +45,7 @@ public class WechatWeappSetController {
@ApiOperation("获取小程序服务器域名")
@GetMapping("/getDomain")
- public ResultData modifyDomain(String appId) {
+ public ResultData getDomain(String appId) {
try {
WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId);
WxOpenResult openRet = openMaService.getDomain();
@@ -53,12 +53,27 @@ public class WechatWeappSetController {
return new ResultData(openRet);
} catch (WxErrorException e) {
logger.error(e.getMessage());
+ return new ResultData(Result.ERROR, e.getMessage());
+ }
+
+ }
+
+ @ApiOperation("获取小程序服务器域名")
+ @GetMapping("/getWebDomain")
+ public ResultData getWebDomain(String appId) {
+ try {
+ WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId);
+ String openRet = openMaService.getWebViewDomain();
+ logger.info(openRet);
+ return new ResultData(openRet);
+ } catch (WxErrorException e) {
+ logger.error(e.getMessage());
+ return new ResultData(Result.ERROR, e.getMessage());
}
- return new ResultData(Result.ERROR);
}
@ApiOperation(value = "设置小程序服务器域名", notes = "{\n" +
- " \"action\":\"add\",\n" +
+ " \"action\":\"add/set/delete/get\",\n" +
" \"requestdomain\":[\"https://www.qq.com\",\"https://www.qq.com\"],\n" +
" \"wsrequestdomain\":[\"wss://www.qq.com\",\"wss://www.qq.com\"],\n" +
" \"uploaddomain\":[\"https://www.qq.com\",\"https://www.qq.com\"],\n" +
@@ -82,16 +97,16 @@ public class WechatWeappSetController {
}
@ApiOperation(value = "设置小程序业务域名", notes = "{\n" +
- " \"action\":\"add\",\n" +
+ " \"action\":\"add/set/delete/get\",\n" +
" \"webviewdomain\":[\"https://www.qq.com\",\"https://m.qq.com\"]\n" +
" }")
- @PostMapping("/setWebViewDomain")
- public ResultData setWebViewDomain(String appId, String action,
+ @PostMapping("/modifyWebViewDomain")
+ public ResultData modifyWebViewDomain(String appId, String action,
List urlList) {
try {
WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId);
String openRet = openMaService.setWebViewDomain(action, urlList);
- logger.info(openRet.toString());
+ logger.info(openRet);
return new ResultData(openRet);
} catch (WxErrorException e) {
logger.error(e.getMessage());
diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java
index c002f6d71..d54700e69 100644
--- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java
+++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java
@@ -163,7 +163,7 @@ public class WxWeappInfoController extends BaseController {
// 设置基础版本
openMaService.setSupportVersion(weappBasicSet.getVersion());
// 服务器域名
- String action = "add";
+ String action = "set";
JSONObject urlObj = domainObj.getJSONObject("url");
List requestDomain = getUrlList(urlObj.getJSONArray("requestdomain"));
List wsrequestDomain = getUrlList(urlObj.getJSONArray("wsrequestdomain"));