From cb089c9a2c6c2bd3b9042cf7a1ef0b6dc67c673b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 16 十二月 2024 10:24:18 +0800
Subject: [PATCH] #
---
zy-acs-fake/src/main/resources/application.yml | 36 +++++++++++++++++++-----------------
zy-acs-fake/pom.xml | 2 +-
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/zy-acs-fake/pom.xml b/zy-acs-fake/pom.xml
index 38bb6d4..be4e209 100644
--- a/zy-acs-fake/pom.xml
+++ b/zy-acs-fake/pom.xml
@@ -5,7 +5,7 @@
<artifactId>acs-fake</artifactId>
<version>1.0.0</version>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<name>fake</name>
diff --git a/zy-acs-fake/src/main/resources/application.yml b/zy-acs-fake/src/main/resources/application.yml
index 3a76b2c..c67c4e6 100644
--- a/zy-acs-fake/src/main/resources/application.yml
+++ b/zy-acs-fake/src/main/resources/application.yml
@@ -1,6 +1,22 @@
server:
port: 8888
+mysql:
+ ip: 127.0.0.1
+ port: 3306
+ database: zy_rcs1
+ username: root
+ password: xltys1995
+
+redis:
+ host: 127.0.0.1
+ password: xltys1995
+ port: 6379
+ max: 30
+ min: 10
+ timeout: 5000
+ index: 3
+
spring:
application:
name: @pom.artifactId@
@@ -8,11 +24,9 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# url: jdbc:mysql://127.0.0.1:33066/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# url: jdbc:mysql://mysql:3306/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: xltys1995
+ url: jdbc:mysql://${mysql.ip}:${mysql.port}/${mysql.database}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: ${mysql.username}
+ password: ${mysql.password}
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 5
@@ -42,18 +56,6 @@
maxRequestSize: 100MB
jmx:
enabled: false
-
-redis:
- host: 127.0.0.1
- # host: redis
- password: xltys1995
- port: 6379
-# port: 63799
- max: 30
- min: 10
- timeout: 5000
- index: 3
-
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
--
Gitblit v1.9.1