From fc8f305e3dadbaa5269abb6ef08395e8b3421892 Mon Sep 17 00:00:00 2001
From: Harry <501777010@qq.com>
Date: Fri, 23 Oct 2020 16:22:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E8=A1=A5=E5=85=85gitign?=
 =?UTF-8?q?ore=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sop-common/sop-bridge-eureka/.gitignore | 25 +++++++++++++++++++++++++
 sop-common/sop-bridge-nacos/.gitignore  | 25 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 sop-common/sop-bridge-eureka/.gitignore
 create mode 100644 sop-common/sop-bridge-nacos/.gitignore

diff --git a/sop-common/sop-bridge-eureka/.gitignore b/sop-common/sop-bridge-eureka/.gitignore
new file mode 100644
index 00000000..c456c4a3
--- /dev/null
+++ b/sop-common/sop-bridge-eureka/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/sop-common/sop-bridge-nacos/.gitignore b/sop-common/sop-bridge-nacos/.gitignore
new file mode 100644
index 00000000..c456c4a3
--- /dev/null
+++ b/sop-common/sop-bridge-nacos/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/

From 3b1b1845f84bce283497f587cb23dc12ceb22907 Mon Sep 17 00:00:00 2001
From: Harry <501777010@qq.com>
Date: Fri, 23 Oct 2020 16:37:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=B1=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/META-INF/sop-admin.properties          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties b/sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties
index 3920b570..00b51aa0 100644
--- a/sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties
+++ b/sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties
@@ -25,6 +25,10 @@ spring.datasource.url=jdbc:mysql://${mysql.host}/sop?useUnicode=true&characterEn
 spring.datasource.username=${mysql.username}
 spring.datasource.password=${mysql.password}
 
+#连接池
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=500000
+
 # 固定不用改
 mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
 easyopen.show-doc=false