diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9398561..844d97e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,40 +1,38 @@ -# 开发环境配置 - -# 服务器配置 -server: - port: 9200 +# 生产环境配置 # 数据源配置 spring: datasource: - url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://1Panel-mysql-XsWW:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai username: modules password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource + druid: + remove-abandoned: true + # redis redis: database: 0 - host: localhost + host: 1Panel-redis-GmNr port: 6379 - -# database: 0 -# host: 8.134.55.105 -# port: 16379 -# password: redis_t74P8C + password: redis_t74P8C # 日志配置 logging: + file: + name: websoft-modules.log level: - com.gxwebsoft: DEBUG - com.baomidou.mybatisplus: DEBUG + root: WARN + com.gxwebsoft: ERROR + com.baomidou.mybatisplus: ERROR socketio: - host: localhost #IP地址 + host: 0.0.0.0 #IP地址 # MQTT配置 mqtt: - enabled: false # 添加开关来禁用MQTT服务 + enabled: false # 启用MQTT服务 host: tcp://132.232.214.96:1883 username: swdev password: Sw20250523 @@ -47,28 +45,41 @@ mqtt: # 框架配置 config: - # 开发环境接口 + # 文件服务器 + file-server: https://file-s209.shoplnk.cn + # 生产环境接口 server-url: https://glt-server.websoft.top/api - upload-path: /Users/gxwebsoft/Documents/uploads/ # window(D:\Temp) + # 业务模块接口 + api-url: https://glt-dev-api.websoft.top/api + upload-path: /www/wwwroot/file.ws -# 开发环境证书配置 + # 阿里云OSS云存储 + endpoint: https://oss-cn-shenzhen.aliyuncs.com + accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP + accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM + bucketName: oss-gxwebsoft + bucketDomain: https://oss.wsdns.cn + aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com + +# 生产环境证书配置 certificate: - load-mode: CLASSPATH # 开发环境从classpath加载 - wechat-pay: - dev: - private-key-file: "apiclient_key.pem" - apiclient-cert-file: "apiclient_cert.pem" - wechatpay-cert-file: "wechatpay_cert.pem" + load-mode: VOLUME # 生产环境从Docker挂载卷加载 + cert-root-path: /www/wwwroot/file.ws +# 支付配置缓存 +payment: + cache: + # 支付配置缓存键前缀，生产环境使用 Payment:1* 格式 + key-prefix: "Payment:1" + # 缓存过期时间（小时） + expire-hours: 24 # 阿里云翻译配置 aliyun: translate: access-key-id: LTAI5tEsyhW4GCKbds1qsopg access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO endpoint: mt.cn-hangzhou.aliyuncs.com - -# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致） wechatpay: transfer: scene-id: 1005 - scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]' + scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]' diff --git a/src/main/resources/application-glt.yml b/src/main/resources/application-glt.yml index 12ba2fc..4eb942f 100644 --- a/src/main/resources/application-glt.yml +++ b/src/main/resources/application-glt.yml @@ -51,7 +51,6 @@ config: server-url: https://glt-server.websoft.top/api # 业务模块接口 api-url: https://glt-api.websoft.top/api -# api-url: https://glt-dev-api.websoft.top/api upload-path: /www/wwwroot/file.ws # 阿里云OSS云存储 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 0000000..c22fd88 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,69 @@ +# 开发环境配置 + +# 服务器配置 +server: + port: 9200 + +# 数据源配置 +spring: + datasource: + url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + username: modules + password: tYmmMGh5wpwXR3ae + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + + redis: + database: 0 + host: localhost + port: 6379 + +# 日志配置 +logging: + level: + com.gxwebsoft: DEBUG + com.baomidou.mybatisplus: DEBUG + +socketio: + host: localhost #IP地址 + +# MQTT配置 +mqtt: + enabled: false # 添加开关来禁用MQTT服务 + host: tcp://132.232.214.96:1883 + username: swdev + password: Sw20250523 + client-id-prefix: hjm_car_ + topic: /SW_GPS/# + qos: 2 + connection-timeout: 10 + keep-alive-interval: 20 + auto-reconnect: true + +# 框架配置 +config: + # 开发环境接口 + server-url: https://glt-server.websoft.top/api + upload-path: /Users/gxwebsoft/Documents/uploads/ # window(D:\Temp) + +# 开发环境证书配置 +certificate: + load-mode: CLASSPATH # 开发环境从classpath加载 + wechat-pay: + dev: + private-key-file: "apiclient_key.pem" + apiclient-cert-file: "apiclient_cert.pem" + wechatpay-cert-file: "wechatpay_cert.pem" + +# 阿里云翻译配置 +aliyun: + translate: + access-key-id: LTAI5tEsyhW4GCKbds1qsopg + access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO + endpoint: mt.cn-hangzhou.aliyuncs.com + +# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致） +wechatpay: + transfer: + scene-id: 1005 + scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]' diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 0f4eb72..4eb942f 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -32,7 +32,7 @@ socketio: # MQTT配置 mqtt: - enabled: true # 启用MQTT服务 + enabled: false # 启用MQTT服务 host: tcp://132.232.214.96:1883 username: swdev password: Sw20250523 @@ -48,7 +48,9 @@ config: # 文件服务器 file-server: https://file-s209.shoplnk.cn # 生产环境接口 - server-url: https://server.websoft.top/api + server-url: https://glt-server.websoft.top/api + # 业务模块接口 + api-url: https://glt-api.websoft.top/api upload-path: /www/wwwroot/file.ws # 阿里云OSS云存储 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 703b485..910449c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,8 +4,8 @@ server: # 多环境配置 spring: profiles: - active: dev -# active: glt + active: local +# active: dev # active: prod application: