Compare commits

..

2 Commits

Author SHA256 Message Date
10efe35616 Merge remote-tracking branch 'origin/main' 2026-01-14 12:24:54 +08:00
9c7403613f 配置更新、bug修复 2026-01-14 12:24:39 +08:00
3 changed files with 188 additions and 1 deletions

View File

@ -89,7 +89,7 @@ public class EbikeEcuInfo implements Serializable {
/**
* 是否被领取主要针对绑定电池的中控可能被领取进行换电
*/
@Column(onInsertValue = "f")
@Column(onInsertValue = "false")
private Boolean isClaim;
}

View File

@ -0,0 +1,82 @@
server:
port: 10015
spring:
application:
name: ebike-payment
servlet:
multipart:
max-file-size: 30MB
max-request-size: 100MB
file-size-threshold: 0B
cloud:
nacos:
server-addr: 47.109.141.125:8848 # nacos
username: nacos
password: 970529
sql:
init:
platform: postgis
mode: never
schema-locations: classpath:db/init.sql
data-locations: classpath:db/data.sql
jackson:
serialization:
write-dates-as-timestamps: false
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
datasource:
url: jdbc:postgresql://47.109.141.125:5432/ebike_user?currentSchema=public&stringtype=unspecified
username: root
password: Cdzj1234
driver-class-name: org.postgresql.Driver
hikari:
## 最小空闲连接数量
minimum-idle: 2
## 空闲连接存活最大时间默认60000010分钟
idle-timeout: 180000
## 连接池最大连接数默认是10
maximum-pool-size: 5
## 数据库连接超时时间,默认30秒即30000
connection-timeout: 30000
connection-test-query: SELECT 1
##此属性控制池中连接的最长生命周期值0表示无限生命周期默认1800000即30分钟
max-lifetime: 1800000
mybatis-flex:
mapper-locations: classpath:mapper/*.xml
payment:
wx-pay:
app-id: wx327d788d7bd6eddf
merchant-id: 1715147005
private-key-path: /opt/wxpay/apiclient_key.pem
public-key-path: /opt/wxpay/pub_key.pem
merchant-serial-number: 7873E3E694ADD0368EA3E9FAC929F496EECB8DF9
api-v3-key: 1715147005V3Key20250425174554633
public-key-id: PUB_KEY_ID_0117151470052025042500331704000601
pay-notify_url: https://www.cx.cdzhuojing.cn/ebike/payment/wxPayment/notify/pay
refund-notify_url: https://www.cx.cdzhuojing.cn/ebike/payment/wxPayment/notify/refund
expire-minute: 120
query-limit: 100
pay-schedule: 0 0 0/2 * * ?
refund-schedule: 0 0/30 * * * ?
task-scheduler-pool:
poolSize: 100
threadNamePrefix: task-scheduled-
waitForTasksToCompleteOnShutdown: true
awaitTerminationSeconds: 30
management:
endpoints:
web:
exposure:
include: health,info
endpoint:
health:
show-details: always
logging:
file:
name: logs/${spring.application.name}.log
pattern:
dateformat: yyyy-MM-dd HH:mm:ss.SSS # 包含毫秒

View File

@ -0,0 +1,105 @@
server:
port: 10014
spring:
servlet:
multipart:
max-file-size: 30MB
max-request-size: 100MB
file-size-threshold: 0B
application:
name: ebike-user
cloud:
nacos:
server-addr: 47.109.141.125:8848 # nacos
username: nacos
password: 970529
sql:
init:
platform: postgis
mode: never
schema-locations: classpath:db/init.sql
data-locations: classpath:db/data.sql
jackson:
serialization:
write-dates-as-timestamps: false
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
datasource:
url: jdbc:postgresql://47.109.141.125:5432/ebike_user?currentSchema=public&stringtype=unspecified
username: root
password: Cdzj1234
driver-class-name: org.postgresql.Driver
hikari:
## 最小空闲连接数量
minimum-idle: 2
## 空闲连接存活最大时间默认60000010分钟
idle-timeout: 180000
## 连接池最大连接数默认是10
maximum-pool-size: 5
## 数据库连接超时时间,默认30秒即30000
connection-timeout: 30000
connection-test-query: SELECT 1
##此属性控制池中连接的最长生命周期值0表示无限生命周期默认1800000即30分钟
max-lifetime: 1800000
data:
# redis配置
redis:
# Redis数据库索引默认为0
database: 1
# Redis服务器地址
host: 47.109.141.125
# Redis服务器连接端口
port: 6379
# Redis服务器连接密码默认为空
password: 970529
# 连接超时时间
lettuce:
pool:
# 连接池最大连接数
max-active: 200
# 连接池最大阻塞等待时间(使用负值表示没有限制)
max-wait: -1ms
# 连接池中的最大空闲连接
max-idle: 10
# 连接池中的最小空闲连接
min-idle: 0
mybatis-flex:
mapper-locations: classpath:mapper/*.xml
#微信小程序
wechat:
appid: wx327d788d7bd6eddf
app-secret: adf2539a6c26499c67b5a3829f2e05e3
#数据宝
real-name:
api-key: 086ba8e74bd22b814af36f12371f8f3e
#客户端私钥
client-private-key: cc1ed364d4c05b9ce0de5c690484c301e00452c1f183f93fa43e5b0ba6a76c99
#服务端公钥
server-public-key: 03a21563bf3d2b43cfd519918a0138ac6cfde1ff3b0e4a7a31edb602e9537390a7
management:
endpoints:
web:
exposure:
include: health,info
endpoint:
health:
show-details: always
minio:
endpoint: http://47.109.141.125:9000 # MinIO服务器地址
access-key: ZIF4HF1LXH0RTB9MZ52O # 访问密钥
secret-key: YuFoH+VJVzQbNLRqVMo39dM5pWXCEcMvrCrtgwB0 # 私有密钥
bucket-name: user-objects
show-url: http://47.109.141.125:9000
logging:
file:
name: logs/${spring.application.name}.log
pattern:
dateformat: yyyy-MM-dd HH:mm:ss.SSS # 包含毫秒