From 85f0bd24e239b0813da04998e2ff942ecc7db5ca Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Wed, 1 Jun 2022 10:38:36 +0800
Subject: [PATCH] zh

---
 .../java/com/zh/project0512/conf/MvcInterceptorConfig.java  | 2 --
 .../zh/project0512/controller/manage/TaskController.java    | 6 +++---
 src/main/resources/application-dev.yml                      | 1 +
 src/main/resources/mapper/TaskMapper.xml                    | 3 ++-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zh/project0512/conf/MvcInterceptorConfig.java b/src/main/java/com/zh/project0512/conf/MvcInterceptorConfig.java
index c987c96..d88497d 100644
--- a/src/main/java/com/zh/project0512/conf/MvcInterceptorConfig.java
+++ b/src/main/java/com/zh/project0512/conf/MvcInterceptorConfig.java
@@ -38,8 +38,6 @@ public class MvcInterceptorConfig implements WebMvcConfigurer {
         File jarF = h.getSource();
         //在jar包所在目录下生成一个upload文件夹用来存储上传的图片
         String dirPath = jarF.getParentFile().toString()+"/upload/";
-
         registry.addResourceHandler("/upload/**").addResourceLocations("file:" + dirPath);
-
     }
 }
diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java
index 3401314..4dbf754 100644
--- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java
@@ -258,10 +258,10 @@ public class TaskController {
         if (null == task) {
             return Result.fail(HttpStatusEnum.NOT_FOUND);
         }
-        if(token !=null) {
+        String openid = new JwtUtil().parseOpenid(token);
+        if(openid !=null) {
             task.setIsReceived(0);
-            Claims claims = new JwtUtil().parseJWT(token);
-            Integer userId = userService.selByOpenid(claims.getId()).getId();
+            Integer userId = userService.selByOpenid(openid).getId();
             QueryWrapper<UserTask> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("userId", userId).eq("taskId", id);
             UserTask userTask = userTaskService.getOne(queryWrapper);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6cdddcf..e020325 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -52,6 +52,7 @@ mybatis-plus:
             # 删除后
             logic-delete-value: 0
 web:
+    apiPath: com.zh.project0512.controller
     uploadPath: /www/wwwroot/project0512/upload/
 
 #springdoc:
diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index 118566d..78aabcf 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -8,6 +8,7 @@
         <result property="title" column="title"/>
         <result property="subtitle" column="subtitle"/>
         <result property="status" column="status"/>
+        <result property="coverUrl" column="coverUrl"/>
         <result property="start" column="start"/>
         <result property="end" column="end"/>
         <result property="isReceived" column="isReceived"/>
@@ -24,7 +25,7 @@
     </resultMap>
     <select id="taskList" resultMap="taskListMap">
         SELECT
-        t1.id,t1.title,t1.rewardRuleTemplateId,t1.subtitle,t1.start,t1.end,t1.status,t2.tagId,t2.title as
+        t1.id,t1.title,t1.rewardRuleTemplateId,t1.subtitle,t1.start,t1.end,t1.status,t1.coverUrl,t2.tagId,t2.title as
         tagTitle,t3.brandId,t3.name as brandName,t3.hot,t3.hits
                 <if test='openid!=null'>
         ,(SELECT count(*)!=0 from userTask as t4,user as t5 WHERE t1.id = t4.taskId and t4.userId = t5.id and t5.openid