diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 25531267..ec1e7f06 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -857,8 +857,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl> index(){ + if(RedisUtil.get(ShopConstants.YSHOP_REDIS_INDEX_KEY) != null){ + return ApiResult.ok(RedisUtil.get(ShopConstants.YSHOP_REDIS_INDEX_KEY)); + } Map map = new LinkedHashMap<>(); //banner @@ -75,7 +80,8 @@ public class IndexController { map.put("roll",systemGroupDataService.getDatas("routine_home_roll_news")); - + //缓存 + RedisUtil.set(ShopConstants.YSHOP_REDIS_INDEX_KEY,map,ShopConstants.YSHOP_REDIS_INDEX_KEY_EXPIRE); return ApiResult.ok(map); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java index 4d16d294..76ad7e5b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java @@ -22,7 +22,6 @@ public class YxStoreProductQueryParam extends QueryParam { private int type; private int sid; - private int cid; private int news; private String priceOrder; private String salesOrder; diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java index 190e00f8..e83221e7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java @@ -92,7 +92,8 @@ public class WechatController extends BaseController { Map map = new LinkedHashMap<>(); map.put("appId",jsapiSignature.getAppId()); - map.put("jsApiList",new String[]{"updateAppMessageShareData","openLocation","scanQRCode","chooseWXPay"}); + map.put("jsApiList",new String[]{"updateAppMessageShareData","openLocation","scanQRCode", + "chooseWXPay","updateAppMessageShareData","updateTimelineShareData"}); map.put("nonceStr",jsapiSignature.getNonceStr()); map.put("signature",jsapiSignature.getSignature()); map.put("timestamp",jsapiSignature.getTimestamp()); diff --git a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java index 14f8a543..bdaa5598 100644 --- a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java +++ b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java @@ -49,6 +49,16 @@ public interface ShopConstants { */ String QQ_MAP_URL = "https://apis.map.qq.com/ws/geocoder/v1/"; + /** + * redis首页键 + */ + String YSHOP_REDIS_INDEX_KEY = "yshop_index_data"; + + /** + * redis首页过期时间 单位秒 + */ + long YSHOP_REDIS_INDEX_KEY_EXPIRE = 7200; + }