From 4f9c5a214c4204fe98ee4f099103b93053bd339e Mon Sep 17 00:00:00 2001 From: xwb <717567226@qq.com> Date: Wed, 29 Apr 2020 17:48:11 +0800 Subject: [PATCH] =?UTF-8?q?reidsKey=E5=BE=AE=E4=BF=A1=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=87=87=E7=94=A8=E6=9E=9A=E4=B8=BE=E7=BB=9F=E4=B8=80=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/RedisKeyInitialization.java | 7 +++--- .../web/controller/StoreOrderController.java | 3 ++- .../modules/security/rest/AuthController.java | 5 ++-- .../impl/YxStoreProductServiceImpl.java | 3 ++- .../shop/web/controller/IndexController.java | 3 ++- .../web/controller/WxMaUserController.java | 5 ++-- .../yixiang/mp/config/WxMpConfiguration.java | 9 ++++--- .../yixiang/mp/config/WxPayConfiguration.java | 25 ++++++++++--------- .../dto/YxStoreCouponUserQueryCriteria.java | 8 +++--- .../shop/rest/SystemConfigController.java | 7 +++--- .../shop/rest/SystemStoreController.java | 5 ++-- 11 files changed, 45 insertions(+), 35 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java index 5c78c2e8..321bc4d0 100644 --- a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java +++ b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java @@ -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 redisTemplate; + private final RedisTemplate redisTemplate; @PostConstruct public void redisKeyInitialization(){ List 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); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java index 2fed2371..e5ed6d4c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java @@ -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)){ diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java index f9913247..fe09a358 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java @@ -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("请先配置小程序"); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index 6dba67c7..1eb85c39 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -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 create(@Validated @RequestBody String jsonStr){ - String key = RedisUtil.get("tengxun_map_key"); + String key = RedisUtil.get(RedisKeyEnum.TENGXUN_MAP_KEY.getValue()); if(StrUtil.isBlank(key)) throw new BadRequestException("请先配置腾讯地图key"); JSONObject jsonObject = JSON.parseObject(jsonStr); String addr = jsonObject.getString("addr"); @@ -107,4 +108,4 @@ public class SystemStoreController { yxSystemStoreService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +}