czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
张松
2024-12-26 19:16:00 +08:00
parent 94add5ee6c 409c3cc81c
commit b39a7f6dc5
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

10
src/main/resources/application-prod.yml
View File

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

7
src/main/resources/application.yml
View File

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