hr~ 8 stundas atpakaļ
vecāks
revīzija
e4b799376f

+ 11 - 11
order-web/pom.xml

@@ -16,9 +16,6 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mysql-version>8.0.33</mysql-version>
-        <driud-version>1.2.20</driud-version>
-        <guava-version>31.1-jre</guava-version>
     </properties>
 
     <dependencies>
@@ -40,6 +37,11 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
         <!-- Spring Cloud OpenFeign -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -52,18 +54,17 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
-        <!-- MySQL -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-version}</version>
-        </dependency>
+<!--        &lt;!&ndash; MySQL &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>mysql</groupId>-->
+<!--            <artifactId>mysql-connector-java</artifactId>-->
+<!--            <version>${mysql-version}</version>-->
+<!--        </dependency>-->
 
         <!-- Druid 连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${driud-version}</version>
         </dependency>
 
         <dependency>
@@ -74,7 +75,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${guava-version}</version>
         </dependency>
 
         <!-- Knife4j -->

+ 4 - 4
order-web/src/main/resources/application-dev.yml

@@ -1,10 +1,10 @@
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:poyee_order}?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
-    username: ${DB_USERNAME:root}
-    password: ${DB_PASSWORD:root}
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://${DB_HOST:192.168.50.8}:${DB_PORT:5432}/${DB_NAME:b2b_order}?currentSchema=public
+    username: ${DB_USERNAME:postgres}
+    password: ${DB_PASSWORD:123456}
     druid:
       initial-size: ${DB_INITIAL_SIZE:5}
       min-idle: ${DB_MIN_IDLE:5}

+ 4 - 4
order-web/src/main/resources/application-prod.yml

@@ -1,10 +1,10 @@
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${DB_HOST:prod-db-host}:${DB_PORT:3306}/${DB_NAME:poyee_order}?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
-    username: ${DB_USERNAME}
-    password: ${DB_PASSWORD}
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://${DB_HOST:192.168.50.8}:${DB_PORT:5432}/${DB_NAME:b2b_order}?currentSchema=public
+    username: ${DB_USERNAME:postgres}
+    password: ${DB_PASSWORD:123456}
     druid:
       initial-size: ${DB_INITIAL_SIZE:20}
       min-idle: ${DB_MIN_IDLE:20}

+ 3 - 3
order-web/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${DB_HOST:192.168.50.10}:${DB_PORT:3306}/${DB_NAME:b2b_order}?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
-    username: ${DB_USERNAME:b2b_order}
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://${DB_HOST:192.168.50.8}:${DB_PORT:5432}/${DB_NAME:b2b_order}?currentSchema=public
+    username: ${DB_USERNAME:postgres}
     password: ${DB_PASSWORD:123456}
     druid:
       initial-size: ${DB_INITIAL_SIZE:10}

+ 19 - 0
pom.xml

@@ -39,11 +39,24 @@
         <jwt.version>3.3.0</jwt.version>
         <hutoll.version>5.8.11</hutoll.version>
         <mapstruct.lombok-version>0.2.0</mapstruct.lombok-version>
+        <driud.version>1.2.20</driud.version>
+        <postgresql.version>42.7.1</postgresql.version>
+        <guava.version>31.1-jre</guava.version>
     </properties>
 
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${postgresql.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate.validator</groupId>
                 <artifactId>hibernate-validator</artifactId>
@@ -131,6 +144,12 @@
                 <version>${fastjson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid-spring-boot-starter</artifactId>
+                <version>${driud.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-starter</artifactId>