新版仿ok交易所-后端
yml
zyy
2025-10-20 5fb16c2c7e0c65a7b956ab7136a24758f80c8c28
yml

# Conflicts:
# trading-order-admin/src/main/resources/application-prod.yml
# trading-order-admin/src/main/resources/config/system.properties
# trading-order-admin/src/main/resources/redisson/redisson-dev.yml
3 files modified
32 ■■■■■ changed files
trading-order-admin/src/main/resources/application-prod.yml 14 ●●●● patch | view | raw | blame | history
trading-order-admin/src/main/resources/config/system.properties 16 ●●●● patch | view | raw | blame | history
trading-order-admin/src/main/resources/redisson/redisson-dev.yml 2 ●●● patch | view | raw | blame | history
trading-order-admin/src/main/resources/application-prod.yml
@@ -1,11 +1,11 @@
server:
  port: 8225
  port: 8806
spring:
  datasource:
#    url: jdbc:mysql://127.0.0.1:6306/8.4?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&serverTimezone=Europe/Paris&useLegacyDatetimeCode=false
    url: jdbc:mysql://127.0.0.1:6306/trading_order?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&serverTimezone=Europe/Paris&useLegacyDatetimeCode=false
    username: root
    password: a0bded46a7dc91b9
#    url: jdbc:mysql://127.0.0.1:6306/8.4?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false
    url: jdbc:mysql://127.0.0.1:6306/trad_order_1015?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false
    username: trad_order_1015
    password: fin6GDm2MhsFyRmm
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.zaxxer.hikari.HikariDataSource
    hikari:
@@ -21,9 +21,9 @@
    properties:
      hibernate:
        jdbc:
          time_zone: Europe/Paris
          time_zone: Asia/Shanghai
  jackson:
    time-zone: Europe/Paris
    time-zone: Asia/Shanghai
    cache:
      type: redis
      redis:
trading-order-admin/src/main/resources/config/system.properties
@@ -3,12 +3,20 @@
admin_url=https://127.0.0.1:8080/admin
web_url=http://127.0.0.1:8080/wap/
images_http=https://sysimg.yanshiz.com/
api_http=https://sysapi.yanshiz.com/
images_http=https://frimg.yanshiz.com/
loca.images.dir=/www/wwwroot/1015/img
admin_rest_url=https://enjdhdg.site/api
loca.images.dir=/www/wwwroot/img
api_http=https://frapi.yanshiz.com/
email.host=smtp.gmail.com
email.username=coinzne.com@gmail.com
email.password=pqupwyxoqedhxlfq
email.from= smtp.gmail.com
admin_rest_url=https://enjdhdg.site/api
#email.host=smtp.gmail.com
#email.username=metaequityex@gmail.com
#email.password=liswicmnqdnmfxjs
#email.from=smtp.gmail.com
trading-order-admin/src/main/resources/redisson/redisson-dev.yml
@@ -1,7 +1,7 @@
# 单节点设置
singleServerConfig:
  address: redis://127.0.0.1:6380
  database: 6
  database: 1
  password:
  idleConnectionTimeout: 10000
  connectTimeout: 10000