韦忠喜提交

eladmin-common/src/main/java/me/zhengjie/common/http/ResponseCode.java

@@ -21,6 +21,9 @@ public enum ResponseCode {
     EMPTY_ARGUMENT(1,"请求参数为空"),
     NO_MATCH_ARGUMENT_SET(1,"不能满足要求的参数设置"),
     NO_FILE_INPUT(1,"没有文件输入"),
+
+    /** modeify by wzx
+     */
     NO_WORD_INPUT(1,"短信和url链接不能为空！"),
     NO_FILE_FORMAT(1,"文件格式不对"),
     // 特殊需要进行前端返回说明的参数定义

eladmin-system/src/main/java/me/zhengjie/modules/sms/rest/TbTemplateController.java

@@ -24,6 +24,7 @@ import me.zhengjie.common.http.ResponseCode;
 import me.zhengjie.modules.sms.domain.TbTemplate;
 import me.zhengjie.modules.sms.service.TbTemplateService;
 import me.zhengjie.modules.sms.service.dto.TbTemplateQueryCriteria;
+import me.zhengjie.modules.sms.vo.SendNewVo;
 import me.zhengjie.modules.sms.vo.SendVo;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
@@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import java.io.IOException;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 import java.util.Date;
 import javax.servlet.http.HttpServletResponse;
 
@@ -104,17 +106,19 @@ public class TbTemplateController {
     @ApiOperation("接收短信内容和url")
 //    @PreAuthorize("@el.check('taskRecord:list')")
     @PostMapping(value = "/getSmsInfo")
-    @AnonymousAccess // fixme 需要测试完成后进行去除和使用上面的权限注解
-    public ResponseEntity<Object> getSmsInfo(@RequestBody SendVo sendVo){
+   // @AnonymousAccess // fixme 需要测试完成后进行去除和使用上面的权限注解
+    public ResponseEntity<Object> getSmsInfo(@RequestBody SendNewVo sendVo){
         log.info("========== [TbTemplateController|getSmsInfo  ========== SmsContent："+sendVo.getSmsContent()+"  LinkUrl:"+sendVo.getLinkUrl());
+        if (sendVo == null){
+            return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.EMPTY_ARGUMENT), HttpStatus.OK);
+        }
         if (sendVo.getSmsContent() != null && sendVo.getLinkUrl() != null){
             TbTemplate tbTemplate = new TbTemplate();
             tbTemplate.setLinkUrl(sendVo.getLinkUrl());
             tbTemplate.setTaskName(sendVo.getTaskName());
             tbTemplate.setSendMessage(sendVo.getSmsContent());
             tbTemplate.setReviewer(sendVo.getOperator());
-            Date date = new Date();
-            Timestamp nousedate = new Timestamp(date.getTime());
+            Timestamp nousedate = new Timestamp(System.currentTimeMillis());
             tbTemplate.setLastUpdateTime(nousedate);
             tbTemplate.setGmtModified(nousedate);
             tbTemplate.setGmtCreate(nousedate);

eladmin-system/src/main/java/me/zhengjie/modules/sms/vo/SendNewVo.java

@@ -0,0 +1,21 @@
+package me.zhengjie.modules.sms.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SendNewVo {
+    @ApiModelProperty("发送链接")
+    private String linkUrl;
+    @ApiModelProperty("模板id")
+    private String sendMessage;
+
+    @ApiModelProperty("短信内容")
+    private String smsContent;
+
+    @ApiModelProperty("任务名称")
+    private String taskName;
+
+    @ApiModelProperty("审核人")
+    private String operator;
+}

eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/rest/TbUploadFileNewController.java

@@ -22,6 +22,7 @@ import me.zhengjie.annotation.AnonymousAccess;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.common.http.CommonResponse;
 import me.zhengjie.common.http.ResponseCode;
+import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.security.security.TokenFilter;
 import me.zhengjie.modules.upload.service.dto.UploadFileDto;
 import me.zhengjie.modules.upload.service.dto.UploadFileQueryCriteria;
@@ -196,22 +197,5 @@ public class TbUploadFileNewController {
         return new ResponseEntity<>(CommonResponse.createBySuccess(ResponseCode.SUCCESS), HttpStatus.OK);
     }
 
-    @PostMapping("/aa")
-    @Log("查询文件上传接口")
-    @ApiOperation("查询文件上传接口")
-    @AnonymousAccess
-    public ResponseEntity<Object> aa(){
-        redisTemplate.opsForValue().set("key111", "value11");
-        Object key111 = redisTemplate.opsForValue().get("key111");
-        System.out.println("key111 = " + key111.toString());
-
-        redisTemplate.delete("key111");
-
-        Object aaaa = redisTemplate.opsForValue().get("key111");
-        System.out.println("aaaa = " + aaaa);
-
-        return new ResponseEntity<>(CommonResponse.createBySuccess(ResponseCode.SUCCESS), HttpStatus.OK);
-    }
-
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
 import com.jcraft.jsch.Session;
 import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.upload.domain.UploadFile;
 import me.zhengjie.modules.upload.service.dto.UploadFileDto;
 import me.zhengjie.modules.upload.task.model.ResponseEncryptJsonContent;
@@ -154,11 +155,11 @@ public class SaveToFileNewTask {
                 list = TxtUtils.csvParseListByUrl(filePath);
             }
         }catch (Exception e){
-            e.printStackTrace();
+            log.error("SaveToFileTask|batchSendToEncrypt ready send json is : {}", "");
+            throw new BadRequestException("解析文件异常");
         }
         if (CollectionUtil.isNotEmpty(list)){
             batchSendToEncrypt(filePath, list);
-
         }
 
         // 加入一个全局控制开关
@@ -222,6 +223,7 @@ public class SaveToFileNewTask {
                                 Thread.sleep(3_0000);
                             } catch (InterruptedException e) {
                                 log.error("SaveToFileTask|batchSendToEncrypt sleep ERROR. message is", e.getMessage(), e);
+                                throw new BadRequestException("请求异常！！！");
                             }
                             log.error("========== [SaveToFileTask|batchSendToEncrypt request fail, response is {} ] ==========", httpResponse.body());
                         }