数据同步：修改描述文案

background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserBalanceServiceImpl.java

@@ -36,10 +36,7 @@ import java.io.*;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -195,7 +192,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
                     backgroundUserBalance.setTenantId(item.getTenantId());
                     backgroundUserBalance.setDate(LocalDateTime.now());
                     backgroundUserBalance.setDescriptionType(9);
-                    backgroundUserBalance.setDescription("Files consumed");
+                    backgroundUserBalance.setDescription("Files consumed");  // TODO 枚举值
                     backgroundUserBalance.setChangeType(2);
                     backgroundUserBalance.setRemainingFiles((int) (newestPlanRemainingFiles - item.getPlan()));
                     backgroundUserBalance.setBalanceChange(item.getPlan().intValue());
@@ -223,7 +220,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
             userBalance.setUserId(userService.getUserId(asset.getTenantId()));
             userBalance.setDate(LocalDateTime.now());
             userBalance.setDescriptionType(3);
-            userBalance.setDescription("Free过期资产");
+            userBalance.setDescription("Files consumed"); // TODO 枚举值
             userBalance.setRemainingFiles(newestPlanRemainingFiles - asset.getAsset());
             userBalance.setBalanceChange(asset.getAsset());
             userBalance.setChangeType(3);
@@ -234,7 +231,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
             userBalance.setId(null);
             userBalance.setDate(userBalance.getDate().plusSeconds(1L));
             userBalance.setDescriptionType(3);
-            userBalance.setDescription("Free增加资产");
+            userBalance.setDescription("Free files"); // TODO 枚举值
             userBalance.setRemainingFiles(newestPlanRemainingFiles + freeAsset);
             userBalance.setBalanceChange(freeAsset);
             userBalance.setChangeType(1);

background-user/src/main/java/cn/kdan/compdf/utils/MyLocalDateUtil.java

@@ -1,5 +1,7 @@
 package cn.kdan.compdf.utils;
 
+import cn.hutool.core.util.ObjectUtil;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -21,6 +23,12 @@ public class MyLocalDateUtil {
      * @return 新时间
      */
     public static LocalDateTime timeZoneConversion(LocalDateTime localDateTime,Integer timeZone){
+        if (ObjectUtil.isEmpty(localDateTime)){
+            return null;
+        }
+        if (ObjectUtil.isEmpty(timeZone)){
+            timeZone = 0;
+        }
         return localDateTime.plus(timeZone, ChronoUnit.HOURS);
     }
 

docker-compose.yml

@@ -0,0 +1,37 @@
+version: '2.2'
+services:
+  back-user:
+    restart: always
+    build:
+      context: ./back_user
+      dockerfile: Dockerfile
+    image: back-user:0.2.0
+    container_name: back-user-v0.2
+    ports:
+      - 8890:8890
+    environment:
+      DB_URL: 172.17.0.1:33056/compdfkit_saas_background
+      DB_USERNAME: deployer
+      DB_PASSWORD: deployer@123!
+      NACOS_ADDR: 101.132.103.13:28858
+      NACOS_IP: back-user
+      NACOS_USERNAME: saasTest
+      NACOS_PASSWORD: SaaSTest!ddf@123
+      MQ_HOST: 101.132.103.13
+      MQ_PORT: 35672
+      MQ_USERNAME: admin
+      MQ_PASSWORD: 1qazZAQ!2
+  back-gateway:
+    restart: always
+    build:
+      context: ./back_gateway
+      dockerfile: Dockerfile
+    image: back-gateway:0.2.0
+    container_name: back-gateway-v0.2
+    ports:
+      - 8088:8088
+    environment:
+      NACOS_ADDR: 101.132.103.13:28858
+      NACOS_IP: back-gateway
+      NACOS_USERNAME: saasTest
+      NACOS_PASSWORD: SaaSTest!ddf@123