From 3a4880c44598110a7ff85d3a3e8d30b4c12cada4 Mon Sep 17 00:00:00 2001 From: xierz Date: Tue, 22 Dec 2020 10:07:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++---- src/main/resources/application-dev.yml | 21 ++++++++++----------- src/main/resources/application.yml | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 4c82b5cb..69bbc1a7 100644 --- a/pom.xml +++ b/pom.xml @@ -34,10 +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 42b78104..68652aa7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,17 +1,16 @@ +#spring: +# datasource: +# 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_dev_1 +# password: mcms +# filters: wall,mergeStat +# type: com.alibaba.druid.pool.DruidDataSource spring: datasource: - 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 + driver-class-name: oracle.jdbc.driver.OracleDriver + url: jdbc:oracle:thin:@192.168.0.7:1521:helowin + username: mcms_dev_1 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 523b0d58..4488d8b6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -96,6 +96,6 @@ mybatis-plus: db-config: id-type: auto configuration: - database-id: mysql + database-id: oracle cache-enabled: true jdbc-type-for-null: 'null' #注意：单引号