部署https服务提交

src/main/java/com/rf/help/security/SSLConfig.java

@@ -16,7 +16,7 @@ import org.springframework.context.annotation.Profile;
  * @description:
  * @date 2021/9/15 14:32
  */
-@Configuration
+//@Configuration
 @Profile({"prod", "public"})
 public class SSLConfig {
 

src/main/java/com/rf/help/task/NotifyTask.java

@@ -45,9 +45,9 @@ public class NotifyTask {
     }
 
     private void handleRecords(List<TaskEntity> taskEntities, String type) throws ParseException {
-        DateFormat df = new SimpleDateFormat("yyyyMMddHHmm");
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //当前时间
-        Date endTime = df.parse(DateUtil.getNowTime("yyyyMMddHHmm"));
+        Date endTime = df.parse(DateUtil.getNowTime("yyyy-MM-dd HH:mm:ss"));
         for (TaskEntity item : taskEntities) {
             if (Constant.MAGIC_NUM_1.equals(type)) {
                 //开始时间

src/main/java/com/rf/help/task/dao/repository/TaskRepository.java

@@ -23,7 +23,7 @@ public interface TaskRepository extends BaseRepository<TaskEntity, String> {
             "and if(?4 is not null and ?4 !='',(accept_user_id = ?4),1=1) " +
             "and if(?5 is not null and ?5 !='',(task_status = ?5),1=1) " +
             "order by create_time desc ",
-            countQuery = "select * from t_task_info where where 1=1 " +
+            countQuery = "select * from t_task_info where 1=1 " +
                     "and if(?1 is not null and ?1 !='',(task_type = ?1),1=1) " +
                     "and if(?2 is not null and ?2 !='',(details like CONCAT('%',?2,'%') or phone like CONCAT('%',?2,'%')),1=1) " +
                     "and if(?3 is not null and ?3 !='',(publish_user_id = ?3),1=1) " +

src/main/java/com/rf/help/task/rest/TaskController.java

@@ -1,37 +1,19 @@
 package com.rf.help.task.rest;
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.Gson;
 import com.rf.help.base.rest.BaseController;
-import com.rf.help.security.SafetyProcess;
 import com.rf.help.task.dao.model.TaskEntity;
 import com.rf.help.task.service.TaskService;
 import com.rf.help.user.dao.model.UserEntity;
 import com.rf.help.user.service.UserService;
-import com.rf.help.utils.Constant;
-import com.rf.help.utils.JWTUtil;
+import com.rf.help.utils.DateUtil;
 import com.rf.help.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -56,12 +38,12 @@ public class TaskController extends BaseController {
     public Result publishTask(@RequestBody String json) {
         TaskEntity taskEntity = JSONObject.parseObject(json, TaskEntity.class);
         if (taskEntity.getId() == null || taskEntity.getId().equals("")) {
-            String nowDate = com.rf.help.utils.DateUtil.getNowTime("yyyy-MM-dd");
+            String nowDate = DateUtil.getNowTime("yyyy-MM-dd");
             List<TaskEntity> taskEntities = this.taskService.findByCreateTimeAndPublishUserId(nowDate,taskEntity.getPublishUserId());
-            int num = 3;//后续会根据用户积分多少改变数值
+            int num = 300;//后续会根据用户积分多少改变数值
             if (taskEntities.size() < num){
-                taskEntity.setCreateTime(DateUtil.now());
-                taskEntity.setUpdateTime(DateUtil.now());
+                taskEntity.setCreateTime(DateUtil.getNowTime());
+                taskEntity.setUpdateTime(DateUtil.getNowTime());
             }else {
                 return fail(null, "今日发布任务已达到上限");
             }
@@ -79,7 +61,7 @@ public class TaskController extends BaseController {
                 this.userService.save(publishUser);
                 this.userService.save(acceptUser);
             }
-            taskEntity.setUpdateTime(DateUtil.now());
+            taskEntity.setUpdateTime(DateUtil.getNowTime());
         }
         taskEntity = this.taskService.save(taskEntity);
         return success(taskEntity);
@@ -94,7 +76,7 @@ public class TaskController extends BaseController {
         }
         String nowDate = com.rf.help.utils.DateUtil.getNowTime("yyyy-MM-dd");
         List<TaskEntity> taskEntities = this.taskService.findByCreateTimeAndAcceptUserId(nowDate,acceptUserId);
-        int num = 3;//后续会根据用户积分多少改变数值
+        int num = 300;//后续会根据用户积分多少改变数值
         if (taskEntities.size() < num){
             TaskEntity taskEntity = this.taskService.findById(taskId);
             if (taskEntity == null) {
@@ -119,7 +101,7 @@ public class TaskController extends BaseController {
         if (taskEntity.getTaskStatus().equals("1")){
             taskEntity.setTaskStatus("2");
             taskEntity.setAcceptUserId(acceptUserId);
-            taskEntity.setUpdateTime(DateUtil.now());
+            taskEntity.setUpdateTime(DateUtil.getNowTime());
             this.taskService.save(taskEntity);
             return true;
         }else {

src/main/resources/config/application-prod.yml

@@ -1,14 +1,18 @@
 server:
-  port: 8060
+  port: 8444
   address: 0.0.0.0
+  ssl:
+    key-store: classpath:zhjw.hnhong-duo.com.jks
+    key-store-password: l8k3j6ngoqzd0
+    key-store-type: JKS
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://10.11.7.12:3306/post_station1?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
+      url: jdbc:mysql://82.157.34.244:3306/reciprocal_help?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
       username: root
-      password: Gqt@qnrcyz105
+      password: Mysql@.2020
       initial-size: 5
       min-idle: 5
       max-active: 20