suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20250623_fix' into 'master'

Browse Source 
Cc 20250623 fix

See merge request hangzhou/java/custom_zxjp!117
This commit is contained in:
苏竹红
2025-06-23 08:06:11 +00:00
parent ab3218f33c 868343b9b5
commit 229a7c180f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
View File

@@ -337,6 +337,7 @@ public class LinePayServiceImpl implements LinePayService {
} }
FranchiseFeePayInfoResponse response = new FranchiseFeePayInfoResponse(); FranchiseFeePayInfoResponse response = new FranchiseFeePayInfoResponse();
BeanUtil.copyProperties(linePay, response); BeanUtil.copyProperties(linePay, response);
response.setPayTime(DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, linePay.getPayTime()));
return response; return response;
} }

2
coolstore-partner-web/src/main/resources/application-online.properties
View File

@@ -1,5 +1,5 @@
#mysql config #mysql config
default.datasource.url=jdbc:mysql://store10-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true default.datasource.url=jdbc:mysql://zx-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
default.datasource.username=coolstore default.datasource.username=coolstore
default.datasource.password=CSCErYcXniNYm7bT default.datasource.password=CSCErYcXniNYm7bT