77681 пре 11 часа
родитељ
комит
9221a15042

+ 3 - 3
gw-admin/pom.xml

@@ -30,10 +30,10 @@
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         </dependency>
 
-         <!-- Mysql驱动包 -->
+        <!-- 达梦数据库驱动 -->
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
         </dependency>
 
         <!-- 核心模块-->

+ 3 - 3
gw-admin/src/main/resources/application-druid.yml

@@ -16,13 +16,13 @@ goldenwater:
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
+    driverClassName: dm.jdbc.driver.DmDriver
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://39.98.38.2:13306/SLGC?allowMultiQueries=true?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:dm://192.168.0.149:5236/SLGC?allowMultiQueries=true
         username: SLGC
-        password: Gw./16001
+        password: Gw./1601
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

+ 3 - 3
gw-admin/src/main/resources/application-test.yml

@@ -16,13 +16,13 @@ goldenwater:
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
+    driverClassName: dm.jdbc.driver.DmDriver
     druid:
       # 主库数据源
       master:
-        url: jdbc:dm://192.168.0.145:30236/SLGC?allowMultiQueries=true?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:dm://192.168.0.149:5236/SLGC?allowMultiQueries=true
         username: SLGC
-        password: Gw./16001
+        password: Gw./1601
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

+ 3 - 3
gw-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 8080
+  port: 8093
   servlet:
     # 应用的访问路径
     context-path: /
@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
+    active: test
 
 # token配置
 token:
@@ -59,7 +59,7 @@ mybatis:
 
 # PageHelper分页插件
 pagehelper:
-  helperDialect: mysql
+  helperDialect: dm
   supportMethodsArguments: true
   params: count=countSql
 

+ 22 - 1
pom.xml

@@ -31,6 +31,7 @@
         <jwt.version>0.9.1</jwt.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <springdoc.version>3.0.2</springdoc.version>
+        <dameng.version>8.1.3.140</dameng.version>
         <lombok.version>1.18.36</lombok.version>
     </properties>
 
@@ -99,7 +100,12 @@
                 <artifactId>commons-io</artifactId>
                 <version>${commons.io.version}</version>
             </dependency>
-
+            <!-- 达梦数据库驱动 -->
+            <dependency>
+                <groupId>com.dameng</groupId>
+                <artifactId>DmJdbcDriver18</artifactId>
+                <version>${dameng.version}</version>
+            </dependency>
             <!-- excel工具 -->
             <dependency>
                 <groupId>org.apache.poi</groupId>
@@ -171,6 +177,13 @@
                 <version>${goldenwater.version}</version>
             </dependency>
 
+            <!-- 达梦数据库驱动 -->
+            <dependency>
+                <groupId>com.dameng</groupId>
+                <artifactId>DmJdbcDriver18</artifactId>
+                <version>${dameng.version}</version>
+            </dependency>
+
             <!-- 业务模块-->
             <dependency>
                 <groupId>com.goldenwater</groupId>
@@ -221,6 +234,14 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
+        <repository>
+            <id>dameng</id>
+            <name>Dameng Maven Repository</name>
+            <url>https://mvnrepository.com/artifact/com.dameng</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
     </repositories>
 
     <pluginRepositories>