diff --git a/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 b/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 index 82815e5..c5435e6 100644 --- a/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 +++ b/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 @@ -29,7 +29,7 @@ public class SmsInitConfig implements SmartLifecycle { @Resource RedisUtil redisUtil; - private final String smsConfigPrefix="sys.common"; + private final String smsConfigPrefix="system:config"; public void init() { ConfigInfo configInfo = configRpc.getConfigInfo(SmsConfigContext.SMS_CONFIG_KEY); diff --git a/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 b/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 index 41666e1..1fab6ad 100644 --- a/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 +++ b/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 @@ -26,7 +26,7 @@ public class ReactRotateCaptchaController { @Resource private RedisUtil redisUtil; - public final String authRotateCaptchaPrefix = "auth.rotate.captcha"; + public final String authRotateCaptchaPrefix = "auth:user:captcha"; /** diff --git a/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 b/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 index 8dc673e..cd4c543 100644 --- a/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 +++ b/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 @@ -54,7 +54,7 @@ public class SchisandraAuthUserController { @Resource private SchisandraAuthUserDomainService schisandraAuthUserDomainService; - private final String AUTH_PHONE_PREFIX = "auth.phone"; + private final String AUTH_PHONE_PREFIX = "auth:user:phone"; @Resource private CheckRouteCaptcha checkRouteCaptcha; @@ -62,13 +62,13 @@ public class SchisandraAuthUserController { @Resource 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 private SchisandraAuthRolePermissionDomainService schisandraAuthRolePermissionDomainService; @@ -76,9 +76,6 @@ public class SchisandraAuthUserController { @Resource private SchisandraAuthPermissionDomainService schisandraAuthPermissionDomainService; - @Value("${web.url}") - private String url; - /** * @description: 注册 * @param: [schisandraAuthUserDTO] diff --git a/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 b/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 index f58c734..2866c21 100644 --- a/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 +++ b/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 @@ -30,8 +30,8 @@ public class SchisandraSmsController { @Resource private RedisUtil redisUtil; - private final String AUTH_PHONE_PREFIX = "auth.phone"; - private final String SMS_CONFIG_PREFIX = "sys.config"; + private final String AUTH_PHONE_PREFIX = "auth:user:phone"; + private final String SMS_CONFIG_PREFIX = "system:config"; @Resource CheckRouteCaptcha checkRouteCaptcha; diff --git a/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 b/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 index 7370884..01295d1 100644 --- a/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 +++ b/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 @@ -19,7 +19,7 @@ import javax.annotation.Resource; public class CheckRouteCaptcha { @Resource private RedisUtil redisUtil; - public final String authRotateCaptchaPrefix = "auth.rotate.captcha"; + public final String authRotateCaptchaPrefix = "auth:user:captcha"; public CaptchaResult checkCaptcha(String token, Double deg) { if (deg == null && token == null) { return CaptchaResult.fail(); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisUtil.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisUtil.java index 24b15a7..a112aa4 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisUtil.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/redis/RedisUtil.java @@ -24,7 +24,7 @@ public class RedisUtil { @Resource private RedisTemplate redisTemplate; - private static final String CACHE_KEY_SEPARATOR = "."; + private static final String CACHE_KEY_SEPARATOR = ":"; /** * 构建缓存key diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java index da83c98..610a0b3 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java @@ -56,11 +56,11 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo 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 RedisUtil redisUtil; diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java index a6f24cc..19802e9 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java @@ -26,9 +26,9 @@ public class StpInterfaceImpl implements StpInterface { @Resource 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 public List getPermissionList(Object userId, String loginType) { diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java index 42d60d6..760465f 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java @@ -23,7 +23,7 @@ public class RedisUtil { @Resource private RedisTemplate redisTemplate; - private static final String CACHE_KEY_SEPARATOR = "."; + private static final String CACHE_KEY_SEPARATOR = ":"; /** * 构建缓存key diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisUtil.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisUtil.java index 425b6c5..28cf26a 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisUtil.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/redis/RedisUtil.java @@ -24,7 +24,7 @@ public class RedisUtil { @Resource private RedisTemplate redisTemplate; - private static final String CACHE_KEY_SEPARATOR = "."; + private static final String CACHE_KEY_SEPARATOR = ":"; /** * 构建缓存key diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisUtil.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisUtil.java index 5f3f32a..cc3f5c7 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisUtil.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisUtil.java @@ -24,7 +24,7 @@ public class RedisUtil { @Resource private RedisTemplate redisTemplate; - private static final String CACHE_KEY_SEPARATOR = "."; + private static final String CACHE_KEY_SEPARATOR = ":"; /** * 构建缓存key diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/common/redis/RedisUtil.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/common/redis/RedisUtil.java index 2395404..887556e 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/common/redis/RedisUtil.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/common/redis/RedisUtil.java @@ -24,7 +24,7 @@ public class RedisUtil { @Resource private RedisTemplate redisTemplate; - private static final String CACHE_KEY_SEPARATOR = "."; + private static final String CACHE_KEY_SEPARATOR = ":"; /** * 构建缓存key diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WXServiceImpl.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WXServiceImpl.java index 85f3590..cd8acf8 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WXServiceImpl.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WXServiceImpl.java @@ -30,7 +30,7 @@ public class WXServiceImpl implements WXService { @Resource RedisUtil redisUtil; - final String WX_ACCESS_TOKEN_REDIS_KEY = "wx_access_token"; + final String WX_ACCESS_TOKEN_REDIS_KEY = "wechat:token"; //接口重试次数 int retry = 3; diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java index 8146619..94bc64d 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java @@ -80,7 +80,7 @@ public class WxMpEventServiceImpl implements WxMpEventService { String[] keys = mpSubscribeEventRequest.getEventKey().split("_"); if ("qrscene".equals(keys[0]) && "ScanReg".equals(keys[1])) { 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; } }