From a76880c78045275a2d8b9312ed4c7b9c232e69ed Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 06 五月 2024 16:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/springsecurity/src/main/resources/application.yml | 31 ++-----------------------------
1 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/resources/application.yml b/hangzhoumesParent/common/springsecurity/src/main/resources/application.yml
index 950c0c4..90bf33d 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/resources/application.yml
+++ b/hangzhoumesParent/common/springsecurity/src/main/resources/application.yml
@@ -1,37 +1,10 @@
server:
port: 8089
spring:
- datasource:
- dynamic:
- primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- hangzhoumes:
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- slave_1:
- #閰嶇疆鏁版嵁婧愮被鍨�
- type: com.zaxxer.hikari.HikariDataSource
- #閰嶇疆杩炴帴鏁版嵁搴撶殑淇℃伅
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.153.19.150:1433;databasename=mybatisTest
- username: sa
- password: 'beibo.123/'
- cloud:
- nacos:
- discovery:
- server-addr: 10.153.19.150:8848
+ profiles:
+ active: dev
application:
name: security
- redis:
- database: 0
- host: 10.153.19.150
- port: 6379
- password:
- session:
- store-type: redis
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
configuration:
--
Gitblit v1.8.0