Selaa lähdekoodia

mysql改为pg

hr~ 8 tuntia sitten
vanhempi
commit
aeee694896

+ 24 - 0
pom.xml

@@ -36,22 +36,46 @@
         <redisson.version>3.17.6</redisson.version>
         <lombok.version>1.18.30</lombok.version>
         <fastjson.version>1.2.83</fastjson.version>
+        <driud.version>1.2.20</driud.version>
+        <guava.version>31.1-jre</guava.version>
         <mapstruct.version>1.4.2.Final</mapstruct.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <jwt-version>3.3.0</jwt-version>
         <mapstruct.version>1.4.2.Final</mapstruct.version>
         <hutoll-version>5.8.11</hutoll-version>
         <qcloud.version>5.6.257</qcloud.version>
+        <postgresql.version>42.7.1</postgresql.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid-spring-boot-starter</artifactId>
+                <version>${driud.version}</version>
+            </dependency>
+
+            <!-- Guava -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
+            <!-- PostgreSQL -->
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${postgresql.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.qcloud</groupId>
                 <artifactId>cos_api</artifactId>
                 <version>${qcloud.version}</version>
             </dependency>
 
+
             <dependency>
                 <groupId>org.mapstruct</groupId>
                 <artifactId>mapstruct</artifactId>

+ 3 - 11
product-web/pom.xml

@@ -15,11 +15,6 @@
     <description>商品服务 Web 启动模块</description>
     <packaging>jar</packaging>
 
-    <properties>
-        <mysql-version>8.0.33</mysql-version>
-        <driud-version>1.2.20</driud-version>
-        <guava-version>31.1-jre</guava-version>
-    </properties>
     <dependencies>
         <!-- 内部模块 -->
         <dependency>
@@ -56,25 +51,22 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
-        <!-- MySQL -->
+        <!-- PostgreSQL -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-version}</version>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
         </dependency>
 
         <!-- Druid 连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${driud-version}</version>
         </dependency>
 
         <!-- Guava -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${guava-version}</version>
         </dependency>
 
         <!-- Knife4j -->

+ 3 - 1
product-web/src/main/java/com/poyee/facade/impl/ProductInfoFacade.java

@@ -238,7 +238,9 @@ public class ProductInfoFacade implements IProductInfoFacade {
             existingFastSale.setSaleTime(saleTimeUtc);
             existingFastSale.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString(ProductConstant.SUB) : null);
             existingFastSale.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
-            return this.productFastSaleService.updateById(existingFastSale);
+            this.productFastSaleService.updateById(existingFastSale);
+            productInfo.setFastSaleFlag(StatusEnum.TRUE.getCode());
+            return this.productInfoService.updateById(productInfo);
         }
     }
 

+ 4 - 4
product-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_product}?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_product}?currentSchema=public
+    username: ${DB_USERNAME:postgres}
+    password: ${DB_PASSWORD:123456}
     druid:
       initial-size: ${DB_INITIAL_SIZE:5}
       min-idle: ${DB_MIN_IDLE:5}

+ 13 - 20
product-web/src/main/resources/application-prod.yml

@@ -1,19 +1,15 @@
 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_product}?currentSchema=public
+    username: ${DB_USERNAME:postgres}
+    password: ${DB_PASSWORD:123456}
     druid:
-      initial-size: ${DB_INITIAL_SIZE:20}
-      min-idle: ${DB_MIN_IDLE:20}
-      max-active: ${DB_MAX_ACTIVE:100}
-      max-wait: ${DB_MAX_WAIT:30000}
-      validation-query: ${DB_VALIDATION_QUERY:SELECT 1}
-      test-on-borrow: ${DB_TEST_ON_BORROW:true}
-      test-while-idle: ${DB_TEST_WHILE_IDLE:true}
-      time-between-eviction-runs-millis: ${DB_EVICTION_INTERVAL:60000}
+      initial-size: ${DB_INITIAL_SIZE:5}
+      min-idle: ${DB_MIN_IDLE:5}
+      max-active: ${DB_MAX_ACTIVE:20}
+      max-wait: ${DB_MAX_WAIT:60000}
   redis:
     database: ${REDIS_DATABASE:1}
     password: ${REDIS_PASSWORD:Pass2010}
@@ -24,23 +20,20 @@ spring:
       max-wait: -1ms    # 连接池最大阻塞等待时间(使用负值表示没有限制)
       max-idle: 10      # 连接池中的最大空闲连接
       min-idle: 5       # 连接池中的最小空闲连接
-swagger:
-  enabled: ${SWAGGER_ENABLED:false}
 
 management:
   endpoints:
     web:
       exposure:
-        include: health,info
+        include: health,info,metrics
   endpoint:
     health:
-      show-details: never
+      show-details: always
 
 logging:
   level:
-    com.poyee: warn
-    com.baomidou.mybatisplus: warn
-
+    com.poyee: debug
+    com.baomidou.mybatisplus: debug
 feign:
   client:
     checklist:
@@ -48,4 +41,4 @@ feign:
     order:
       url: ${ORDER_URL:http://localhost:8081}
     dict:
-      url: ${DICT_URL:http://localhost:8082}
+      url: ${DICT_URL:http://localhost:10012}

+ 10 - 10
product-web/src/main/resources/application-test.yml

@@ -1,14 +1,14 @@
 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_product}?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_product}?currentSchema=public
+    username: ${DB_USERNAME:postgres}
     password: ${DB_PASSWORD:123456}
     druid:
-      initial-size: ${DB_INITIAL_SIZE:10}
-      min-idle: ${DB_MIN_IDLE:10}
-      max-active: ${DB_MAX_ACTIVE:50}
+      initial-size: ${DB_INITIAL_SIZE:5}
+      min-idle: ${DB_MIN_IDLE:5}
+      max-active: ${DB_MAX_ACTIVE:20}
       max-wait: ${DB_MAX_WAIT:60000}
   redis:
     database: ${REDIS_DATABASE:1}
@@ -28,12 +28,12 @@ management:
         include: health,info,metrics
   endpoint:
     health:
-      show-details: when_authorized
+      show-details: always
 
 logging:
   level:
-    com.poyee: info
-
+    com.poyee: debug
+    com.baomidou.mybatisplus: debug
 feign:
   client:
     checklist:
@@ -41,4 +41,4 @@ feign:
     order:
       url: ${ORDER_URL:http://localhost:8081}
     dict:
-      url: ${DICT_URL:http://localhost:8082}
+      url: ${DICT_URL:http://localhost:10012}