wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 11:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master_zhp

Browse Source 
# Conflicts:
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java
This commit is contained in:
鲸落
2024-10-11 17:22:13 +08:00
parent 872977d4c2 e10288e284
commit 511a551b6a
16 changed files with 69 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java
View File

@@ -33,5 +33,10 @@ public class RedisConstant {
/**
* H5申请幂等校验
*/
public final static String H5_APPLY_CHECK = CacheConstants.PROJET+"H5:apply:check";
public final static String H5_APPLY_CHECK = CacheConstants.PROJET+"H5:apply:check:";
/**
* 撞库幂等校验
*/
public final static String HIT_CHECK_CACHE = CacheConstants.PROJET+"hit:check:cache:";
}

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java
View File

@@ -334,7 +334,7 @@ public class SecureUtils {
" \"orderStatus\":\"2\"\n" +
"}";
System.out.println(AesEncode(s3,"LwLjtU1Bt8dcxxjY"));
System.out.println(AesEncode(s1,"g5N8XTYaOEwEmBgg"));
}
/**
* 解密