gaodd 1 year ago
parent
commit
3c8307d649

+ 5 - 1
county-cbl-server/pom.xml

@@ -125,7 +125,11 @@
125 125
             <artifactId>druid</artifactId>
126 126
             <version>1.0.28</version>
127 127
         </dependency>
128
-
128
+		<dependency>
129
+            <groupId>mysql</groupId>
130
+            <artifactId>mysql-connector-java</artifactId>
131
+            <version>8.0.18</version>
132
+        </dependency>
129 133
 
130 134
         <!--<dependency>
131 135
             <groupId>com.alibaba</groupId>

+ 1 - 1
county-cbl-server/src/main/java/com/unis/cbl/server/controller/transferbarn/TransferBarnRecordController.java

@@ -1,6 +1,6 @@
1 1
 package com.unis.cbl.server.controller.transferbarn;
2 2
 
3
-import com.unis.cbl.common.constant.ErrorMessageConstant;;
3
+import com.unis.cbl.common.constant.ErrorMessageConstant;
4 4
 import com.unis.cbl.server.service.TransferBarnService;
5 5
 import com.unis.common.utils.ResponseWrapper;
6 6
 import io.swagger.annotations.Api;

+ 13 - 25
county-cbl-server/src/main/resources/bootstrap-dev.yml

@@ -6,24 +6,24 @@ server:
6 6
 spring:
7 7
   jpa:
8 8
     open-in-view: true
9
-    database: informix
10
-    show-sql: false
9
+    database: mysql
10
+    show-sql: true
11 11
     properties:
12 12
       hibernate:
13
-        dialect: org.hibernate.dialect.Informix8sDialect
13
+        dialect: org.hibernate.dialect.MySQLDialect
14 14
   application:
15
-    name: county-cbl-service-${user.name}
15
+    name: county-cbl-service
16 16
   devtools:
17 17
     restart:
18 18
       enabled: false
19 19
   datasource:
20 20
     type: com.alibaba.druid.pool.DruidDataSource
21
-    url: jdbc:gbasedbt-sqli://101.36.160.140:19089/db_utf8:INFORMIXSERVER=gbaseserver;DB_LOCALE=zh_cn.GB18030-2000;CLIENT_LOCALE=zh_cn.utf8;NEWCODESET=GB18030,GB18030-2000,5488;;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
22
-    username: gbasedbt
23
-    password: cDbK2S0go8
24
-    driver-class-name: com.gbasedbt.jdbc.IfxDriver
21
+    url: jdbc:mysql://101.36.160.140:10311/db_utf8?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
22
+    username: root
23
+    password: admin@1234
24
+    driver-class-name: com.mysql.cj.jdbc.Driver
25 25
     druid:
26
-#db-type: gbase8s
26
+#db-type: mysql
27 27
       initial-size: 5
28 28
       max-active: 30
29 29
       min-idle: 5
@@ -51,24 +51,12 @@ spring:
51 51
         reset-enable: true
52 52
         login-username: druid
53 53
         login-password: druid
54
-
55
-  #配置中心配置
56
-  cloud:
57
-    config:
58
-      #使用discovery 时需要将eureka 写到该文件中,开发环境使用该方式,推荐使用。
59
-      discovery:
60
-        enabled: true
61
-        service-id: config
62
-      name: initdata,feign,redis,mq-producer-log,backlog-mq
63
-      profile: dev
64
-      username: configuser
65
-      password: configpasd
66
-      retry:
67
-        max-attempts: 5
68
-        max-interval: 2000
69 54
       #如果出现错误立刻停止服务。
70 55
       #fail-fast: true
71 56
 
57
+
58
+  
59
+
72 60
 #  #配置中心配置
73 61
 #  cloud:
74 62
 #    config:
@@ -90,7 +78,7 @@ spring:
90 78
 eureka:
91 79
   client:
92 80
     service-url:
93
-      defaultZone: http://172.16.0.73:11000/eureka/
81
+      defaultZone: http://172.16.0.4:11000/eureka/
94 82
     eureka-server-connect-timeout-seconds: 20
95 83
   instance:
96 84
     prefer-ip-address: true

+ 1 - 1
county-cbl-server/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
1 1
 spring:
2 2
   profiles:
3
-    active: test
3
+    active: dev
4 4
 off-line:
5 5
   org:
6 6
     all-data: LS001,LS001019,LS001021