Schisandra-Cloud-Storage/schisandra-cloud-storage
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

Browse Source
This commit is contained in:
sjm
2024-06-28 11:07:04 +08:00
parent 667451f701 b6681f7f14
commit 9da0044cc6
14 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java
View File

@@ -29,7 +29,7 @@ public class SmsInitConfig implements SmartLifecycle {
@Resource @Resource
RedisUtil redisUtil; RedisUtil redisUtil;
private final String smsConfigPrefix="sys.common"; private final String smsConfigPrefix="system:config";
public void init() { public void init() {
ConfigInfo configInfo = configRpc.getConfigInfo(SmsConfigContext.SMS_CONFIG_KEY); ConfigInfo configInfo = configRpc.getConfigInfo(SmsConfigContext.SMS_CONFIG_KEY);

2
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java
View File

@@ -26,7 +26,7 @@ public class ReactRotateCaptchaController {
@Resource @Resource
private RedisUtil redisUtil; private RedisUtil redisUtil;
public final String authRotateCaptchaPrefix = "auth.rotate.captcha"; public final String authRotateCaptchaPrefix = "auth:user:captcha";
/** /**

13
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java
View File

@@ -54,7 +54,7 @@ public class SchisandraAuthUserController {
@Resource @Resource
private SchisandraAuthUserDomainService schisandraAuthUserDomainService; private SchisandraAuthUserDomainService schisandraAuthUserDomainService;
private final String AUTH_PHONE_PREFIX = "auth.phone"; private final String AUTH_PHONE_PREFIX = "auth:user:phone";
@Resource @Resource
private CheckRouteCaptcha checkRouteCaptcha; private CheckRouteCaptcha checkRouteCaptcha;
@@ -62,13 +62,13 @@ public class SchisandraAuthUserController {
@Resource @Resource
private SchisandraAuthRoleDomainService schisandraAuthRoleDomainService; private SchisandraAuthRoleDomainService schisandraAuthRoleDomainService;
private final String AUTH_PERMISSION_PREFIX = "auth.permission"; private final String AUTH_PERMISSION_PREFIX = "auth:user:permission";
private final String AUTH_ROLE_PREFIX = "auth.role"; private final String AUTH_ROLE_PREFIX = "auth:user:role";
private final String WX_LOGIN_TEMPORARY_CLIENT_ID = "wechat.client.id"; private final String WX_LOGIN_TEMPORARY_CLIENT_ID = "wechat:client:id";
private final String WX_LOGIN_TOKEN = "wechat.login.token"; private final String WX_LOGIN_TOKEN = "wechat:login:token";
@Resource @Resource
private SchisandraAuthRolePermissionDomainService schisandraAuthRolePermissionDomainService; private SchisandraAuthRolePermissionDomainService schisandraAuthRolePermissionDomainService;
@@ -76,9 +76,6 @@ public class SchisandraAuthUserController {
@Resource @Resource
private SchisandraAuthPermissionDomainService schisandraAuthPermissionDomainService; private SchisandraAuthPermissionDomainService schisandraAuthPermissionDomainService;
@Value("${web.url}")
private String url;
/** /**
* @description: 注册 * @description: 注册
* @param: [schisandraAuthUserDTO] * @param: [schisandraAuthUserDTO]

4
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java
View File

@@ -30,8 +30,8 @@ public class SchisandraSmsController {
@Resource @Resource
private RedisUtil redisUtil; private RedisUtil redisUtil;
private final String AUTH_PHONE_PREFIX = "auth.phone"; private final String AUTH_PHONE_PREFIX = "auth:user:phone";
private final String SMS_CONFIG_PREFIX = "sys.config"; private final String SMS_CONFIG_PREFIX = "system:config";
@Resource @Resource
CheckRouteCaptcha checkRouteCaptcha; CheckRouteCaptcha checkRouteCaptcha;

2
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/utils/CheckRouteCaptcha.java
View File

@@ -19,7 +19,7 @@ import javax.annotation.Resource;
public class CheckRouteCaptcha { public class CheckRouteCaptcha {
@Resource @Resource
private RedisUtil redisUtil; private RedisUtil redisUtil;
public final String authRotateCaptchaPrefix = "auth.rotate.captcha"; public final String authRotateCaptchaPrefix = "auth:user:captcha";
public CaptchaResult checkCaptcha(String token, Double deg) { public CaptchaResult checkCaptcha(String token, Double deg) {
if (deg == null && token == null) { if (deg == null && token == null) {
return CaptchaResult.fail(); return CaptchaResult.fail();

2
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisUtil.java
View File

@@ -24,7 +24,7 @@ public class RedisUtil {
@Resource @Resource
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
private static final String CACHE_KEY_SEPARATOR = "."; private static final String CACHE_KEY_SEPARATOR = ":";
/** /**
* 构建缓存key * 构建缓存key

6
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java
View File

@@ -56,11 +56,11 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
private SchisandraSocialUserAuthService schisandraSocialUserAuthService; private SchisandraSocialUserAuthService schisandraSocialUserAuthService;
private final String AUTH_PERMISSION_PREFIX = "auth.permission"; private final String AUTH_PERMISSION_PREFIX = "auth:user:permission";
private final String AUTH_ROLE_PREFIX = "auth.role"; private final String AUTH_ROLE_PREFIX = "auth:user:role";
private final String WX_LOGIN_TOKEN = "wechat.login.token"; private final String WX_LOGIN_TOKEN = "wechat:login:token";
@Resource @Resource
RedisUtil redisUtil; RedisUtil redisUtil;

4
schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java
View File

@@ -26,9 +26,9 @@ public class StpInterfaceImpl implements StpInterface {
@Resource @Resource
private RedisUtil redisUtil; private RedisUtil redisUtil;
private final String AUTH_PERMISSION_PREFIX = "auth.permission"; private final String AUTH_PERMISSION_PREFIX = "auth:user:permission";
private final String AUTH_ROLE_PREFIX = "auth.role"; private final String AUTH_ROLE_PREFIX = "auth:user:role";
@Override @Override
public List<String> getPermissionList(Object userId, String loginType) { public List<String> getPermissionList(Object userId, String loginType) {

2
schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java
View File

@@ -23,7 +23,7 @@ public class RedisUtil {
@Resource @Resource
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
private static final String CACHE_KEY_SEPARATOR = "."; private static final String CACHE_KEY_SEPARATOR = ":";
/** /**
* 构建缓存key * 构建缓存key

2
schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisUtil.java
View File

@@ -24,7 +24,7 @@ public class RedisUtil {
@Resource @Resource
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
private static final String CACHE_KEY_SEPARATOR = "."; private static final String CACHE_KEY_SEPARATOR = ":";
/** /**
* 构建缓存key * 构建缓存key

2
schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisUtil.java
View File

@@ -24,7 +24,7 @@ public class RedisUtil {
@Resource @Resource
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
private static final String CACHE_KEY_SEPARATOR = "."; private static final String CACHE_KEY_SEPARATOR = ":";
/** /**
* 构建缓存key * 构建缓存key

2
schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/common/redis/RedisUtil.java
View File

@@ -24,7 +24,7 @@ public class RedisUtil {
@Resource @Resource
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
private static final String CACHE_KEY_SEPARATOR = "."; private static final String CACHE_KEY_SEPARATOR = ":";
/** /**
* 构建缓存key * 构建缓存key

2
schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WXServiceImpl.java
View File

@@ -30,7 +30,7 @@ public class WXServiceImpl implements WXService {
@Resource @Resource
RedisUtil redisUtil; RedisUtil redisUtil;
final String WX_ACCESS_TOKEN_REDIS_KEY = "wx_access_token"; final String WX_ACCESS_TOKEN_REDIS_KEY = "wechat:token";
//接口重试次数 //接口重试次数
int retry = 3; int retry = 3;

2
schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java
View File

@@ -80,7 +80,7 @@ public class WxMpEventServiceImpl implements WxMpEventService {
String[] keys = mpSubscribeEventRequest.getEventKey().split("_"); String[] keys = mpSubscribeEventRequest.getEventKey().split("_");
if ("qrscene".equals(keys[0]) && "ScanReg".equals(keys[1])) { if ("qrscene".equals(keys[0]) && "ScanReg".equals(keys[1])) {
log.info("AppId：{}，ClientId：{}", keys[2], keys[3]); log.info("AppId：{}，ClientId：{}", keys[2], keys[3]);
authUserRpc.wechatRegister(keys[2], mpSubscribeEventRequest.getToUserName(), keys[3]); authUserRpc.wechatRegister(keys[2], mpSubscribeEventRequest.getFromUserName(), keys[3]);
return null; return null;
} }
} }