数据库以及新建模块

gw-admin/pom.xml

@@ -16,11 +16,11 @@
     </description>
 
     <dependencies>
-        <!-- 达梦数据库驱动 -->
+        <!-- PostgreSQL/Highgo数据库驱动 -->
         <dependency>
-            <groupId>com.dameng</groupId>
-            <artifactId>DmJdbcDriver18</artifactId>
-            <version>8.1.1.193</version>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.7.3</version>
         </dependency>
         <!-- spring-boot-devtools -->
         <dependency>
@@ -41,6 +41,12 @@
             <artifactId>gw-framework</artifactId>
         </dependency>
 
+        <!-- 水利安监业务模块-->
+        <dependency>
+            <groupId>com.goldenwater</groupId>
+            <artifactId>gw-slaj</artifactId>
+        </dependency>
+
         <!-- 定时任务-->
         <dependency>
             <groupId>com.goldenwater</groupId>

gw-admin/src/main/resources/application-dev.yml

@@ -16,14 +16,13 @@ goldenwater:
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: dm.jdbc.driver.DmDriver
+    driverClassName: org.postgresql.Driver
     druid:
       # 主库数据源
       master:
-        url: jdbc:dm://39.98.38.2:30236/GW_BASIC
-        #url: jdbc:dm://192.168.0.145:30236/WEPL
-        username: GW_BASIC
-        password: Gw./16001
+        url: jdbc:postgresql://192.168.0.149:5866/highgo?currentSchema=slaj&stringtype=unspecified
+        username: highgo
+        password: Gw@141516
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -50,7 +49,7 @@ spring:
       # 配置一个连接在池中最大生存的时间，单位是毫秒
       maxEvictableIdleTimeMillis: 900000
       # 配置检测连接是否有效
-      validationQuery: SELECT 1 FROM DUAL
+      validationQuery: SELECT 1
       testWhileIdle: true
       testOnBorrow: false
       testOnReturn: false

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

@@ -16,14 +16,13 @@ goldenwater:
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: dm.jdbc.driver.DmDriver
+    driverClassName: org.postgresql.Driver
     druid:
       # 主库数据源
       master:
-        url: jdbc:dm://192.168.0.145:30236/GW_BASIC
-        #url: jdbc:dm://192.168.0.145:30236/WEPL
-        username: GW_BASIC
-        password: Gw./16001
+        url: jdbc:postgresql://192.168.0.149:5866/highgo?currentSchema=slaj&stringtype=unspecified
+        username: highgo
+        password: Gw@141516
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -50,7 +49,7 @@ spring:
       # 配置一个连接在池中最大生存的时间，单位是毫秒
       maxEvictableIdleTimeMillis: 900000
       # 配置检测连接是否有效
-      validationQuery: SELECT 1 FROM DUAL
+      validationQuery: SELECT 1
       testWhileIdle: true
       testOnBorrow: false
       testOnReturn: false

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

@@ -59,7 +59,7 @@ mybatis:
 
 # PageHelper分页插件
 pagehelper:
-  helperDialect: dm
+  helperDialect: postgresql
   supportMethodsArguments: true
   params: count=countSql
 

gw-slaj/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.goldenwater</groupId>
+        <artifactId>slaj</artifactId>
+        <version>3.9.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>gw-slaj</artifactId>
+
+    <description>
+        水利安全生产监管业务模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.goldenwater</groupId>
+            <artifactId>gw-common</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

pom.xml

@@ -154,6 +154,13 @@
                 <version>${goldenwater.version}</version>
             </dependency>
 
+            <!-- 水利安监业务模块-->
+            <dependency>
+                <groupId>com.goldenwater</groupId>
+                <artifactId>gw-slaj</artifactId>
+                <version>${goldenwater.version}</version>
+            </dependency>
+
             <!-- 通用工具-->
             <dependency>
                 <groupId>com.goldenwater</groupId>
@@ -167,6 +174,7 @@
         <module>gw-admin</module>
         <module>gw-framework</module>
         <module>gw-system</module>
+        <module>gw-slaj</module>
         <module>gw-quartz</module>
         <module>gw-common</module>
     </modules>