Parcourir la source

上线配置文件

xierz il y a 5 ans
Parent
commit
3a4880c445
3 fichiers modifiés avec 15 ajouts et 16 suppressions
  1. 4 4
      pom.xml
  2. 10 11
      src/main/resources/application-dev.yml
  3. 1 1
      src/main/resources/application.yml

+ 4 - 4
pom.xml

@@ -34,10 +34,10 @@
 		</repository>
 	</repositories>
 	<dependencies>
-		<dependency>
-			<groupId>net.mingsoft</groupId>
-			<artifactId>ms-mwebsite</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>net.mingsoft</groupId>-->
+<!--			<artifactId>ms-mwebsite</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mpeople</artifactId>

+ 10 - 11
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
-    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
+#    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:
+    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
 

+ 1 - 1
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' #注意:单引号