Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -376,7 +376,7 @@ public class WorkerController {
         //2.插入车辆检查数据
         BeanUtils.copyProperties(workOrder, truckCheckInfo);
         truckCheckInfo.setCreater(userId);
-        truckCheckInfo.setCreaterName(userName);
+        truckCheckInfo.setCreaterName(utf8Name);
         truckCheckInfo.setCreateDate(LocalDateTime.now());
         truckCheckInfoService.save(truckCheckInfo);
 

src/main/java/com/aoyang/tms/service/impl/JxlsExportTestServiceImpl.java

@@ -10,8 +10,8 @@ import com.aoyang.tms.util.JxlsUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
@@ -47,6 +47,8 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
     private TruckRepairInfoService truckRepairInfoService;
     @Resource
     private TruckCheckInfoService truckCheckInfoService;
+    @Value("${domain_url}")
+    private String domainUrl;
 
     @Override
     public WorkLogTplVO getWorkLogTplVO(WorkOrder param) {
@@ -163,9 +165,9 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
             log.info("workLogTplVO is null:{}");
             return null;
         }
-        byte driverOneSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getDriverOneSignUrl());
-        byte driverTwoSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
-        byte escortSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getEscortSignUrl());
+        byte driverOneSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getDriverOneSignUrl());
+        byte driverTwoSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
+        byte escortSignUrl[] = getImageBytes(domainUrl + workLogTplVO.getWorkCycle().getEscortSignUrl());
 
         // 获取模板文件
         String tplfileName = "work_log_tpl.xlsx";

src/main/profiles/dev/bootstrap.yml

@@ -45,4 +45,6 @@ spring:
       password: xqkj@ayzl
 auyen:
   mongo:
-    tms-collection: tms_dev
+    tms-collection: tms_dev
+
+domain_url: https://dwx.auyen.com/

src/main/profiles/local/bootstrap.yml

@@ -64,4 +64,4 @@ combination:
       top: 10.0
 auyen:
   default-org-id: 720211180626919424
-  marketing-org-id: 700214075283881984
+  marketing-org-id: 700214075283881984

src/main/profiles/prod/bootstrap.yml

@@ -42,4 +42,6 @@ spring:
       port: 27017
       database: meter
       username: meter
-      password: xqkj@ayzl
+      password: xqkj@ayzl
+
+domain_url: https://wx.auyen.com/

src/main/profiles/test/bootstrap.yml

@@ -42,4 +42,6 @@ spring:
       port: 27017
       database: meter
       username: meter
-      password: xqkj@ayzl
+      password: xqkj@ayzl
+
+domain_url: https://twx.auyen.com/