Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-08-05 b9b6de6fc6cf1d586bd43b2c72b447da03cb01f3

 server/service/src/main/resources/application-pro.yml

@@ -7,10 +7,10 @@
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    #    志邦家选可以用的redis，这个redisU客也在用
    host: 10.200.100.39
    port: 20032
    password: Zbom_2020@123
    timeout: 5000      # 连接池中的最小空闲连接
  jackson:
    time-zone: GMT+8