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

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

@@ -80,9 +80,8 @@ inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 #分销商城appid
 share.mall.appid=wx21d155e8a449d9b1
 
-spring.elasticsearch.uris=http://116.62.158.92:9200
-spring.elasticsearch.username=elastic
-spring.elasticsearch.password=zfire2022@
-spring.elasticsearch.connection-timeout=5s
-spring.elasticsearch.socket-timeout=30s
-management.health.elasticsearch.enabled=false
+spring.elasticsearch.rest.uris=http://116.62.158.92:9200
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=zfire2022@
+spring.elasticsearch.rest.connection-timeout=5s
+spring.elasticsearch.rest.read-timeout=30s

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

@@ -78,9 +78,8 @@ inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 #分销商城appid
 share.mall.appid=wx21d155e8a449d9b1
 
-spring.elasticsearch.uris=http://116.62.158.92:9200
-spring.elasticsearch.username=elastic
-spring.elasticsearch.password=zfire2022@
-spring.elasticsearch.connection-timeout=5s
-spring.elasticsearch.socket-timeout=30s
-management.health.elasticsearch.enabled=false
+spring.elasticsearch.rest.uris=http://116.62.158.92:9200
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=zfire2022@
+spring.elasticsearch.rest.connection-timeout=5s
+spring.elasticsearch.rest.read-timeout=30s

mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/WorkerComListLogic.java

@@ -128,8 +128,8 @@ public class WorkerComListLogic {
         workerComList.setUpdateTime(new Date());
         workerComList.insert();
 
-        String url = ossUtil.getUrl(fileUrl);
-        InputStream inputStream = commonLogic.getFileInputStreamByUrl(url);
+       // String url = ossUtil.getUrl(fileUrl);
+        InputStream inputStream = commonLogic.getFileInputStreamByUrl(fileUrl);
         List<Object> objects = ExcelUtils.importExcel(inputStream);
         //添加师傅
         List<WorkerComListWorker> workerComListWorkers = new ArrayList<>();
@@ -192,7 +192,7 @@ public class WorkerComListLogic {
 
         if (adminUser.getType() == 1 || adminUser.getNickName().equals(workerComList.getCreateBy())) {
             log.info("【中心文件下发下载】:{}", JSONObject.toJSONString(adminUser));
-            CommonUtils.downloadFile(ossUtil.getUrl(workerComList.getFileUrl()), workerComList.getTitle() + ".xlsx", response);
+            CommonUtils.downloadFile(workerComList.getFileUrl(),workerComList.getTitle()+".xlsx" , response);
         } else {
             List<AdminWebsit> websitList = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId, adminUser.getCompanyWechatIds()).list();
             List<String> websitNumbers = websitList.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -320,10 +320,10 @@ public class WechatLogic {
             log.info("商户扫码支付生成订单响应: {}", payResult);
         } catch (WxPayException e) {
             log.error("商户扫码支付失败: {}", payResult);
-            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
+            throw new RemoteServiceException("扫码支付失败,请刷新二维码，再次尝试扫码");
         }
         if (payResult == null || WxPayConstants.ResultCode.FAIL.equals(payResult.getReturnCode())) {
-            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
+            throw new RemoteServiceException("扫码支付失败,请刷新二维码，再次尝试扫码");
         }
         //记录流水
         AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(companyWechatId);

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

@@ -95,12 +95,11 @@ inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 share.mall.appid=wx21d155e8a449d9b1
 
 #elasticsearch
-spring.elasticsearch.uris=http://116.62.158.92:9200
-spring.elasticsearch.username=elastic
-spring.elasticsearch.password=zfire2022@
-spring.elasticsearch.connection-timeout=5s
-spring.elasticsearch.socket-timeout=30s
-management.health.elasticsearch.enabled=false
+spring.elasticsearch.rest.uris=http://116.62.158.92:9200
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=zfire2022@
+spring.elasticsearch.rest.connection-timeout=5s
+spring.elasticsearch.rest.read-timeout=30s
 
 #cmc bank request setting
 cmc.bank.url=http://cdctest.cmburl.cn:80/cdcserver/api/v2

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

@@ -80,12 +80,11 @@ inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 share.mall.appid=wx21d155e8a449d9b1
 
 #elasticsearch
-spring.elasticsearch.uris=http://116.62.158.92:9200
-spring.elasticsearch.username=elastic
-spring.elasticsearch.password=zfire2022@
-spring.elasticsearch.connection-timeout=5s
-spring.elasticsearch.socket-timeout=30s
-management.health.elasticsearch.enabled=false
+spring.elasticsearch.rest.uris=http://116.62.158.92:9200
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=zfire2022@
+spring.elasticsearch.rest.connection-timeout=5s
+spring.elasticsearch.rest.read-timeout=30s
 
 #cmc bank request setting
 cmc.bank.url=http://cdctest.cmburl.cn:80/cdcserver/api/v2