From 546d787fbc0ad1ec2a3fa68969d921ba4b1e0baf Mon Sep 17 00:00:00 2001 From: xierz Date: Sat, 19 Dec 2020 09:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=96=B0=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++++ src/main/resources/application-dev.yml | 21 +++++++++++---------- src/main/resources/application.yml | 3 ++- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 206cda68..a4827fc5 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,10 @@ + + net.mingsoft + ms-mwebsite + net.mingsoft ms-mpeople diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dbb4d390..42b78104 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,16 +1,17 @@ -#spring: -# datasource: -# url: jdbc:mysql://localhost:3306/mcms-5.2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true -# username: root -# password: root -# filters: wall,mergeStat -# type: com.alibaba.druid.pool.DruidDataSource - spring: datasource: - driver-class-name: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@192.168.0.7:1521:helowin + url: jdbc:mysql://192.168.0.8:3316/mcms-dev-5.2-8?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true username: mcms password: mcms filters: wall,mergeStat type: com.alibaba.druid.pool.DruidDataSource + +#spring: +# datasource: +# driver-class-name: oracle.jdbc.driver.OracleDriver +# url: jdbc:oracle:thin:@192.168.0.7:1521:helowin +# username: mcms +# password: mcms +# filters: wall,mergeStat +# type: com.alibaba.druid.pool.DruidDataSource + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6b03f7c4..4488d8b6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,6 +12,8 @@ logging: name: mcms.log #会在项目的根目录下生成对应的mcms.log文件，也可以根据实际情况写绝对路径，例如：d:/mcms.log path: log #会在项目的根目录下生成log目录，里面会生成对应的日期目录，日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件，例如：log/2020-01/app-2020-01-03-18.1.log.gz（表示2020年1月3号下午六点的第一个备份），也可以根据实际情况写绝对路径，例如：d:/log ms: + mwebsite: + tables: cms_category,cms_content,mdiy_dict,mdiy_model,mdiy_page,people,people_address,mpay_log,mpay_pay,wx_mini_app,wx_weixin,role diy: html-dir: html mstore: @@ -92,7 +94,6 @@ spring: mybatis-plus: global-config: db-config: -# column-format: "\"%s\"" id-type: auto configuration: database-id: oracle