Merge branch 'mp-server-test' into 'master'

Mp server test

See merge request quanshu/mp-server!194

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelWithdrawController.java

@@ -95,6 +95,9 @@ public class ChannelWithdrawController extends BaseApiController {
     if (channel.getMoney() < 50000) {
       return AjaxResult.error("账户余额不足500元");
     }
+    if (param.getMoney() > channel.getMoney() ) {
+      return AjaxResult.error("提现金额超出了余额");
+    }
     int feeAmt = new BigDecimal(param.getMoney()).multiply(feeRate)
         .divide(new BigDecimal(100), 0, RoundingMode.HALF_UP).intValue();
     ChannelWithdraw channelWithdraw = new ChannelWithdraw();
@@ -113,6 +116,7 @@ public class ChannelWithdrawController extends BaseApiController {
     redisCache.setCacheObject(CHANNEL_WITHDRAW_CACHE_KEY + channelId, channelWithdraw, 1, TimeUnit.MINUTES);
 
     JSONObject jsonObject = new JSONObject();
+    jsonObject.put("withdrawAmt", channelWithdraw.getMoney());
     jsonObject.put("chargeAmt", channelWithdraw.getChargeAmt());
     jsonObject.put("chargeRate", feeRate);
     return AjaxResult.success(jsonObject);

mp-admin/src/main/resources/application-8100.yml

@@ -1,6 +1,6 @@
 #三方支付配置
 pay:
-  callbackUrl: https://api.quanshu123.com/service/notify/payCallback
+  callbackUrl: https://mp-api.51jiazhu.com/service/notify/payCallback
 
 # 日志配置
 logging:
@@ -15,9 +15,9 @@ logging:
 # 数据源配置
 spring:
     redis:
-      host: 172.17.0.17
+      host: 172.17.16.10
       port: 6379
-      password: SD232@%Gwwer1ds0(SS323
+      password: 5YgEx,%5crw!9x0F2Em26Gx
       # 连接超时时间（毫秒）
       timeout: 10000
       jedis:
@@ -36,9 +36,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.17.0.3:3306/ygpdb-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-                username: ygp_prod
-                password: x23W%s2PcW23)vw23Csaw234)3
+                url: jdbc:mysql://172.17.32.4:3306/mpdb-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+                username: mp_prod
+                password: x2xs@S3W%s2PcW23)vw23Csaw234)3
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -109,9 +109,21 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: mp-public-1307117429
+  public-bucket-name: mp-public-1310078123
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: mp-auth-1307117429
+  private-bucket-name: mp-auth-1310078123
+
+  accessKey: AKIDSnvoRovmOkqfGbfT1JL6bssd9OTJsBE1
+  secretKey: auxkHXWFhtpX0C7lCMFrDJ8g39zY8Yic
+  region: ap-shanghai
+
+mq:
+  consumer-conn: true
+  service-url: http://pulsar-rd94exwe9rmq.tdmq-pulsar.ap-sh.qcloud.tencenttdmq.com:5039
+  auth-token: eyJrZXlJZCI6InB1bHNhci1yZDk0ZXh3ZTlybXEiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJwdWxzYXItcmQ5NGV4d2U5cm1xX21wLXNlcnZlci1wcm9kIn0.lV__rvUtTdNxcFI9qq50s81YZxw9V-7vDxK0_tDJHNo
+  topic-ticket-generate: pulsar-rd94exwe9rmq/prod-share/topic-ticket-generate
+  topic-ticket-pay: pulsar-rd94exwe9rmq/prod-share/topic-ticket-pay
+  consumer-topics: pulsar-rd94exwe9rmq/prod-share/topic-ticket-generate,pulsar-rd94exwe9rmq/prod-share/topic-ticket-pay
 
 # 小程序
 miniprogram:

mp-admin/src/main/resources/application-8200.yml

@@ -1,6 +1,6 @@
 #三方支付配置
 pay:
-  callbackUrl: https://api.quanshu123.com/service/notify/payCallback
+  callbackUrl: https://mp-api.51jiazhu.com/service/notify/payCallback
 
 # 日志配置
 logging:
@@ -15,9 +15,9 @@ logging:
 # 数据源配置
 spring:
     redis:
-      host: 172.17.0.17
+      host: 172.17.16.10
       port: 6379
