From a07acac77669d7a1f41e85ebf2525ba9f98cd6aa Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 12 Aug 2020 20:23:48 +0800 Subject: [PATCH] init --- .../basic/WxProjectConfigController.java | 234 +++++++++--------- .../iformall/service/WxMsgConfigService.java | 3 + .../service/impl/WxMsgConfigServiceImpl.java | 14 ++ .../impl/WxProjectConfigServiceImpl.java | 2 + 4 files changed, 141 insertions(+), 112 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index fb6f06f2f..cd5b69573 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -242,6 +242,16 @@ public class WxProjectConfigController extends BaseController { wxAppinfoService.saveOrUpdate(wxAppinfo); + WxAuthorizerInfo wxAuthorizerInfo = new WxAuthorizerInfo(); + wxAuthorizerInfo.updateTenantInfo(wxAppinfo); + wxAuthorizerInfo.setType(wxAppinfo.getType()); + wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId()); + if(wxAuthorizerInfo.getAuthorizationStatus() == null){ + wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权 + wxAuthorizerInfo.setAuthTime(new Date()); + } + wxAuthorizerInfoService.saveOrUpdate(wxAuthorizerInfo); + return new ResultData(); }catch (Exception e){ logger.error(e.getMessage(),e); @@ -279,7 +289,7 @@ public class WxProjectConfigController extends BaseController { PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); userInfo.setIsAdmin(EnumUserAdmin.ADMIN.getCode()); - userInfo.setInvestRule(EnumInvestUserType.MANAGER.getCode()); + userInfo.setInvestRule(EnumInvestUserType.ALL.getCode()); wxProjectConfigService.initUserInfo(userInfo); }else{ @@ -314,54 +324,54 @@ public class WxProjectConfigController extends BaseController { } } - @ApiOperation("添加修改商场短信配置") - @PostMapping("/init/msgConfig") - @SystemControllerLog(description = "商场后短信配置-更新") - public ResultData initMsgConfig(@RequestBody WxMsgConfig wxMsgConfig) { - logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initMsgConfig"); - try { - if(StringUtils.isBlank(wxMsgConfig.getTenantId())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - if(StringUtils.isBlank(wxMsgConfig.getAppid())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - if(wxMsgConfig.getSmsChannel() == null){ - wxMsgConfig.setSmsChannel(EnumSMSChannel.WIWIDE.getCode()); - } - if(wxMsgConfig.getSmsChannel() == EnumSMSChannel.WIWIDE.getCode()){ - wxMsgConfig.setSecret("7305150347587283553aa8898e7dbf20"); - wxMsgConfig.setPublickey("MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvh8j/zagfxQdnSh5OIic\\r" + - "\\nMzN+MuRuWQJPjgu4Gza4+gX3j5Ln2xNDBOTjpwyuLBjh/JcBd1cGO3lAaKCwcaix\\r" + - "\\nsmhTq56wVXXUMgDiAChu4ud8FSvRc8G8tdZAirKVAIi3NW+/pYgpWBs/0wnF8hz4\\r" + - "\\n8no4pyJHl9Jc1LH3VNIMz8vqzKUPc4ack4pFUXlcNj6C+sBlaurmI4/vwLqNxBGs\\r" + - "\\n7/zyM7dv6oy3DSU/Y1qBArM1YPjfL2dNun8rmtPgJvlPwXqA7uoHPwQ2Ym3aUn59\\r" + - "\\npkS7QI6IE8uuqNkfSte8BXLd2nIqPLFxLYLDmdll7eoyRblHcHqAYSj8stK6StC7\\r" + - "\\nDNryNKEjTEwbgf9trUI0uvF1pfgTy2gpclnY69FtD/m0+FvLyorMq+nmBqYMjka5\\r" + - "\\nK0txDQJPOa7gsi//uXd/cJW2SAXY9MSO1AfMi8Xq/YKRQzN9FW5iapskXFHca7uX\\r" + - "\\ng5NhH7flr6DW+QInFlpoN6WIEAuDF1aj4O49Ikm3WxwhTqnvEkdSCfivpYQkp9Sh\\r" + - "\\n4kQ/SQdxuT7VX+Nz6k+uMx2z4cySk33bHi0KoHbA9QFGg/54Qd0+eU4qZnd4mrgh\\r" + - "\\nhH7/QQhL7Z9eF1U5UPrsHq2Vq3rEnN+tYQ26AuKeU8vzTxBrC/SxC6C/SMFt3f/Y\\r" + - "\\nnuFh1UnNJZleZwyQt+ZdGO0CAwEAAQ=="); - wxMsgConfig.setBid("465565"); - wxMsgConfig.setAccount("15626593768"); - wxMsgConfig.setNotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemsg/" + wxMsgConfig.getTenantId()); - wxMsgConfig.setModelnotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemodel/" + wxMsgConfig.getTenantId()); - wxMsgConfig.setVerifynotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receiveverifymodel/" + wxMsgConfig.getTenantId()); - } - if(wxMsgConfig.getTotal() == null){ - wxMsgConfig.setTotal((long) 100000); - } - wxMsgConfig.setRecharge((long) 0); - wxMsgConfig.setRemains(wxMsgConfig.getTotal()); - wxMsgConfig.setReminderstatus(0); - wxMsgConfigService.saveOrUpdate(wxMsgConfig); - return new ResultData(); - }catch (Exception e){ - logger.error(e.getMessage(),e); - return new ResultData(ErrorCode.SYS_SERVER_ERROR); - } - } +// @ApiOperation("添加修改商场短信配置") +// @PostMapping("/init/msgConfig") +// @SystemControllerLog(description = "商场后短信配置-更新") +// public ResultData initMsgConfig(@RequestBody WxMsgConfig wxMsgConfig) { +// logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initMsgConfig"); +// try { +// if(StringUtils.isBlank(wxMsgConfig.getTenantId())){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); +// } +// if(StringUtils.isBlank(wxMsgConfig.getAppid())){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); +// } +// if(wxMsgConfig.getSmsChannel() == null){ +// wxMsgConfig.setSmsChannel(EnumSMSChannel.WIWIDE.getCode()); +// } +// if(wxMsgConfig.getSmsChannel() == EnumSMSChannel.WIWIDE.getCode()){ +// wxMsgConfig.setSecret("7305150347587283553aa8898e7dbf20"); +// wxMsgConfig.setPublickey("MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvh8j/zagfxQdnSh5OIic\\r" + +// "\\nMzN+MuRuWQJPjgu4Gza4+gX3j5Ln2xNDBOTjpwyuLBjh/JcBd1cGO3lAaKCwcaix\\r" + +// "\\nsmhTq56wVXXUMgDiAChu4ud8FSvRc8G8tdZAirKVAIi3NW+/pYgpWBs/0wnF8hz4\\r" + +// "\\n8no4pyJHl9Jc1LH3VNIMz8vqzKUPc4ack4pFUXlcNj6C+sBlaurmI4/vwLqNxBGs\\r" + +// "\\n7/zyM7dv6oy3DSU/Y1qBArM1YPjfL2dNun8rmtPgJvlPwXqA7uoHPwQ2Ym3aUn59\\r" + +// "\\npkS7QI6IE8uuqNkfSte8BXLd2nIqPLFxLYLDmdll7eoyRblHcHqAYSj8stK6StC7\\r" + +// "\\nDNryNKEjTEwbgf9trUI0uvF1pfgTy2gpclnY69FtD/m0+FvLyorMq+nmBqYMjka5\\r" + +// "\\nK0txDQJPOa7gsi//uXd/cJW2SAXY9MSO1AfMi8Xq/YKRQzN9FW5iapskXFHca7uX\\r" + +// "\\ng5NhH7flr6DW+QInFlpoN6WIEAuDF1aj4O49Ikm3WxwhTqnvEkdSCfivpYQkp9Sh\\r" + +// "\\n4kQ/SQdxuT7VX+Nz6k+uMx2z4cySk33bHi0KoHbA9QFGg/54Qd0+eU4qZnd4mrgh\\r" + +// "\\nhH7/QQhL7Z9eF1U5UPrsHq2Vq3rEnN+tYQ26AuKeU8vzTxBrC/SxC6C/SMFt3f/Y\\r" + +// "\\nnuFh1UnNJZleZwyQt+ZdGO0CAwEAAQ=="); +// wxMsgConfig.setBid("465565"); +// wxMsgConfig.setAccount("15626593768"); +// wxMsgConfig.setNotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemsg/" + wxMsgConfig.getTenantId()); +// wxMsgConfig.setModelnotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemodel/" + wxMsgConfig.getTenantId()); +// wxMsgConfig.setVerifynotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receiveverifymodel/" + wxMsgConfig.getTenantId()); +// } +// if(wxMsgConfig.getTotal() == null){ +// wxMsgConfig.setTotal((long) 100000); +// } +// wxMsgConfig.setRecharge((long) 0); +// wxMsgConfig.setRemains(wxMsgConfig.getTotal()); +// wxMsgConfig.setReminderstatus(0); +// wxMsgConfigService.saveOrUpdate(wxMsgConfig); +// return new ResultData(); +// }catch (Exception e){ +// logger.error(e.getMessage(),e); +// return new ResultData(ErrorCode.SYS_SERVER_ERROR); +// } +// } @ApiOperation("添加修改停车场配置") @PostMapping("/init/park") @@ -401,69 +411,69 @@ public class WxProjectConfigController extends BaseController { } } - @ApiOperation("添加修改迈外迪信息") - @PostMapping("/init/wiwidi") - @SystemControllerLog(description = "迈外迪信息配置-更新") - public ResultData initWiwidi(@RequestBody WxWiWideInfo wxWiWideInfo) { - logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initPark"); - try { - if(StringUtils.isBlank(wxWiWideInfo.getTenantId())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - wxWiWideInfoService.saveOrUpdate(wxWiWideInfo); - return new ResultData(); - }catch (Exception e){ - logger.error(e.getMessage(),e); - return new ResultData(ErrorCode.SYS_SERVER_ERROR); - } - } - - @ApiOperation("添加修改微信公众账号的基本信息") - @PostMapping("/init/authorizer") - @SystemControllerLog(description = "微信公众账号的基本信息-更新") - public ResultData initAuthorizer(@RequestBody WxAuthorizerInfo wxAuthorizerInfo) { - logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAuthorizer"); - try { - if(StringUtils.isBlank(wxAuthorizerInfo.getTenantId())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - if(wxAuthorizerInfo.getAuthorizationStatus() == null){ - wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权 - wxAuthorizerInfo.setAuthTime(new Date()); - } - if(wxAuthorizerInfo.getBaseStatus() == null){ - wxAuthorizerInfo.setBaseStatus(0);//微信基础版本设置状态,0为已设置,1为设置失败 - wxAuthorizerInfo.setBaseTime(new Date()); - } - if(wxAuthorizerInfo.getDomainStatus() == null){ - wxAuthorizerInfo.setDomainStatus(0);//服务器域名设置状态,0为已设置,1为设置失败 - wxAuthorizerInfo.setDomainTime(new Date()); - } - if(wxAuthorizerInfo.getWebdomainStatus() == null){ - wxAuthorizerInfo.setWebdomainStatus(0);//服务器业务域名设置状态,0为已设置,1为设置失败 - wxAuthorizerInfo.setWebdomainTime(new Date()); - } - if(StringUtils.isNotBlank(wxAuthorizerInfo.getCurrentVersion()) - && wxAuthorizerInfo.getReleaseTime() != null){ - wxAuthorizerInfo.setReleaseTime(new Date()); - } - if(StringUtils.isNotBlank(wxAuthorizerInfo.getOpenAppid()) - && wxAuthorizerInfo.getBindOpenTime() != null){ - wxAuthorizerInfo.setBindOpenTime(new Date()); - } - if(StringUtils.isBlank(wxAuthorizerInfo.getRefreshToken())){ - wxAuthorizerInfo.setRefreshToken(""); - } - if(StringUtils.isBlank(wxAuthorizerInfo.getAccessToken())){ - wxAuthorizerInfo.setAccessToken(""); - } - wxAuthorizerInfoService.saveOrUpdate(wxAuthorizerInfo); - return new ResultData(); - }catch (Exception e){ - logger.error(e.getMessage(),e); - return new ResultData(ErrorCode.SYS_SERVER_ERROR); - } - } +// @ApiOperation("添加修改迈外迪信息") +// @PostMapping("/init/wiwidi") +// @SystemControllerLog(description = "迈外迪信息配置-更新") +// public ResultData initWiwidi(@RequestBody WxWiWideInfo wxWiWideInfo) { +// logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initPark"); +// try { +// if(StringUtils.isBlank(wxWiWideInfo.getTenantId())){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); +// } +// wxWiWideInfoService.saveOrUpdate(wxWiWideInfo); +// return new ResultData(); +// }catch (Exception e){ +// logger.error(e.getMessage(),e); +// return new ResultData(ErrorCode.SYS_SERVER_ERROR); +// } +// } + +// @ApiOperation("添加修改微信公众账号的基本信息") +// @PostMapping("/init/authorizer") +// @SystemControllerLog(description = "微信公众账号的基本信息-更新") +// public ResultData initAuthorizer(@RequestBody WxAuthorizerInfo wxAuthorizerInfo) { +// logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAuthorizer"); +// try { +// if(StringUtils.isBlank(wxAuthorizerInfo.getTenantId())){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); +// } +// if(wxAuthorizerInfo.getAuthorizationStatus() == null){ +// wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权 +// wxAuthorizerInfo.setAuthTime(new Date()); +// } +// if(wxAuthorizerInfo.getBaseStatus() == null){ +// wxAuthorizerInfo.setBaseStatus(0);//微信基础版本设置状态,0为已设置,1为设置失败 +// wxAuthorizerInfo.setBaseTime(new Date()); +// } +// if(wxAuthorizerInfo.getDomainStatus() == null){ +// wxAuthorizerInfo.setDomainStatus(0);//服务器域名设置状态,0为已设置,1为设置失败 +// wxAuthorizerInfo.setDomainTime(new Date()); +// } +// if(wxAuthorizerInfo.getWebdomainStatus() == null){ +// wxAuthorizerInfo.setWebdomainStatus(0);//服务器业务域名设置状态,0为已设置,1为设置失败 +// wxAuthorizerInfo.setWebdomainTime(new Date()); +// } +// if(StringUtils.isNotBlank(wxAuthorizerInfo.getCurrentVersion()) +// && wxAuthorizerInfo.getReleaseTime() != null){ +// wxAuthorizerInfo.setReleaseTime(new Date()); +// } +// if(StringUtils.isNotBlank(wxAuthorizerInfo.getOpenAppid()) +// && wxAuthorizerInfo.getBindOpenTime() != null){ +// wxAuthorizerInfo.setBindOpenTime(new Date()); +// } +// if(StringUtils.isBlank(wxAuthorizerInfo.getRefreshToken())){ +// wxAuthorizerInfo.setRefreshToken(""); +// } +// if(StringUtils.isBlank(wxAuthorizerInfo.getAccessToken())){ +// wxAuthorizerInfo.setAccessToken(""); +// } +// wxAuthorizerInfoService.saveOrUpdate(wxAuthorizerInfo); +// return new ResultData(); +// }catch (Exception e){ +// logger.error(e.getMessage(),e); +// return new ResultData(ErrorCode.SYS_SERVER_ERROR); +// } +// } @ApiOperation("查询商场基础数据") @GetMapping(value = "/getinit/{id}") diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgConfigService.java index 85b95a0eb..c352ede2a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMsgConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMsgConfigService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMsgConfig; import com.iformall.domain.po.WxProjectConfig; +import com.iformall.domain.po.base.TenantEntity; import java.util.List; @@ -17,6 +18,8 @@ public interface WxMsgConfigService { */ void WxMsgConfigInit(String tenantId, WxProjectConfig wxProjectConfig); + void wxMsgConfigInit(TenantEntity tenantInfo); + /** * 根据实体查询分页列表 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java index d9c0a5c1f..992d0c242 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java @@ -6,8 +6,10 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.po.WxMsgConfig; import com.iformall.domain.po.WxProjectConfig; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.service.WxMsgConfigService; +import com.iformall.sms.EnumSMSChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -51,6 +53,18 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService { wxMsgConfigMapper.insert(wxMsgConfig); } + @Override + public void wxMsgConfigInit(TenantEntity tenantInfo) { + WxMsgConfig wxMsgConfig = new WxMsgConfig(); + wxMsgConfig.updateTenantInfo(tenantInfo); + wxMsgConfig.setSmsChannel(EnumSMSChannel.ALIYUN.getCode()); + wxMsgConfig.setTotal((long) 100000); + wxMsgConfig.setRecharge((long) 0); + wxMsgConfig.setRemains((long) 100000); + wxMsgConfig.setReminderstatus(0); + wxMsgConfigMapper.insert(wxMsgConfig); + } + @Override public PageInfo listAsPage(WxMsgConfig record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgConfigMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 55f16c3d1..31c6eddbc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -150,6 +150,8 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { wxMsgValidationcodeModelService.wxMsgValidationcodeModelInit(wxMall.getTenantId(), wxMall.getName(), wxMall.getImgUrlH()); //wx_flow_config wxFlowService.wxFlowConfigInit(wxMall.getTenantId()); + //wx_msg_config(默认aliyun) + wxMsgConfigService.wxMsgConfigInit(wxMall.getTenantInfo()); } wxMallService.update(wxMall); }