ソースを参照

修改配制文件,发包

Signed-off-by: tangsong <86121657@qq.com>
tangsong 1 年間 前
コミット
8f299b39da
共有4 個のファイルを変更した33 個の追加49 個の削除を含む
  1. 5 6
      quality-client/pom.xml
  2. 5 0
      quality-server/pom.xml
  3. 22 42
      quality-server/src/main/resources/bootstrap.yml_slow
  4. 1 1
      quality-server/src/main/resources/bootstrap.yml

+ 5 - 6
quality-client/pom.xml

@@ -29,12 +29,11 @@
29
             <groupId>com.unis.quality</groupId>
29
             <groupId>com.unis.quality</groupId>
30
             <version>1.0</version>
30
             <version>1.0</version>
31
         </dependency>
31
         </dependency>
32
-<!--        <dependency>-->
33
-<!--            <groupId>com.unis.base</groupId>-->
34
-<!--            <artifactId>base-common</artifactId>-->
35
-<!--            <version>0.0.2</version>-->
36
-<!--            <scope>compile</scope>-->
37
-<!--        </dependency>-->
32
+        <dependency>
33
+            <groupId>com.unis.base</groupId>
34
+            <artifactId>base-common</artifactId>
35
+            <version>0.0.2</version>
36
+        </dependency>
38
     </dependencies>
37
     </dependencies>
39
     <build>
38
     <build>
40
         <finalName>quality-client</finalName>
39
         <finalName>quality-client</finalName>

+ 5 - 0
quality-server/pom.xml

@@ -101,6 +101,11 @@
101
             <artifactId>druid</artifactId>
101
             <artifactId>druid</artifactId>
102
             <version>1.0.28</version>
102
             <version>1.0.28</version>
103
         </dependency>
103
         </dependency>
104
+        <dependency>
105
+            <groupId>mysql</groupId>
106
+            <artifactId>mysql-connector-java</artifactId>
107
+            <version>8.0.18</version>
108
+        </dependency>
104
         <!-- gbase end-->
109
         <!-- gbase end-->
105
         <dependency>
110
         <dependency>
106
             <groupId>com.unis.base</groupId>
111
             <groupId>com.unis.base</groupId>

+ 22 - 42
quality-server/src/main/resources/bootstrap.yml_slow

@@ -3,30 +3,24 @@ server:
3
 spring:
3
 spring:
4
   jpa:
4
   jpa:
5
     open-in-view: true
5
     open-in-view: true
6
-    database: informix
6
+    database: mysql
7
     show-sql: true
7
     show-sql: true
8
     properties:
8
     properties:
9
       hibernate:
9
       hibernate:
10
-        dialect: org.hibernate.dialect.Informix8sDialect
11
-    hibernate:
12
-      ddl-auto: update
13
-  data:
14
-    jpa:
15
-      repositories:
16
-        enabled: true
10
+        dialect: org.hibernate.dialect.MySQLDialect
17
   application:
11
   application:
18
-    name: quality-server-lph
12
+    name: quality-server
19
   devtools:
13
   devtools:
20
     restart:
14
     restart:
21
       enabled: false
15
       enabled: false
22
   datasource:
16
   datasource:
23
     type: com.alibaba.druid.pool.DruidDataSource
17
     type: com.alibaba.druid.pool.DruidDataSource
24
-    url: jdbc:gbasedbt-sqli://172.16.0.68:9089/quality:INFORMIXSERVER=ol_gbasedbt1210;DB_LOCALE=zh_cn.GB18030-2000;CLIENT_LOCALE=zh_cn.utf8;NEWCODESET=UTF8,zh_cn.UTF8,57372;;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
25
-    username: gbasedbt
26
-    password: cDbK2S0go8
27
-    driver-class-name: com.gbasedbt.jdbc.IfxDriver
18
+    url: jdbc:mysql://101.36.160.140:10311/quality?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
19
+    username: root
20
+    password: admin@1234
21
+    driver-class-name: com.mysql.cj.jdbc.Driver
28
     druid:
22
     druid:
29
-      #db-type: gbase8s
23
+#db-type: mysql
30
       initial-size: 5
24
       initial-size: 5
31
       max-active: 30
25
       max-active: 30
32
       min-idle: 5
26
       min-idle: 5
@@ -54,45 +48,31 @@ spring:
54
         reset-enable: true
48
         reset-enable: true
55
         login-username: druid
49
         login-username: druid
56
         login-password: druid
50
         login-password: druid
57
-      #配置中心配置
58
-      #  cloud:
59
-      #    config:
60
-      #      #使用discovery 时需要将eureka 写到该文件中,开发环境使用该方式,推荐使用。
61
-      #      discovery:
62
-      #        enabled: true
63
-      #        service-id: config
64
-      #      name: initdata,gbase8s-quality
65
-      #      #name: initdata,oracle-quality
66
-      #      profile: dev
67
-      #      username: configuser
68
-      #      password: configpasd
69
-      #      retry:
70
-      #        max-attempts: 5
71
-      #        max-interval: 2000
72
       #如果出现错误立刻停止服务。
51
       #如果出现错误立刻停止服务。
73
       #fail-fast: true
52
       #fail-fast: true
53
+mybatis:
54
+  configuration:
55
+    map-underscore-to-camel-case: true
56
+  type-aliases-package: com.unis.quality.server.entity
57
+  mapper-locations:
58
+    - classpath:mybatis/mapper/*.xml
74
 #服务注册配置
59
 #服务注册配置
75
 eureka:
60
 eureka:
76
   client:
61
   client:
77
     service-url:
62
     service-url:
78
-      defaultZone: http://eureka-server:11000/eureka/
79
-      # defaultZone: http://192.168.123.15:11000/eureka/
63
+#      defaultZone: http://eureka-server:11000/eureka/
64
+      defaultZone: http://172.16.0.4:11000/eureka/
80
   instance:
65
   instance:
81
     prefer-ip-address: true
66
     prefer-ip-address: true
82
     status-page-url-path: /swagger-ui.html
67
     status-page-url-path: /swagger-ui.html
83
-mybatis:
84
-  configuration:
85
-    map-underscore-to-camel-case: true
86
-  type-aliases-package: com.unis.quality.server.entity
87
-  mapper-locations:
88
-    - classpath:mybatis/mapper/*.xml
89
 #日志配置
68
 #日志配置
90
 logging:
69
 logging:
91
   level:
70
   level:
92
-    com.unis: debug
71
+    com.unis.quality.server.dao: DEBUG
93
     root: warn
72
     root: warn
94
-    org.springframework.web: debug
73
+    org.springframework.web: DEBUG
95
     org.hibernate: error
74
     org.hibernate: error
96
-    com.unis.demo.controller: info
97
-    com.unis.quality.server.dao: debug
98
-  path: ./log/
75
+    com.unis.quality.server.controller: info
76
+#  path: ./log/
77
+
78
+zhijianUrl: 111

+ 1 - 1
quality-server/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
1
 spring:
1
 spring:
2
   profiles:
2
   profiles:
3
-    active: test
3
+    active: devmysql
4
   jackson:
4
   jackson:
5
     time-zone: GMT+8
5
     time-zone: GMT+8
6
     date-format: yyyy-MM-dd HH:mm:ss
6
     date-format: yyyy-MM-dd HH:mm:ss