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

# Conflicts:
#	src/main/java/com/gxwebsoft/common/core/utils/WechatCertAutoConfig.java
#	src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
This commit is contained in:
2025-08-11 12:24:26 +08:00
86 changed files with 2543 additions and 1322 deletions

View File

@@ -7,7 +7,7 @@ server:
# 数据源配置
spring:
datasource:
url: jdbc:mysql://8.134.169.209:13306/website?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://8.134.169.209:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
username: modules
password: 8YdLnk7KsPAyDXGA
driver-class-name: com.mysql.cj.jdbc.Driver