Commit 85f852be by HlQ

[add]

1.升级 SpringBoot 版本至 3.3.2
2./contactMain 接口返回合同甲方名称字段
[fix] 使用 RestClient 请求钉钉接口,无需再次 urlEncode
1 parent acd3df3f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.1</version> <version>3.3.2</version>
</parent> </parent>
<artifactId>Vion-DevOps</artifactId> <artifactId>Vion-DevOps</artifactId>
......
...@@ -11,7 +11,7 @@ import lombok.Setter; ...@@ -11,7 +11,7 @@ import lombok.Setter;
@Setter @Setter
public class DingDTO { public class DingDTO {
/** /**
* 微信拼接的两个 code 参数 * 钉钉拼接的两个 code 参数
*/ */
private String authCode; private String authCode;
private String code; private String code;
......
...@@ -189,7 +189,6 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -189,7 +189,6 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
completeStoreName(contractVOList.getRecords()); completeStoreName(contractVOList.getRecords());
contractVOList.getRecords().forEach(vo -> { contractVOList.getRecords().forEach(vo -> {
vo.setCustomerName(null);
vo.setTotalAmount(null); vo.setTotalAmount(null);
vo.setPaidAmount(null); vo.setPaidAmount(null);
vo.setReceivableAmount(null); vo.setReceivableAmount(null);
......
...@@ -30,8 +30,6 @@ import vion.vo.RoleVO; ...@@ -30,8 +30,6 @@ import vion.vo.RoleVO;
import vion.vo.UserVO; import vion.vo.UserVO;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -437,9 +435,7 @@ public class DingMod { ...@@ -437,9 +435,7 @@ public class DingMod {
HMac hMac = SecureUtil.hmacSha256(appSecret); HMac hMac = SecureUtil.hmacSha256(appSecret);
byte[] signBytes = hMac.digest(timestamp); byte[] signBytes = hMac.digest(timestamp);
String sign = Base64.encode(signBytes); String sign = Base64.encode(signBytes);
String encode = URLEncoder.encode(sign, StandardCharsets.UTF_8); return StrUtil.format("/sns/getuserinfo_bycode?accessKey=dingkrzwks0jpi2di3uo&timestamp={}&signature={}", timestamp, sign);
String encodeSign = encode.replace("+", "%20").replace("*", "%2A").replace("~", "%7E").replace("/", "%2F").replace("=", "%3D");
return StrUtil.format("/sns/getuserinfo_bycode?accessKey=dingkrzwks0jpi2di3uo&timestamp={}&signature={}", timestamp, encodeSign);
} }
public String robotPush(String accessToken, String body) { public String robotPush(String accessToken, String body) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!