From 0d0da8f9d0aa740d4dc71c48ea611a16efc3d48a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 10 八月 2023 09:33:21 +0800
Subject: [PATCH] 超省2.0
---
driver/guns-admin/src/main/resources/redis.properties | 8 ++++----
driver/guns-admin/src/main/resources/application.yml | 21 ++++++++++++++-------
user/guns-admin/src/main/resources/redis.properties | 8 ++++----
user/guns-admin/src/main/resources/application.yml | 22 +++++++++++++++-------
4 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/driver/guns-admin/src/main/resources/application.yml b/driver/guns-admin/src/main/resources/application.yml
index 4e25aeb..d8e51c0 100644
--- a/driver/guns-admin/src/main/resources/application.yml
+++ b/driver/guns-admin/src/main/resources/application.yml
@@ -13,8 +13,8 @@
application:
name: driver-server
profiles:
-# active: dev
- active: produce
+ active: dev
+# active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -52,11 +52,18 @@
spring:
+# datasource:
+# url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+## password: 123456
+# db-name: guns #用来搜集数据库的所有表
+# filters: wall,mergeStat
+
datasource:
- url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.110.80:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
-# password: 123456
+ password: 123456
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -116,8 +123,8 @@
spring:
data:
mongodb:
- uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
-# uri: mongodb://127.0.0.1:27017/admin
+# uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
+ uri: mongodb://127.0.0.1:27017/admin
---
diff --git a/driver/guns-admin/src/main/resources/redis.properties b/driver/guns-admin/src/main/resources/redis.properties
index 726be87..b51a9f8 100644
--- a/driver/guns-admin/src/main/resources/redis.properties
+++ b/driver/guns-admin/src/main/resources/redis.properties
@@ -5,16 +5,16 @@
# Redis��������ַ
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
-spring.redis.port=16379
+#spring.redis.port=16379
# Redis�������������루Ĭ��Ϊ�գ�
-spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
+#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
## Redis��������ַ
#spring.redis.host=127.0.0.1
## Redis���������Ӷ˿�
-#spring.redis.port=6379
+spring.redis.port=6379
## Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=123456
+spring.redis.password=123456
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024
diff --git a/user/guns-admin/src/main/resources/application.yml b/user/guns-admin/src/main/resources/application.yml
index d813b52..d10c713 100644
--- a/user/guns-admin/src/main/resources/application.yml
+++ b/user/guns-admin/src/main/resources/application.yml
@@ -13,8 +13,8 @@
application:
name: user-server
profiles:
-# active: dev
- active: produce
+ active: dev
+# active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -52,13 +52,21 @@
spring:
+# datasource:
+# url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+## password: 123456
+# db-name: guns #用来搜集数据库的所有表
+# filters: wall,mergeStat
datasource:
- url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.110.80:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
-# password: 123456
+ password: 123456
+ # password: 123456
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
+
#多数据源情况的配置
guns:
@@ -130,8 +138,8 @@
spring:
data:
mongodb:
- uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
-# uri: mongodb://127.0.0.1:27017/admin
+# uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
+ uri: mongodb://127.0.0.1:27017/admin
# mallbook 调起接口参数配置
diff --git a/user/guns-admin/src/main/resources/redis.properties b/user/guns-admin/src/main/resources/redis.properties
index 726be87..b51a9f8 100644
--- a/user/guns-admin/src/main/resources/redis.properties
+++ b/user/guns-admin/src/main/resources/redis.properties
@@ -5,16 +5,16 @@
# Redis��������ַ
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
-spring.redis.port=16379
+#spring.redis.port=16379
# Redis�������������루Ĭ��Ϊ�գ�
-spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
+#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
## Redis��������ַ
#spring.redis.host=127.0.0.1
## Redis���������Ӷ˿�
-#spring.redis.port=6379
+spring.redis.port=6379
## Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=123456
+spring.redis.password=123456
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024
--
Gitblit v1.7.1