From 3a38edcb5e9c15a9591e1e913d3583f3d437caf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 十月 2024 10:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch '公司服务器/master'

---
 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
index fba495b..71101bf 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
+++ b/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

--
Gitblit v1.8.0