Browse Source

驱动配置修改

hyq 6 years ago
parent
commit
ec38f85b94

+ 2 - 1
README.MD

@@ -1 +1,2 @@
-# 对接企业海关支付单证项目
+# 对接企业海关支付单证项目
+gradle clean buildDependents

+ 2 - 0
build.gradle

@@ -33,6 +33,7 @@ war {
 
 
 ext {
+    mysql_connector = '5.1.21'
 
     mybatis_spring_boot = '1.3.1'
     mybatis_typehandlers_jsr310 = '1.0.2'
@@ -78,6 +79,7 @@ dependencies {
     // Mybatis 支持 Java 1.8 的 LocalDateTime 特性, 需要引入如下包(Mybatis版本要求3.4.0以上)
     compile("org.mybatis:mybatis-typehandlers-jsr310:${mybatis_typehandlers_jsr310}")
 
+    compile("mysql:mysql-connector-java:${mysql_connector}")
 
     // Mariadb jdbc
     compile('org.mariadb.jdbc:mariadb-java-client')

+ 13 - 17
src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@
 # 测试环境服务配置
 server:
     address: 192.168.1.68
-    port: 8080
+    port: 9999
 
 
 # 使用环境
@@ -29,10 +29,10 @@ spring:
         primary:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
-            driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://120.76.84.45:3306/cuspay?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: tuser
-            password: Qq!123
+            driver-class-name: com.mysql.jdbc.Driver
+            url: jdbc:mysql://192.168.1.251:3306/cuspay?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            username: ceshi
+            password: abc-123
             # hikari连接池配置
             hikari:
                 connection-timeout: 10000
@@ -48,30 +48,26 @@ redis:
     jedis-cluster:
         # Redis Cluster 主机列表
         redis-cluster-host-list:
-            - host: 192.168.1.248
+            - host: 120.76.84.45
               port: 7000
-            - host: 192.168.1.248
+            - host: 120.76.84.45
               port: 7001
-            - host: 192.168.1.248
+            - host: 120.76.84.45
               port: 7002
-            - host: 192.168.1.249
+            - host: 120.76.26.84
               port: 7003
-            - host: 192.168.1.249
+            - host: 120.76.26.84
               port: 7004
-            - host: 192.168.1.249
+            - host: 120.76.26.84
               port: 7005
+        password: Abc-123#*.-
+
         # 连接超时时间(秒), 默认 2*1000
         connection-timeout: 5000
-        # so-timeout:
-        # 最大重试次数
         max-attempts: 5
-        # password:
         pool-config:
-            # 连接池管理的对象实例最大数, 默认 8
             max-total: 8
-            # 连接池中最大闲置连接数, 默认 8
             max-idle: 8
-            # 连接池中最小闲置连接数, 默认 0
             min-idle: 0
 
 

+ 1 - 1
src/main/resources/application-test.yml

@@ -29,7 +29,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://192.168.1.251:3306/cuspay?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: tuser
             password: Qq!123

+ 9 - 9
src/main/resources/application.yml

@@ -20,7 +20,7 @@ ds:
 # 使用环境
 spring:
     profiles:
-        active: dev
+        active:
 
     # 使用CGLIB实现AOP
     aop:
@@ -32,10 +32,10 @@ spring:
         primary:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
-            driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/cuspay?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+            driver-class-name: com.mysql.jdbc.Driver
+            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/cuspay?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
             username: qh_cus
-            password: #nbJVH*W7p
+            password: Ci*&k89Cf
             # hikari连接池配置
             hikari:
                 connection-timeout: 10000
@@ -56,11 +56,11 @@ redis:
               port: 7001
             - host: 120.76.84.45
               port: 7002
-            - host: 120.76.26.84
+            - host: 120.76.84.45
               port: 7003
-            - host: 120.76.26.84
+            - host: 120.76.84.45
               port: 7004
-            - host: 120.76.26.84
+            - host: 120.76.84.45
               port: 7005
         password: Abc-123#*.-
 
@@ -81,7 +81,7 @@ mybatis:
         mapper-locations: classpath:mybatis/mapper/**/*.xml
         type-aliases-package: com.emato.cuspay
 
-wx: 
+wx:
     payment:
         declare:
             url: https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclareorder
@@ -97,4 +97,4 @@ db:
         #定时器报关一次区的数据
         declare:
             limit: 20
-            count: 2
+            count: 2