1
0
hyq 6 роки тому
батько
коміт
c976fb54e0
2 змінених файлів з 8 додано та 6 видалено
  1. 4 1
      build.gradle
  2. 4 5
      src/main/resources/application.yml

+ 4 - 1
build.gradle

@@ -81,7 +81,10 @@ dependencies {
 
 
     // Mariadb jdbc
-    compile('org.mariadb.jdbc:mariadb-java-client')
+    compile('org.mariadb.jdbc:mariadb-java-client:2.4.0')
+    /*runtime('mysql:mysql-connector-java')*/
+    compile('com.microsoft.sqlserver:mssql-jdbc')
+    compile('mysql:mysql-connector-java:5.1.21')
     // HikariCP
     compile('com.zaxxer:HikariCP')
 

+ 4 - 5
src/main/resources/application.yml

@@ -32,7 +32,7 @@ spring:
         primary:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
-            driver-class-name: org.mariadb.jdbc.Driver
+            driver-class-name: com.mysql.jdbc.Driver
             url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: ccnet_wx
             password: b$bFB*86yy
@@ -47,7 +47,7 @@ spring:
         middle:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
-            driver-class-name: org.mariadb.jdbc.Driver
+            driver-class-name: com.mysql.jdbc.Driver
             url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: kmall_pt
             password: AFnwRBu!3q
@@ -62,7 +62,7 @@ spring:
         three:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
-            driver-class-name: org.mariadb.jdbc.Driver
+            driver-class-name: com.mysql.jdbc.Driver
             url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
             username: out_qhm
             password: r%4PEusOn&
@@ -100,7 +100,7 @@ redis:
               port: 7004
             - host: 120.76.26.84
               port: 7005
-#        password: Abc-123#*.-
+        password: Abc-123#*.-
         # 连接超时时间(秒), 默认 2*1000
         connection-timeout: 5000
         # so-timeout:
@@ -162,7 +162,6 @@ merchant:
     #商户海关备案名称
     merchant-customs-name: 中网科技(深圳)有限公司
 
-
 # 海关业务信息
 cus:
     message: