修复bug

hcp-app/src/main/java/com/yingyangfly/app/controller/LoginController.java

@@ -7,6 +7,7 @@ import com.yingyangfly.core.service.impl.AppUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,6 +36,9 @@ public class LoginController {
     @PostMapping("/loginMsg")
     @TraceLog
     public ResultResponse loginMsg(String checkCode,String mobile){
+        if (StringUtils.isEmpty(checkCode)){
+            return ResultResponse.fail("验证码不能为空!");
+        }
         return appUserService.loginMsg(checkCode,mobile);
     }
 

hcp-app/src/main/resources/application-dev.yml

@@ -9,7 +9,7 @@ spring:
     mongodb:
       authentication-database: admin
       database: hcp-dev
-      host: dds-2ze3cbd9f8d401c41890-pub.mongodb.rds.aliyuncs.com
+      host: 47.93.254.212
       port: 3717
       username: root
       password: SkyMedic$240307
@@ -22,7 +22,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     name: master
-    url: jdbc:mysql://rm-2zen71312tv411bu9zo.mysql.rds.aliyuncs.com:3306/hcp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.93.254.212:3306/hcp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: SkyMedic$240307
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -45,7 +45,7 @@ spring:
     time-zone: GMT+8
 #redis
 redis:
-  host: r-2zefn1nr3540r6vkzspd.redis.rds.aliyuncs.com
+  host: 47.93.254.212
   port: 6379
   timeout: 3000
   password: SkyMedic$240307
@@ -72,9 +72,9 @@ logging:
 
 
 oss:
-  access-key-id: LTAI5tLedmmz2Sxg4vaXpUwB
-  access-key-secret: DkbWSG00gPLqz0wSsrzifOJUDdYQ3A
-  bucket-name: game377
+  access-key-id: LTAI5tCEQ1So2i2GehVRk6Er
+  access-key-secret: Ju8eTnJdHa6nZJuDPfee2eQJQvuVuw
+  bucket-name: hcp-yaorong
   endpoint:  oss-cn-beijing.aliyuncs.com #填写自己oss endpoint
   outDomain: http://yaorongoss.yingyangfly.com #填写自己oss 外网域名
 
@@ -101,6 +101,6 @@ baidu:
   appId: 55480265
   apiKey: px002Mxrj5K2CGyanMoQUcZU
   secretKey: hiD6uuvNgRchMF0WVK3GN4bMxcmkq9Zt
-query-daily-trai: https://123.57.78.197/h5-training-daily/index.html
+query-daily-trai: https://www.yingyangfly.com/h5-training-daily/index.html
 
-review-task-space: 30
+review-task-space: 30

hcp-core/src/main/java/com/yingyangfly/core/util/WXPayUtil.java

@@ -160,7 +160,9 @@ public class WXPayUtil {
         orgMer.setType("1");
         orgMer.setOrgCode(payOrder.getOrgCode());
         OrgMerchant orgMerchant = orgMerchantService.selectOne(orgMer);
-        String privateKey = orgMerchant.getPrivateKey();
+        String privateKey = orgMerchant.getPrivateKey().replace("-----BEGIN PRIVATE KEY-----", "")
+                .replace("-----END PRIVATE KEY-----", "")
+                .replaceAll("\\s+", "");;
         String appId= orgMerchant.getAppId();
         String mchId = orgMerchant.getMchId();
         String mchSerialNo= orgMerchant.getMchSerialNo();

hcp-large-screen/src/main/resources/application-dev.yml

@@ -15,14 +15,14 @@ spring:
     mongodb:
       authentication-database: admin
       database: hcp-dev
-      host: dds-2ze3cbd9f8d401c41890-pub.mongodb.rds.aliyuncs.com
+      host: 47.93.254.212
       port: 3717
       username: root
       password: SkyMedic$240307
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     name: master
-    url: jdbc:mysql://rm-2zen71312tv411bu9zo.mysql.rds.aliyuncs.com:3306/hcp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.93.254.212:3306/hcp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: SkyMedic$240307
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -45,7 +45,7 @@ spring:
     time-zone: GMT+8
 #redis
 redis:
-  host: r-2zefn1nr3540r6vkzspd.redis.rds.aliyuncs.com
+  host: 47.93.254.212
   port: 6379
   timeout: 3000
   password: SkyMedic$240307
@@ -72,8 +72,8 @@ logging:
 
 
 oss:
-  access-key-id: LTAI5tLedmmz2Sxg4vaXpUwB
-  access-key-secret: DkbWSG00gPLqz0wSsrzifOJUDdYQ3A
+  access-key-id: LTAI5tCEQ1So2i2GehVRk6Er
+  access-key-secret: Ju8eTnJdHa6nZJuDPfee2eQJQvuVuw
   bucket-name: game377
   endpoint:  oss-cn-beijing.aliyuncs.com #填写自己oss endpoint
   outDomain: http://yaorongoss.yingyangfly.com #填写自己oss 外网域名
@@ -100,6 +100,6 @@ baidu:
   appId: 55480265
   apiKey: px002Mxrj5K2CGyanMoQUcZU
   secretKey: hiD6uuvNgRchMF0WVK3GN4bMxcmkq9Zt
-query-daily-trai: https://123.57.78.197/h5-training-daily/index.html
+query-daily-trai: https://www.yingyangfly.com/h5-training-daily/index.html
 
-review-task-space: 30
+review-task-space: 30

hcp-platform/src/main/resources/application-dev.yml

@@ -15,14 +15,14 @@ spring:
     mongodb:
       authentication-database: admin
       database: hcp-dev
-      host: dds-2ze3cbd9f8d401c41890-pub.mongodb.rds.aliyuncs.com
+      host: 47.93.254.212
       port: 3717
       username: root
       password: SkyMedic$240307
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     name: master
-    url: jdbc:mysql://rm-2zen71312tv411bu9zo.mysql.rds.aliyuncs.com:3306/hcp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.93.254.212:3306/hcp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: SkyMedic$240307
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -45,7 +45,7 @@ spring:
     time-zone: GMT+8
 #redis
 redis:
-  host: r-2zefn1nr3540r6vkzspd.redis.rds.aliyuncs.com
+  host: 47.93.254.212
   port: 6379
   timeout: 3000
   password: SkyMedic$240307
@@ -67,9 +67,9 @@ mybatis-plus:
   type-aliases-package: com.yingyangfly.**.domain
 
 oss:
-  access-key-id: LTAI5tLedmmz2Sxg4vaXpUwB
-  access-key-secret: DkbWSG00gPLqz0wSsrzifOJUDdYQ3A
-  bucket-name: game377
+  access-key-id: LTAI5tCEQ1So2i2GehVRk6Er
+  access-key-secret: Ju8eTnJdHa6nZJuDPfee2eQJQvuVuw
+  bucket-name: hcp-yaorong
   endpoint:  oss-cn-beijing.aliyuncs.com #填写自己oss endpoint
   outDomain: http://yaorongoss.yingyangfly.com #填写自己oss 外网域名
 wx:
@@ -117,8 +117,8 @@ security:
       - /pub/app/**
       - /callback/**
       - /im/callback/**
-      - /pay/callback/**s
+      - /pay/callback/**/m**
 
-query-daily-trai: https://123.57.78.197/h5-training-daily/index.html
+query-daily-trai: https://www.yingyangfly.com/h5-training-daily/index.html
 
 review-task-space: 30