| @@ -38,9 +38,9 @@ public class WxMsgValidationcodeController extends BaseController { | |||||
| @GetMapping("sendvalidationcode") | @GetMapping("sendvalidationcode") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), | @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "type", value = "场景", dataType = "String", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) | @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) | ||||
| public ResultData sendvalidationcode(String phone, Integer type, String appid) { | |||||
| public ResultData sendvalidationcode(String phone, String type, String appid) { | |||||
| WxMerchantBUser userQ = new WxMerchantBUser(); | WxMerchantBUser userQ = new WxMerchantBUser(); | ||||
| userQ.setAppId(appid); | userQ.setAppId(appid); | ||||
| @@ -67,7 +67,7 @@ public class WxMsgValidationcodeController extends BaseController { | |||||
| WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); | WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); | ||||
| wxMsgValidationcode.setTenantId(user.getTenantId()); | wxMsgValidationcode.setTenantId(user.getTenantId()); | ||||
| wxMsgValidationcode.setPhone(phone); | wxMsgValidationcode.setPhone(phone); | ||||
| wxMsgValidationcode.setType(type); | |||||
| wxMsgValidationcode.setType(Integer.valueOf(type)); | |||||
| wxMsgValidationcode.setAppid(appid); | wxMsgValidationcode.setAppid(appid); | ||||
| return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); | return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); | ||||
| } | } | ||||
| @@ -0,0 +1,36 @@ | |||||
| package com.iformall.enums; | |||||
| /** | |||||
| * Created by Stormeye on 2018/08/09. | |||||
| */ | |||||
| public enum EnumVerifyCode { | |||||
| YES(1, "是"), | |||||
| NO(0, "否") | |||||
| ; | |||||
| public static EnumVerifyCode getEnum(Integer code) { | |||||
| for (EnumVerifyCode value : values()) { | |||||
| if (value.getCode().equals(code)) { | |||||
| return value; | |||||
| } | |||||
| } | |||||
| return null; | |||||
| } | |||||
| private Integer code; | |||||
| private String message; | |||||
| EnumVerifyCode(Integer code, String message) { | |||||
| this.code = code; | |||||
| this.message = message; | |||||
| } | |||||
| public Integer getCode() { | |||||
| return code; | |||||
| } | |||||
| public String getMessage() { | |||||
| return message; | |||||
| } | |||||
| } | |||||
| @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxMallApply; | |||||
| import com.iformall.domain.po.WxMsgConfig; | import com.iformall.domain.po.WxMsgConfig; | ||||
| import com.iformall.domain.po.WxMsgValidationcode; | import com.iformall.domain.po.WxMsgValidationcode; | ||||
| import com.iformall.domain.po.WxMsgValidationcodeModel; | import com.iformall.domain.po.WxMsgValidationcodeModel; | ||||
| import com.iformall.enums.EnumVerifyCode; | |||||
| import com.iformall.mapper.WxMallApplyMapper; | import com.iformall.mapper.WxMallApplyMapper; | ||||
| import com.iformall.mapper.WxMsgConfigMapper; | import com.iformall.mapper.WxMsgConfigMapper; | ||||
| import com.iformall.mapper.WxMsgValidationcodeMapper; | import com.iformall.mapper.WxMsgValidationcodeMapper; | ||||
| @@ -118,7 +119,7 @@ public class WxMallApplyServiceImpl implements WxMallApplyService { | |||||
| wxMsgValidationcode.setMsg(msg); | wxMsgValidationcode.setMsg(msg); | ||||
| String notifyUrl = wxMsgConfig.getNotifyurl(); | String notifyUrl = wxMsgConfig.getNotifyurl(); | ||||
| String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl); | |||||
| String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl,EnumVerifyCode.YES.getCode().toString()); | |||||
| JSONObject jsonObjectResult = JSONObject.parseObject(result); | JSONObject jsonObjectResult = JSONObject.parseObject(result); | ||||
| String ret = jsonObjectResult.get("ret").toString(); | String ret = jsonObjectResult.get("ret").toString(); | ||||
| @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.WxMsgConfig; | import com.iformall.domain.po.WxMsgConfig; | ||||
| import com.iformall.domain.po.WxMsgModel; | import com.iformall.domain.po.WxMsgModel; | ||||
| import com.iformall.enums.EnumMsgModelStatus; | import com.iformall.enums.EnumMsgModelStatus; | ||||
| import com.iformall.enums.EnumVerifyCode; | |||||
| import com.iformall.mapper.WxMsgConfigMapper; | import com.iformall.mapper.WxMsgConfigMapper; | ||||
| import com.iformall.mapper.WxMsgModelMapper; | import com.iformall.mapper.WxMsgModelMapper; | ||||
| import com.iformall.service.WxMsgModelService; | import com.iformall.service.WxMsgModelService; | ||||
| @@ -70,7 +71,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { | |||||
| } | } | ||||
| String result = WiwideUtil.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, | String result = WiwideUtil.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, | ||||
| content, wxMsgConfig.getModelnotifyurl()); | |||||
| content, wxMsgConfig.getModelnotifyurl(),EnumVerifyCode.NO.getCode().toString()); | |||||
| JSONObject jsonObjectResult = JSONObject.parseObject(result); | JSONObject jsonObjectResult = JSONObject.parseObject(result); | ||||
| String ret = jsonObjectResult.get("ret").toString(); | String ret = jsonObjectResult.get("ret").toString(); | ||||
| if (ret.equals(EnumMsgModelStatus.SUCCESS.getCode().toString())) { | if (ret.equals(EnumMsgModelStatus.SUCCESS.getCode().toString())) { | ||||
| @@ -11,10 +11,7 @@ import com.iformall.domain.po.WxCUserBasicInfo; | |||||
| import com.iformall.domain.po.WxMsg; | import com.iformall.domain.po.WxMsg; | ||||
| import com.iformall.domain.po.WxMsgCallback; | import com.iformall.domain.po.WxMsgCallback; | ||||
| import com.iformall.domain.po.WxMsgConfig; | import com.iformall.domain.po.WxMsgConfig; | ||||
| import com.iformall.enums.EnumMsgSend; | |||||
| import com.iformall.enums.EnumMsgSendSetTime; | |||||
| import com.iformall.enums.EnumMsgSendStatus; | |||||
| import com.iformall.enums.EnumMsgStatus; | |||||
| import com.iformall.enums.*; | |||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.mapper.WxCUserBasicInfoMapper; | import com.iformall.mapper.WxCUserBasicInfoMapper; | ||||
| import com.iformall.mapper.WxMsgCallbackMapper; | import com.iformall.mapper.WxMsgCallbackMapper; | ||||
| @@ -261,7 +258,7 @@ public class WxMsgServiceImpl implements WxMsgService { | |||||
| String signature = wxMsg.getSignature(); | String signature = wxMsg.getSignature(); | ||||
| String msg = wxMsg.getMsg(); | String msg = wxMsg.getMsg(); | ||||
| String notifyUrl = wxMsgConfig.getNotifyurl(); | String notifyUrl = wxMsgConfig.getNotifyurl(); | ||||
| String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl); | |||||
| String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl,EnumVerifyCode.NO.getCode().toString()); | |||||
| JSONObject jsonObjectResult = JSONObject.parseObject(result); | JSONObject jsonObjectResult = JSONObject.parseObject(result); | ||||
| String ret = jsonObjectResult.get("ret").toString(); | String ret = jsonObjectResult.get("ret").toString(); | ||||
| String batchNo = jsonObjectResult.get("data").toString(); | String batchNo = jsonObjectResult.get("data").toString(); | ||||
| @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.WxMsgConfig; | import com.iformall.domain.po.WxMsgConfig; | ||||
| import com.iformall.domain.po.WxMsgValidationcodeModel; | import com.iformall.domain.po.WxMsgValidationcodeModel; | ||||
| import com.iformall.enums.EnumMsgModelStatus; | import com.iformall.enums.EnumMsgModelStatus; | ||||
| import com.iformall.enums.EnumVerifyCode; | |||||
| import com.iformall.mapper.WxMsgConfigMapper; | import com.iformall.mapper.WxMsgConfigMapper; | ||||
| import com.iformall.mapper.WxMsgValidationcodeModelMapper; | import com.iformall.mapper.WxMsgValidationcodeModelMapper; | ||||
| import com.iformall.service.WxMsgValidationcodeModelService; | import com.iformall.service.WxMsgValidationcodeModelService; | ||||
| @@ -71,7 +72,7 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM | |||||
| } | } | ||||
| } | } | ||||
| String result = WiwideUtil.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, content, wxMsgConfig.getModelnotifyurl()); | |||||
| String result = WiwideUtil.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, content, wxMsgConfig.getModelnotifyurl(),EnumVerifyCode.YES.getCode().toString()); | |||||
| JSONObject jsonObjectResult = JSONObject.parseObject(result); | JSONObject jsonObjectResult = JSONObject.parseObject(result); | ||||
| String ret = jsonObjectResult.get("ret").toString(); | String ret = jsonObjectResult.get("ret").toString(); | ||||
| @@ -9,6 +9,7 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.enums.EnumMsgSendStatus; | import com.iformall.enums.EnumMsgSendStatus; | ||||
| import com.iformall.enums.EnumVerifyCode; | |||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.WxMsgValidationcodeService; | import com.iformall.service.WxMsgValidationcodeService; | ||||
| import com.iformall.utils.*; | import com.iformall.utils.*; | ||||
| @@ -120,7 +121,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic | |||||
| wxMsgValidationcode.setMsg(msg); | wxMsgValidationcode.setMsg(msg); | ||||
| String notifyUrl = wxMsgConfig.getNotifyurl(); | String notifyUrl = wxMsgConfig.getNotifyurl(); | ||||
| String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl); | |||||
| String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.YES.getCode().toString()); | |||||
| JSONObject jsonObjectResult = JSONObject.parseObject(result); | JSONObject jsonObjectResult = JSONObject.parseObject(result); | ||||
| String ret = jsonObjectResult.get("ret").toString(); | String ret = jsonObjectResult.get("ret").toString(); | ||||
| String batchNo = jsonObjectResult.get("data").toString(); | String batchNo = jsonObjectResult.get("data").toString(); | ||||
| @@ -17,14 +17,14 @@ public class WiwideUtil { | |||||
| private static final String addTemplateUrl = "https://webapp.wiwide.com/apisms/addtemplate"; | private static final String addTemplateUrl = "https://webapp.wiwide.com/apisms/addtemplate"; | ||||
| private static final String smsSendUrl = "https://webapp.wiwide.com/apisms/send"; | private static final String smsSendUrl = "https://webapp.wiwide.com/apisms/send"; | ||||
| public static String addTemplate(String secret, String bid, String publickey, String signature, String content, String notifyUrl) { | |||||
| public static String addTemplate(String secret, String bid, String publickey, String signature, String content, String notifyUrl,String verifysms) { | |||||
| //请求api数据排序 | //请求api数据排序 | ||||
| TreeMap<String, String> message = new TreeMap<>(); | TreeMap<String, String> message = new TreeMap<>(); | ||||
| message.put("bid", bid); | message.put("bid", bid); | ||||
| message.put("signature", signature); | message.put("signature", signature); | ||||
| message.put("content", content); | message.put("content", content); | ||||
| message.put("notify_url",notifyUrl); | message.put("notify_url",notifyUrl); | ||||
| message.put("verifysms","1"); | |||||
| message.put("verifysms",verifysms); | |||||
| StringBuilder sb = new StringBuilder(); | StringBuilder sb = new StringBuilder(); | ||||
| Set<Map.Entry<String, String>> entries = message.entrySet(); | Set<Map.Entry<String, String>> entries = message.entrySet(); | ||||
| @@ -56,13 +56,14 @@ public class WiwideUtil { | |||||
| } | } | ||||
| public static String sendMsg(String secret, String bid, String publickey, | public static String sendMsg(String secret, String bid, String publickey, | ||||
| String phone, String signature, String msg, String notifyUrl) { | |||||
| String phone, String signature, String msg, String notifyUrl,String verifysms) { | |||||
| TreeMap<String, String> message = new TreeMap<>(); | TreeMap<String, String> message = new TreeMap<>(); | ||||
| message.put("bid", bid); | message.put("bid", bid); | ||||
| message.put("phone", phone); | message.put("phone", phone); | ||||
| message.put("signature", signature); | message.put("signature", signature); | ||||
| message.put("msg", msg); | message.put("msg", msg); | ||||
| message.put("notify_url", notifyUrl); | message.put("notify_url", notifyUrl); | ||||
| message.put("verifysms",verifysms); | |||||
| StringBuilder sb = new StringBuilder(); | StringBuilder sb = new StringBuilder(); | ||||
| Set<Map.Entry<String, String>> entries = message.entrySet(); | Set<Map.Entry<String, String>> entries = message.entrySet(); | ||||