czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
Tankaikai
2024-10-26 17:27:52 +08:00
parent 9207ebfd03 3b2f2e4bbe
commit 0e05d067a0
19 changed files with 244 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
eladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -4,8 +4,9 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:p6spy:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
# url: jdbc:p6spy:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
# url: jdbc:mysql://127.0.0.1:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
url: jdbc:p6spy:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
username: cashier
password: Cashier@1@
# driver-class-name: com.mysql.cj.jdbc.Driver
@@ -146,4 +147,10 @@ decorator:
multiline: false
cashier:
server:
wx: https://wxcashiertest.sxczgkj.cn/
wx: https://wxcashiertest.sxczgkj.cn/
# 三方支付回调信息
thirdPay:
notify:
fstPay: https://admintestpapi.sxczgkj.cn/notify/fstPay
fstReturn: https://admintestpapi.sxczgkj.cn/notify/fstReturn

5
eladmin-system/src/main/resources/config/application-pre.yml
View File

@@ -138,3 +138,8 @@ file:
cashier:
server:
wx: https://pre-cashier.sxczgkj.cn/
thirdPay:
notify:
fstPay: https://pre-cashieradmin.sxczgkj.cn/notify/fstPay
fstReturn: https://pre-cashieradmin.sxczgkj.cn/notify/fstReturn

4
eladmin-system/src/main/resources/config/application.yml
View File

@@ -65,11 +65,7 @@ qrcode: https://kysh.sxczgkj.cn/codeplate?code=
thirdPay:
groupCallBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyCallBackGroup
payType: fushangtong
callBack: https://cashierclient.sxczgkj.cn/cashier-client/notify/notifyPay
url: https://paymentapi.sxczgkj.cn
notify:
fstPay: https://admintestpapi.sxczgkj.cn/notify/fstPay
fstReturn: https://admintestpapi.sxczgkj.cn/notify/fstReturn
mybatis-plus:
mapper-locations: classpath*:/mapper/plus/*.xml