Merge remote-tracking branch '公司服务器/master'

ZengTao

2024-10-16 3a38edcb5e9c15a9591e1e913d3583f3d437caf1

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml

@@ -12,8 +12,8 @@
        salve_hangzhoumes:
          url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
          username: sa
            password: beibo.123/
            driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        pp:
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          username: root
@@ -29,7 +29,7 @@
      discovery:
        server-addr: 10.153.19.150:8848
  application:
        name: temperingGlass
    name: temperingGlass
  redis:
    database: 0
    host: 10.153.19.150