cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reidsKey微信相关采用枚举统一处理

Browse Source
This commit is contained in:
xwb
2020-04-29 17:48:11 +08:00
parent af3e9e30d9
commit 4f9c5a214c
11 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java
View File

@ -6,6 +6,7 @@ import co.yixiang.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.List;
@ -23,14 +24,14 @@ public class RedisKeyInitialization {
private final YxSystemConfigService systemConfigService;
private final RedisTemplate<String,String> redisTemplate;
private final RedisTemplate<Object, Object> redisTemplate;
@PostConstruct
public void redisKeyInitialization(){
List<RedisKeyEnum> redisKeyEnums = Stream.of(RedisKeyEnum.values()).collect(Collectors.toList());
for (RedisKeyEnum redisKeyEnum : redisKeyEnums) {
String redisKey = redisTemplate.opsForValue().get(redisKeyEnum.getValue());
if(StringUtils.isEmpty(redisKey)){
Object redisKey = redisTemplate.opsForValue().get(redisKeyEnum.getValue());
if(redisKey == null){
String dbKey = systemConfigService.getData(redisKeyEnum.getValue());
redisTemplate.opsForValue().set(redisKeyEnum.getValue(),dbKey);
}

3
yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java
View File

@ -19,6 +19,7 @@ import co.yixiang.common.web.controller.BaseController;
import co.yixiang.enums.AppFromEnum;
import co.yixiang.enums.OrderInfoEnum;
import co.yixiang.enums.PayTypeEnum;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.BadRequestException;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.express.ExpressService;
@ -455,7 +456,7 @@ public class StoreOrderController extends BaseController {
//门店
if(OrderInfoEnum.SHIPPIING_TYPE_2.getValue().equals(storeOrder.getShippingType())){
String mapKey = RedisUtil.get("tengxun_map_key");
String mapKey = RedisUtil.get(RedisKeyEnum.TENGXUN_MAP_KEY.getValue());
if(StrUtil.isBlank(mapKey)) return ApiResult.fail("请配置腾讯地图key");
String apiUrl = systemConfigService.getData("api_url");
if(StrUtil.isEmpty(apiUrl)){

5
yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java
View File

@ -22,6 +22,7 @@ import co.yixiang.common.api.ApiCode;
import co.yixiang.common.api.ApiResult;
import co.yixiang.constant.ShopConstants;
import co.yixiang.enums.AppFromEnum;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.notify.NotifyService;
import co.yixiang.modules.notify.NotifyType;
@ -309,8 +310,8 @@ public class AuthController {
String spread = loginParam.getSpread();
try {
//读取redis配置
String appId = RedisUtil.get("wxapp_appId");
String secret = RedisUtil.get("wxapp_secret");
String appId = RedisUtil.get(RedisKeyEnum.WXAPP_APPID.getValue());
String secret = RedisUtil.get(RedisKeyEnum.WXAPP_SECRET.getValue());
if (StrUtil.isBlank(appId) || StrUtil.isBlank(secret)) {
throw new ErrorRequestException("请先配置小程序");
}

3
yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
View File

@ -14,6 +14,7 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.web.vo.Paging;
import co.yixiang.enums.CommonEnum;
import co.yixiang.enums.ProductEnum;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.shop.entity.YxStoreProduct;
import co.yixiang.modules.shop.entity.YxStoreProductAttrValue;
@ -160,7 +161,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<YxStoreProductMap
//门店
productDTO.setSystemStore(systemStoreService.getStoreInfo(latitude,longitude));
productDTO.setMapKey(RedisUtil.get("tengxun_map_key"));
productDTO.setMapKey(RedisUtil.get(RedisKeyEnum.TENGXUN_MAP_KEY.getValue()));
return productDTO;
}

3
yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java
View File

@ -14,6 +14,7 @@ import cn.hutool.core.util.StrUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.common.api.ApiResult;
import co.yixiang.constant.ShopConstants;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.modules.shop.service.YxStoreProductService;
import co.yixiang.modules.shop.service.YxSystemGroupDataService;
import co.yixiang.modules.shop.service.YxSystemStoreService;
@ -83,7 +84,7 @@ public class IndexController {
//滚动
map.put("roll",systemGroupDataService.getDatas(ShopConstants.YSHOP_HOME_ROLL_NEWS));
map.put("mapKey",RedisUtil.get("tengxun_map_key"));
map.put("mapKey",RedisUtil.get(RedisKeyEnum.TENGXUN_MAP_KEY.getValue()));
return ApiResult.ok(map);
}

5
yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java
View File

@ -17,6 +17,7 @@ import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.common.api.ApiResult;
import co.yixiang.enums.RedisKeyEnum;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.notify.NotifyType;
import co.yixiang.modules.notify.SmsResult;
@ -107,8 +108,8 @@ public class WxMaUserController {
}
//读取redis配置
String appId = RedisUtil.get("wxapp_appId");
String secret = RedisUtil.get("wxapp_secret");
String appId = RedisUtil.get(RedisKeyEnum.WXAPP_APPID.getValue());
String secret = RedisUtil.get(RedisKeyEnum.WXAPP_SECRET.getValue());
if (StrUtil.isBlank(appId) || StrUtil.isBlank(secret)) {
throw new ErrorRequestException("请先配置小程序");
}