-      password: SD232@%Gwwer1ds0(SS323
+      password: 5YgEx,%5crw!9x0F2Em26Gx
       # 连接超时时间（毫秒）
       timeout: 10000
       jedis:
@@ -36,9 +36,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.17.0.3:3306/ygpdb-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-                username: ygp_prod
-                password: x23W%s2PcW23)vw23Csaw234)3
+                url: jdbc:mysql://172.17.32.4:3306/mpdb-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+                username: mp_prod
+                password: x2xs@S3W%s2PcW23)vw23Csaw234)3
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -92,7 +92,7 @@ server:
     context-path: /
   session-timeout: 1800
   # 生成唯一ID的，同一Mac地址多应用的部署方式，用这个进行区分
-  datacenterId: 1
+  datacenterId: 2
   # 环境标识
   env: prod
 
@@ -109,9 +109,21 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: mp-public-1307117429
+  public-bucket-name: mp-public-1310078123
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: mp-auth-1307117429
+  private-bucket-name: mp-auth-1310078123
+
+  accessKey: AKIDSnvoRovmOkqfGbfT1JL6bssd9OTJsBE1
+  secretKey: auxkHXWFhtpX0C7lCMFrDJ8g39zY8Yic
+  region: ap-shanghai
+
+mq:
+  consumer-conn: false
+  service-url: http://pulsar-rd94exwe9rmq.tdmq-pulsar.ap-sh.qcloud.tencenttdmq.com:5039
+  auth-token: eyJrZXlJZCI6InB1bHNhci1yZDk0ZXh3ZTlybXEiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJwdWxzYXItcmQ5NGV4d2U5cm1xX21wLXNlcnZlci1wcm9kIn0.lV__rvUtTdNxcFI9qq50s81YZxw9V-7vDxK0_tDJHNo
+  topic-ticket-generate: pulsar-rd94exwe9rmq/prod-share/topic-ticket-generate
+  topic-ticket-pay: pulsar-rd94exwe9rmq/prod-share/topic-ticket-pay
+  consumer-topics: pulsar-rd94exwe9rmq/prod-share/topic-ticket-generate,pulsar-rd94exwe9rmq/prod-share/topic-ticket-pay
 
 # 小程序
 miniprogram:

mp-admin/src/main/resources/application-dev.yml

@@ -25,7 +25,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://110.40.236.236:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://110.40.236.236:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=UTC
                 username: mptest
                 password: wan789*@dfhzHu518!dr2xosn
                 # 从库数据源
@@ -106,6 +106,10 @@ cloud:
     # 存储对象公开不可访问，需要通过应用下载
     private-bucket-name: mp-auth-test-1307117429
 
+    accessKey: AKIDDF4dwzlGVTAmCMGvLVP4UfbHiuqVzFEw
+    secretKey: TgbFcjZ8HDse9ToujIabLo1yf5YqtfBX
+    region: ap-shanghai
+
 mq:
     consumer-conn: false
     service-url: http://pulsar-rkrxw2wx8zeo.tdmq-pulsar.ap-sh.public.tencenttdmq.com:8080

mp-admin/src/main/resources/application-test.yml

@@ -111,13 +111,17 @@ cloud:
   # 存储对象公开不可访问，需要通过应用下载
   private-bucket-name: mp-auth-test-1307117429
 
+  accessKey: AKIDDF4dwzlGVTAmCMGvLVP4UfbHiuqVzFEw
+  secretKey: TgbFcjZ8HDse9ToujIabLo1yf5YqtfBX
+  region: ap-shanghai
+
 mq:
   consumer-conn: true
-  service-url: http://pulsar-rkrxw2wx8zeo.tdmq-pulsar.ap-sh.public.tencenttdmq.com:8080
-  auth-token: eyJrZXlJZCI6InB1bHNhci1ya3J4dzJ3eDh6ZW8iLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJwdWxzYXItcmtyeHcyd3g4emVvX21wLXNlcnZlci10ZXN0In0.12cemXSqXGn9beDFnB-uUe477G6pP9bNbDUA4fIRsgk
-  topic-ticket-generate: pulsar-rkrxw2wx8zeo/test-share/topic-ticket-generate
-  topic-ticket-pay: pulsar-rkrxw2wx8zeo/test-share/topic-ticket-pay
-  consumer-topics: pulsar-rkrxw2wx8zeo/test-share/topic-ticket-generate,pulsar-rkrxw2wx8zeo/test-share/topic-ticket-pay
+  service-url: http://pulsar-op4bzppa37m4.tdmq-pulsar.ap-sh.public.tencenttdmq.com:8080
+  auth-token: eyJrZXlJZCI6InB1bHNhci1vcDRienBwYTM3bTQiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJwdWxzYXItb3A0YnpwcGEzN200X21wLXNlcnZlci10ZXN0In0.GVeFHHSqIYqTeOtXItWOT-NfydCSNvvVVS2FlpFZNKY
+  topic-ticket-generate: pulsar-op4bzppa37m4/test-share/topic-ticket-generate
+  topic-ticket-pay: pulsar-op4bzppa37m4/test-share/topic-ticket-pay
+  consumer-topics: pulsar-op4bzppa37m4/test-share/topic-ticket-generate,pulsar-op4bzppa37m4/test-share/topic-ticket-pay
 
 
 # 小程序

