diff --git a/com-core-model/src/main/java/com/jinrui/core/model/dto/MarriageCodeDTO1.java b/com-core-model/src/main/java/com/jinrui/core/model/dto/MarriageCodeNewDTO.java similarity index 90% rename from com-core-model/src/main/java/com/jinrui/core/model/dto/MarriageCodeDTO1.java rename to com-core-model/src/main/java/com/jinrui/core/model/dto/MarriageCodeNewDTO.java index b026806..46bee19 100644 --- a/com-core-model/src/main/java/com/jinrui/core/model/dto/MarriageCodeDTO1.java +++ b/com-core-model/src/main/java/com/jinrui/core/model/dto/MarriageCodeNewDTO.java @@ -13,7 +13,7 @@ import java.io.Serializable; @AllArgsConstructor @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class MarriageCodeDTO1 extends PageDTO implements Serializable { +public class MarriageCodeNewDTO extends PageDTO implements Serializable { private String marriageNo;//结婚登记证号 private String receiveName;//领取人姓名 diff --git a/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageCodeServiceImpl.java b/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageCodeServiceImpl.java index 0bfe4df..100801b 100644 --- a/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageCodeServiceImpl.java +++ b/com-core-model/src/main/java/com/jinrui/core/service/impl/MarriageCodeServiceImpl.java @@ -29,7 +29,6 @@ public class MarriageCodeServiceImpl extends ServiceImpl map = getResult(); + Map map = getResult(wxParamsDTO.getUrl()); if (map == null) { return ResultUtil.failedMessage("系统内部错误!"); } @@ -52,10 +53,10 @@ public class WXController { } } - public Map getResult() throws Exception { + public Map getResult(String url) throws Exception { String ticket = getTicket(); if (StringUtils.isNotBlank(ticket)) { - Map ret = sign(ticket); + Map ret = sign(ticket,url); ret.put("appId", appId); return ret; } @@ -71,13 +72,15 @@ public class WXController { return ticket; } - public Map sign(String jsapi_ticket) throws Exception { + public Map sign(String jsapi_ticket,String url) throws Exception { Map ret = new HashMap(); String nonce_str = UUID.randomUUID().toString().replace("-", ""); Long timestamp = System.currentTimeMillis() / 1000; String string1; String signature = ""; - + if (StringUtils.isEmpty(url)) { + url = this.url; + } //注意这里参数名必须全部小写,且必须有序 string1 = "jsapi_ticket=" + jsapi_ticket + "&noncestr=" + nonce_str + diff --git a/com-marriage-client/src/main/java/com/jinrui/marriage/client/dto/WxParamsDTO.java b/com-marriage-client/src/main/java/com/jinrui/marriage/client/dto/WxParamsDTO.java new file mode 100644 index 0000000..02998ba --- /dev/null +++ b/com-marriage-client/src/main/java/com/jinrui/marriage/client/dto/WxParamsDTO.java @@ -0,0 +1,8 @@ +package com.jinrui.marriage.client.dto; + +import lombok.Data; + +@Data +public class WxParamsDTO { + private String url; +} diff --git a/com-marriage-client/src/main/resources/config/application-dev.yml b/com-marriage-client/src/main/resources/config/application-dev.yml index 1155821..f47b4a9 100644 --- a/com-marriage-client/src/main/resources/config/application-dev.yml +++ b/com-marriage-client/src/main/resources/config/application-dev.yml @@ -60,10 +60,14 @@ sms: signId: 27289 codeTemplateId: 1 +#wechat: +# appId: wxaae06e5a98cdef82 +# secret: 5d6acf5b1c8452ae4831e61cfb87a2c4 +# url: https://nx.smartjinrui.cn/h5-marriage/ wechat: - appId: wxaae06e5a98cdef82 - secret: 5d6acf5b1c8452ae4831e61cfb87a2c4 - url: https://nx.smartjinrui.cn/h5-marriage/ + appId: wx2485a84669fecb4a + secret: 4982caf47744628803414ecf45a5863c + url: https://fucai-redeem.smartjinrui.cn/#/Index # token配置