diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java index 61cf39271..b8cb2cba3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java @@ -12,7 +12,7 @@ public interface WxWeappCodeStatusMapper extends CommonMapper findVoList(WxWeappCodeStatusVo weappCodeStatusVo); - + List findUserVersions(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java index 9f67b2026..d357df646 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java @@ -26,6 +26,13 @@ public interface WxWeappCodeStatusService { */ List getList(WxWeappCodeStatusVo record); + /** + * 查询version列表 + * + * @return + */ + List getVersionList(); + /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java index eea9b45fa..69bb95154 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java @@ -35,6 +35,11 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { return wxWeappCodeStatusMapper.findVoList(record); } + @Override + public List getVersionList() { + return wxWeappCodeStatusMapper.findUserVersions(); + } + @Override public WxWeappCodeStatus getById(Long id) { return wxWeappCodeStatusMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml index c01a10a14..0a824e280 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml @@ -146,10 +146,12 @@ left join wx_appinfo a on c.`app_id` = a.`app_id` - - - - + + diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java index 9c074808b..caa9fe909 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java @@ -62,9 +62,9 @@ public class WechatWeappSetController { " \"downloaddomain\":[\"https://www.qq.com\",\"https://www.qq.com\"],\n" + " }") @PostMapping("/modifyDomain") - public ResultData modifyDomain(@RequestParam(value = "appId") String appId, @RequestParam(value = "action") String action, - @RequestParam(value = "requestDomain") List requestDomain, @RequestParam(value = "wsrequestdomain") List wsrequestdomain, - @RequestParam(value = "uploaddomain") List uploaddomain, @RequestParam(value = "downloaddomain") List downloaddomain) { + public ResultData modifyDomain(String appId, String action, + List requestDomain, List wsrequestdomain, + List uploaddomain, List downloaddomain) { try { WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); WxOpenMaDomainResult openRet = openMaService.modifyDomain(action, @@ -83,8 +83,8 @@ public class WechatWeappSetController { " \"webviewdomain\":[\"https://www.qq.com\",\"https://m.qq.com\"]\n" + " }") @PostMapping("/setWebViewDomain") - public ResultData setWebViewDomain(@RequestParam(value = "appId") String appId, @RequestParam(value = "action") String action, - @RequestParam(value = "urlList") List urlList) { + public ResultData setWebViewDomain(String appId, String action, + List urlList) { try { WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); String openRet = openMaService.setWebViewDomain(action, urlList); @@ -98,7 +98,7 @@ public class WechatWeappSetController { @ApiOperation(value = "绑定微信用户为小程序体验者", notes = "") @PostMapping("/bindTester") - public ResultData bindTester(@RequestParam(value = "appId") String appId, @RequestParam(value = "wechatId") String wechatId) { + public ResultData bindTester(String appId, String wechatId) { try { WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); WxOpenResult openRet = openMaService.bindTester(wechatId); @@ -112,7 +112,7 @@ public class WechatWeappSetController { @ApiOperation(value = "解除绑定小程序的体验者", notes = "") @PostMapping("/unbindTester") - public ResultData unbindTester(@RequestParam(value = "appId") String appId, @RequestParam(value = "wechatId") String wechatId) { + public ResultData unbindTester(String appId, String wechatId) { try { WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); WxOpenResult openRet = openMaService.unbindTester(wechatId); diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 89f9fac55..6e3f66aa3 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -79,7 +79,7 @@ public class WxWeappInfoController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxWeappInfo weappInfo, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxWeappController::list"); + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::list"); if (null == weappInfo) weappInfo = new WxWeappInfo(); weappInfo.setAuthorizationStatus(EnumWxAuthorizationStatus.AUTHORIZED.getCode()); weappInfo.setSortColumns(WxAuthorizerInfo.Field.CurrentVersion_DESC); @@ -90,7 +90,7 @@ public class WxWeappInfoController extends BaseController { @ApiOperation("小程序列表接口") @GetMapping("allist") public ResultData getList(@ModelAttribute WxWeappInfo weappInfo) { - logger.debug("[" + getIpAddr() + "] WxWeappController::list"); + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::list"); if (null == weappInfo) weappInfo = new WxWeappInfo(); weappInfo.setSortColumns(WxAuthorizerInfo.Field.CurrentVersion_DESC); final List list = authorizerInfoService.getList(weappInfo); @@ -100,6 +100,7 @@ public class WxWeappInfoController extends BaseController { @ApiOperation(value = "APPs基础设置(服务器域名、业务域名、基础版本、微信模板)", notes = "{\"apps\":\"appid,appid\",\"type\":\"String\",\"deploy\":\"String\"}") @PostMapping("batchBasicSet") public ResultData batchSet(@RequestBody Map params) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchBasicSet"); String appsStr = params.get("apps"); String typeStr = params.get("type"); String deployStr = params.get("deploy"); @@ -239,6 +240,7 @@ public class WxWeappInfoController extends BaseController { @ApiOperation(value = "批量,授权的小程序上传code并提交审核", notes = "{\"apps\":\"appid,appid\",\"templateId\":\"String\",\"userVersion\":\"String\",\"userDesc\":\"String\"}") @PostMapping("batchCodeCommitAndAudit") public ResultData batchExtSet(@RequestBody Map params) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchExtSet"); String appsStr = params.get("apps"); String templateIdStr = params.get("templateId"); String userVersion = params.get("userVersion"); @@ -343,6 +345,7 @@ public class WxWeappInfoController extends BaseController { @ApiOperation(value = "批量审核查询", notes = "{\"apps\":\"appid,appid\"}") @PostMapping("batchAuditQuery") public ResultData batchAuditQuery(@RequestBody Map params) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditQuery"); String appsStr = params.get("apps"); // 逐一设置app配置 String [] apps = appsStr.split(","); @@ -385,6 +388,7 @@ public class WxWeappInfoController extends BaseController { @ApiOperation(value = "批量审核撤回", notes = "{\"apps\":\"appid,appid\"}") @PostMapping("batchAuditCancel") public ResultData batchAuditCancel(@RequestBody Map params) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchAuditCancel"); String appsStr = params.get("apps"); // 逐一设置app配置 String [] apps = appsStr.split(","); @@ -410,6 +414,7 @@ public class WxWeappInfoController extends BaseController { @ApiOperation(value = "批量发布", notes = "{\"apps\":\"appid,appid\"}") @PostMapping("batchRelease") public ResultData batchRelease(@RequestBody Map params) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::batchRelease"); String appsStr = params.get("apps"); // 逐一设置app配置 String [] apps = appsStr.split(","); @@ -445,7 +450,7 @@ public class WxWeappInfoController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData releaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxWeappController::releaseStatusList"); + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::releaseStatusList"); if (null == weappCodeStatusVo) { weappCodeStatusVo = new WxWeappCodeStatusVo(); } else { @@ -461,7 +466,7 @@ public class WxWeappInfoController extends BaseController { @ApiOperation("小程序发布状态列表接口") @GetMapping("releaseStatusAllList") public ResultData getReleaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo) { - logger.debug("[" + getIpAddr() + "] WxWeappController::releaseStatusAllList"); + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::releaseStatusAllList"); if (null == weappCodeStatusVo) { weappCodeStatusVo = new WxWeappCodeStatusVo(); } else { @@ -474,6 +479,14 @@ public class WxWeappInfoController extends BaseController { return new ResultData(list); } + @ApiOperation("小程序发布版本列表") + @GetMapping("versionList") + public ResultData getVersionList() { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::versionList"); + final List list = weappCodeStatusService.getVersionList(); + return new ResultData(list); + } + /*