suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
shuo.wang
2025-04-17 16:37:23 +08:00
parent 80500fd6a6 7b81ce98e3
commit 32a45dc2af
16 changed files with 124 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -252,6 +252,7 @@ public enum ErrorCodeEnum {
SYSTEM_DATA_ERROR(151004,"平台账号不能为空",null),
CURRENT_STATUS_NOT_OPERATION(151005,"平台账号当前非审核状态！不能提交审核",null),
CURRENT_ENTRY_STATUS_NOT_OPERATION(151006,"进件状态未审核！不能执行该操作",null),
GET_YLS_CODE_FAIL(151006,"系统无云流水编码！无法获取TOKEN！请先维护该编码",null),
;

5
coolstore-partner-common/src/main/java/com/cool/store/exception/ServiceException.java
View File

@@ -81,10 +81,9 @@ public class ServiceException extends RuntimeException{
}
public ServiceException(ErrorCodeEnum responseEnum, Object... objects) {
super(responseEnum.getMessage());
String message = MessageFormat.format(responseEnum.getMessage(), objects);
super(MessageFormat.format(responseEnum.getMessage(), objects));
this.errorCode = responseEnum.getCode();
this.errorMessage = message;
this.errorMessage = super.getMessage();
}

3
coolstore-partner-common/src/main/java/com/cool/store/utils/HmacSigner.java
View File

@@ -68,6 +68,9 @@ public class HmacSigner {
}
private static String hmacSha256(String secret, String data) throws Exception {
if (StringUtil.isEmpty(secret)){
return "";
}
Mac mac = Mac.getInstance(HMAC_ALGORITHM);
mac.init(new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), HMAC_ALGORITHM));
byte[] hash = mac.doFinal(data.getBytes(StandardCharsets.UTF_8));

2
coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java
View File

@@ -25,7 +25,7 @@ public class OpenSignatureUtil {
// 2. 创建不包含固定参数的临时Map用于排序
Map<String, String> sortedParams = new TreeMap<>(
params.entrySet().stream()
.filter(e -> !"appkey".equals(e.getKey()))
.filter(e -> !"appKey".equals(e.getKey()))
.filter(e -> !"timestamp".equals(e.getKey()))
.filter(e -> !"sign".equals(e.getKey()))
.collect(Collectors.toMap(