From eb77ff3062946ec316aaead5b3d1df505cb5b24c Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Mon, 12 Oct 2020 19:08:07 +0800
Subject: [PATCH] 20201012_1.0

---
 .../com/ccsens/tall/service/UserService.java  |  1 +
 .../com/ccsens/tall/web/UserController.java   |  1 +
 tall/src/main/resources/application-prod.yml  |  4 +--
 tall/src/main/resources/application.yml       |  4 +--
 .../resources/mapper_dao/TaskDetailDao.xml    |  4 +++
 .../main/java/com/ccsens/util/PoiUtil.java    | 34 ++++++++++++++-----
 6 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java
index 0ef03aa3..540bd4e2 100644
--- a/tall/src/main/java/com/ccsens/tall/service/UserService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java
@@ -1604,6 +1604,7 @@ public class UserService implements IUserService {
         //将两个数的和，存在redis内，key为新生成的id
         String imageCodeKey = WebConstant.IMAGE_CODE + id;
         redisUtil.set(imageCodeKey,codeMap.get("sum"),90);
+        log.info("将图形验证码存入redis：{}",imageCodeKey);
         String imageBase64 = "data:image/png;base64," + ImageCodeGeneratorUtil.generateCodeImage(null, (String) codeMap.get("imageCode"), 200, 70);
 
         UserVo.VerificationCode vertifyCode = new UserVo.VerificationCode();
diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java
index 8b1d24db..9140b103 100644
--- a/tall/src/main/java/com/ccsens/tall/web/UserController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java
@@ -119,6 +119,7 @@ public class UserController {
                                                    @ApiParam @RequestParam String phone,
 //                                                   @ApiParam Integer client,
                                                    @RequestParam(required = true) String verificationCodeId, String verificationCodeValue) throws Exception {
+        log.info("发送验证码，手机号：{}，图形验证码id:{},值：{}",phone,verificationCodeId,verificationCodeValue);
         UserVo.SmsCode smsCodeVo = userService.getSignInSmsCode(phone,verificationCodeId,verificationCodeValue);
 
         return JsonResponse.newInstance().ok(smsCodeVo);
diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml
index a9ba39ef..3dab5f8f 100644
--- a/tall/src/main/resources/application-prod.yml
+++ b/tall/src/main/resources/application-prod.yml
@@ -24,8 +24,8 @@ spring:
         max-idle: 10
         max-wait: -1ms
         min-idle: 0
-#    password: ''
-    password:
+    password: ''
+#    password:
     port: 6379
     timeout: 1000ms
 swagger:
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index c88e995d..4fc2efe4 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: prod
+    include: util-prod,common
diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
index f2a33c9c..9b6bfcfa 100644
--- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
+++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
@@ -246,6 +246,9 @@
         d.virtual as tVirtual,
         d.delay as tDelay,
         d.has_group as tHasGroup,
+        c.web_path as webPath,
+        c.routine_location as routineLocation,
+        c.import_param as importParam,
         sp.name as spName,
         p.id as p_id,
         sp.description as spDescription,
@@ -262,6 +265,7 @@
             p.id IS NULL
         )
         LEFT JOIN t_sys_plugin sp ON sp.id = p.plugin_id
+        left join t_pro_plugin_config c on d.id = c.task_id
         WHERE
         d.rec_status = 0
         and
diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java
index 677fe5f6..d371c0c2 100644
--- a/util/src/main/java/com/ccsens/util/PoiUtil.java
+++ b/util/src/main/java/com/ccsens/util/PoiUtil.java
@@ -551,19 +551,37 @@ public class PoiUtil {
 //        OutputStream stream = new FileOutputStream(new File("D:\\1.xlsx"));
 //        workbook.write(stream);
 //        stream.close();
-        List<List<PoiUtilCell>> list = new ArrayList<>();
+
+
+
+        PoiUtilCell poiUtilCell = new PoiUtilCell();
+        poiUtilCell.setValue("111222333");
+        poiUtilCell.setColspan(3);
+        PoiUtilCell poiUtilCella = new PoiUtilCell();
+        PoiUtilCell poiUtilCellb = new PoiUtilCell();
+        PoiUtilCell poiUtilCell1 = new PoiUtilCell();
+        poiUtilCell1.setValue("aaadddfff");
 
         List<PoiUtilCell> cells = new ArrayList<>();
-        cells.add(new PoiUtilCell("不跨行不跨列"));
+        cells.add(poiUtilCell);
+        cells.add(poiUtilCella);
+        cells.add(poiUtilCellb);
+        cells.add(poiUtilCell1);
+
+        List<List<PoiUtilCell>> list = new ArrayList<>();
         list.add(cells);
 
-        List<PoiUtilCell> cells1 = new ArrayList<>();
-        cells1.add(new PoiUtilCell("两列一行", 2, 1));
-        list.add(cells1);
 
-        List<PoiUtilCell> cells2 = new ArrayList<>();
-        cells2.add(new PoiUtilCell("一列两行", 1, 2));
-        list.add(cells2);
+
+//        list.add(cells);
+//
+//        List<PoiUtilCell> cells1 = new ArrayList<>();
+//        cells1.add(new PoiUtilCell("两列一行", 2, 1));
+//        list.add(cells1);
+//
+//        List<PoiUtilCell> cells2 = new ArrayList<>();
+//        cells2.add(new PoiUtilCell("一列两行", 1, 2));
+//        list.add(cells2);
 //        List<PoiUtilCell> cells3 = new ArrayList<>();
 //        cells3.add(new PoiUtilCell("5"));
 //        cells3.add(new PoiUtilCell("6"));