From 614ebe7d73108484efe9b11c81159a91bbff7c7a Mon Sep 17 00:00:00 2001 From: HuangXin Date: Tue, 15 Sep 2020 14:40:01 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=A2=9E=E5=8A=A0.gitignore?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + config/application-local.properties | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 00ab9cab..f03989fa 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ basedir/ /.idea/ /phoenix_ddos_handle.iml /src/main/resources/git.properties +/.run/ diff --git a/config/application-local.properties b/config/application-local.properties index eeee4747..6277326d 100644 --- a/config/application-local.properties +++ b/config/application-local.properties @@ -4,16 +4,16 @@ server.tomcat.basedir=./basedir # 多个项目放在nginx下同个端口，通过该配置区分 server.servlet.context-path=/dispose # 配置数据源 -#spring.datasource.url=jdbc:mysql://10.88.77.65:33061/dispose_hx?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ -# =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true -#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.username=root -#spring.datasource.password=h0K0_8u - -spring.datasource.url=jdbc:mysql://172.28.72.118:33061/dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true +spring.datasource.url=jdbc:mysql://10.88.77.65:33061/dispose_hx?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ + =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.username=phoenix -spring.datasource.password=Hy@rfph32 +spring.datasource.username=root +spring.datasource.password=h0K0_8u + +#spring.datasource.url=jdbc:mysql://172.28.72.118:33061/dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.username=phoenix +#spring.datasource.password=Hy@rfph32 # 配置连接池 spring.datasource.type=org.apache.commons.dbcp2.BasicDataSource