Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/SMSLogic.java

@@ -38,11 +38,11 @@ public class SMSLogic {
     @Value("${spring.profiles.active}")
     private String active;
 
-    private static String accessKeyId = "LTAI5tDHiEGKuwzNhW2gLPyc";
-    private static String accessKeySecret = "NVXSx3Gj7fHv6unGwWgalJh49uMZOI";
-    private static String SIGN_NAME = "售修宝";
+    private static String accessKeyId = "LTAI5tGCLsqbXGgtgArvCX7t";
+    private static String accessKeySecret = "EK0mN35vqozFcRhI3KCZXOnP1VCLNp";
+    private static String SIGN_NAME = "格力客服中心";
     //短信验证码
-    private static String TEMPLATE_SMS_CODE = "SMS_465295106";
+    private static String TEMPLATE_SMS_CODE = "SMS_212320162";
 
     @PostConstruct
     public void init() {

mall-miniapp-service/src/main/resources/bootstrap-prd.properties

@@ -65,7 +65,7 @@ ali.oss.bucket.name=zfire-jsm-h
 ali.oss.endpoint.ww=oss-cn-shenzhen.aliyuncs.com/
 ali.oss.endpoint=oss-cn-shenzhen-internal.aliyuncs.com/
 ali.oss.type.pic=uploadfile/
-ali.sms.msg.code=SMS_212320165
+ali.sms.msg.code=SMS_212320162
 ali.cdn.url=
 
 
@@ -81,4 +81,4 @@ inf.token.appid=material
 inf.token.appSecret=kaksladjaklsdjlasjdlasjdlaskijwsmk
 
 #分销商城appid
-share.mall.appid=wxb0f1112291629413
+share.mall.appid=wx21d155e8a449d9b1

mall-server-api/src/main/java/com/gree/mall/manager/config/wx/WxConfiguration.java

@@ -3,7 +3,6 @@ package com.gree.mall.manager.config.wx;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
-import cn.hutool.json.JSONUtil;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
@@ -13,7 +12,6 @@ import com.gree.mall.manager.plus.entity.AdminCompanyWechatPayConfig;
 import com.gree.mall.manager.plus.service.AdminCompanyWechatPayConfigService;
 import com.gree.mall.manager.plus.service.AdminCompanyWechatService;
 import com.gree.mall.manager.utils.RedisUtil;
-import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
@@ -30,7 +28,6 @@ import java.util.Map;
 
 @Component
 @Configuration
-@Slf4j
 public class WxConfiguration {
 
     private final static String keyPath = "classpath:/static/apiclient_cert.p12";
@@ -111,8 +108,6 @@ public class WxConfiguration {
         WxPayService wxPayService = new WxPayServiceImpl();
         wxPayService.setConfig(wxPayConfig);
 
-      //  log.info("{} 初始化微信小程序支付服务{}", adminCompanyWechatPayConfig.getCompanyName(), JSONUtil.toJsonStr(wxPayConfig));
-
         wxSubPayWebsitServices.put(adminCompanyWechatPayConfig.getId(),wxPayService);
     }
 
@@ -137,8 +132,6 @@ public class WxConfiguration {
         WxPayService wxPayService = new WxPayServiceImpl();
         wxPayService.setConfig(wxPayConfig);
 
-      //  log.info("{} 初始化微信支付服务{}", adminCompanyWechatPayConfig.getCompanyName(), JSONUtil.toJsonStr(wxPayConfig));
-
         wxPayWebsitServices.put(adminCompanyWechatPayConfig.getId(),wxPayService);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/schedule/SyncGoodsLibrarySchedule.java

@@ -1,28 +1,20 @@
 package com.gree.mall.manager.schedule;
 
-import com.gree.mall.manager.logic.goods.GoodsLibraryLogic;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.net.MalformedURLException;
-
 /**
  * 同步商品库
  * @author ：lijh
  * @description：TODO
  * @date ：2024/5/6 10:02
  */
-@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
-@Component
+//@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
+//@Component
 public class SyncGoodsLibrarySchedule {
 
-    @Autowired
-    GoodsLibraryLogic goodsLibraryLogic;
+//    @Autowired
+//    GoodsLibraryLogic goodsLibraryLogic;
 
-    @Scheduled(cron = "0 0 5 * * ?")
-    public void sync() throws MalformedURLException {
-        goodsLibraryLogic.sync();
-    }
+//    @Scheduled(cron = "0 0 5 * * ?")
+//    public void sync() throws MalformedURLException {
+//        goodsLibraryLogic.sync();
+//    }
 }

mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -82,7 +82,7 @@ inf.token.appid=material
 inf.token.appSecret=kaksladjaklsdjlasjdlasjdlaskijwsmk
 
 #分销商城appid
-share.mall.appid=wxb0f1112291629413
+share.mall.appid=wx21d155e8a449d9b1
 
 #cmc bank request setting
 cmc.bank.url=https://cdc.cmbchina.com/cdcserver/api/v2