Merge branch 'refs/heads/dev' into test

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -1495,11 +1495,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             userMoneyDetails.setCreateTime(DateUtil.format(new Date(System.currentTimeMillis() - 1000), "yyyy-MM-dd HH:mm:ss"));
             userMoneyDetails.setMoneyType(1);
             boolean ret = userMoneyDetailsService.save(userMoneyDetails);
-//            if (ret) {
-//                ThreadUtil.execAsync(()->{
-//                    discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]");
-//                },true);
-//            }
+            if (ret) {
+                ThreadUtil.execAsync(()->{
+                    discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]");
+                },true);
+            }
         } catch (Exception e) {
             log.error("首绑支付宝发放奖励异常，用户信息：{}", JSONUtil.toJsonStr(entity));
             log.error("首绑支付宝发放奖励异常：", e);

src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java

@@ -95,10 +95,10 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
         userMoneyService.updateAmount(1, receive.getUserId(), receive.getNumber().doubleValue());
 
 
-//        if (receive.getNumber().compareTo(new BigDecimal("0.1")) > 0 && StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) {
-//            //提现
-//            withdraw(userInfo, receive.getNumber().doubleValue());
-//        }
+        if (receive.getNumber().compareTo(new BigDecimal("0.1")) > 0 && StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) {
+            //提现
+            withdraw(userInfo, receive.getNumber().doubleValue());
+        }
     }
 
     @Override

src/main/resources/application-prod.yml

@@ -6,9 +6,9 @@ spring:
             url: jdbc:mysql://rm-gc7xx913734hv5w5q.mysql.cn-chengdu.rds.aliyuncs.com/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
             username: video_user
             password: VideoUser@1
-            initial-size: 10
-            max-active: 100
-            min-idle: 10
+            initial-size: 50
+            max-active: 200
+            min-idle: 50
             max-wait: 60000
             pool-prepared-statements: true
             max-pool-prepared-statement-per-connection-size: 20
@@ -36,5 +36,5 @@ swagger:
     enabled: false
 pay:
     h5BaseUrl: https://dj-h5.hnsiyao.cn/me/detail/detail?allId=
-    orderNotifyUrl: https://dj-api.hnsiyao.cn/czg/app/wuyou/notify
-    extractNotifyUrl: https://dj-api.hnsiyao.cn/czg/app/wuyou/extractNotify
+    orderNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/notify
+    extractNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/extractNotify

src/main/resources/application.yml

@@ -6,9 +6,10 @@ logging:
 server:
   tomcat:
     uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-    connection-timeout: 5000ms
+    connection-timeout: 50000ms
+    threads:
+      max: 1600
+      min-spare: 50
   port: 8100
   servlet:
     context-path: /czg