mp-admin/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/Users/daixiaodan/Documents/logs" />
+	<property name="log.path" value="/Users/Steven/Documents/logs" />
     <!-- 日志输出格式 -->
     <!-- You can override this to have a custom pattern -->
 	<property name="CONSOLE_LOG_PATTERN" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -63,4 +63,4 @@
         <appender-ref ref="DEBUG"/>
         <appender-ref ref="ERROR" />
     </root>
-</configuration> 
+</configuration>

mp-common/src/main/java/com/qs/mp/common/qcloud/QcloudFileUtils.java

@@ -14,25 +14,51 @@ import java.io.File;
 import java.io.InputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 /**
  * @author zhongcp
  * @Date 2021/9/18
  */
+@Component
 public class QcloudFileUtils {
 
   private static final Logger logger = LoggerFactory.getLogger(QcloudFileUtils.class);
 
-  static COSClient cosClient = createCli();
+  private static COSClient cosClient;
 
-  static COSClient createCli() {
-    return createCli("ap-shanghai");
+  private static String accessKey;
+
+  @Value("${cloud.accessKey}")
+  public void setAccessKey(String accessKeyParam) {
+    accessKey = accessKeyParam;
+  }
+
+  private static String secretKey;
+
+  @Value("${cloud.secretKey}")
+  public void setSecretKey(String secretKeyParam) {
+    secretKey = secretKeyParam;
+  }
+
+  private static String region;
+
+  @Value("${cloud.region}")
+  public void setRegion(String regionParam) {
+    region = regionParam;
+  }
+
+  public static COSClient getCosClient() {
+    if (null == cosClient) {
+      cosClient = createCli(region);
+    }
+    return cosClient;
   }
 
   static COSClient createCli(String region) {
     // 初始化用户身份信息(secretId, secretKey)
-    COSCredentials cred = new BasicCOSCredentials("AKIDDF4dwzlGVTAmCMGvLVP4UfbHiuqVzFEw",
-        "TgbFcjZ8HDse9ToujIabLo1yf5YqtfBX");
+    COSCredentials cred = new BasicCOSCredentials(accessKey, secretKey);
     // 设置bucket的区域, COS地域的简称请参照 https://www.qcloud.com/document/product/436/6224
     ClientConfig clientConfig = new ClientConfig(new Region(region));
     // 生成cos客户端
@@ -47,7 +73,7 @@ public class QcloudFileUtils {
     PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, file);
     putObjectRequest.withMetadata(objectMetadata);
 
-    PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
+    PutObjectResult putObjectResult = getCosClient().putObject(putObjectRequest);
 
     LogUtil.info(logger, "put file reqId: " + putObjectResult.getRequestId());
   }
@@ -61,7 +87,7 @@ public class QcloudFileUtils {
     PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, stream, objectMetadata);
 //    putObjectRequest.withMetadata(objectMetadata);
 
-    PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
+    PutObjectResult putObjectResult = getCosClient().putObject(putObjectRequest);
 
     LogUtil.info(logger, "put file reqId: " + putObjectResult.getRequestId());
 
@@ -90,7 +116,7 @@ public class QcloudFileUtils {
   public static void downloadFile(String key, String bucketName, String localDir, String saveName) {
     GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, key);
     File localFile = new File(localDir + saveName);
-    ObjectMetadata objectMetadata = cosClient.getObject(getObjectRequest, localFile);
+    ObjectMetadata objectMetadata = getCosClient().getObject(getObjectRequest, localFile);
 
     LogUtil.info(logger, "download file content length:" + objectMetadata.getContentLength());
   }