返回添加子任务名字

tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java

@@ -116,6 +116,8 @@ public class TaskVo {
         private int process;
         @ApiModelProperty("子项目id")
         private Long subProjectId;
+        @ApiModelProperty("子项目名字")
+        private String subProjectName;
         @ApiModelProperty("服务器时间")
         private Long serverTime;
         @ApiModelProperty("任务类型 0普通任务 1虚拟任务")

tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java

@@ -3,12 +3,14 @@ package com.ccsens.tall.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.tall.bean.dto.PluginDto;
 import com.ccsens.tall.bean.po.*;
 import com.ccsens.tall.bean.vo.PluginVo;
 import com.ccsens.tall.bean.vo.TaskVo;
 import com.ccsens.tall.persist.dao.*;
 import com.ccsens.util.CodeEnum;
+import com.ccsens.util.PropUtil;
 import com.ccsens.util.WebConstant;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
@@ -157,9 +159,22 @@ public class TaskPluginService implements ITaskPluginService{
         return commentInfo;
     }
 
+    /**
+     * 查找评论
+     * @param currentUserId
+     * @param taskId
+     * @return
+     */
     @Override
     public List<PluginVo.CommentInfo> getComment(Long currentUserId, Long taskId) {
         List<PluginVo.CommentInfo> commentInfoList = proTaskCommentDao.getCommentByTaskId(currentUserId,taskId);
+        if(CollectionUtil.isNotEmpty(commentInfoList)){
+            commentInfoList.forEach(commentInfo -> {
+                if(StrUtil.isEmpty(commentInfo.getAvatarUrl())){
+                    commentInfo.setAvatarUrl(PropUtil.notGatewayUrl + "staticrec/logo.png");
+                }
+            });
+        }
         return commentInfoList;
     }
 

tall/src/main/resources/application-dev.yml

@@ -29,4 +29,5 @@ spring:
     timeout: 1000ms
 swagger:
   enable: true
+notGatewayUrl: /home/staticrec/logo.png
 

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

@@ -35,4 +35,5 @@ eureka:
 #    ip-address: 140.143.228.3
     ip-address: 192.144.182.42
 
-gatewayUrl: https://www.tall.wiki/gateway/
+gatewayUrl: https://www.tall.wiki/gateway/
+notGatewayUrl: https://www.tall.wiki/

tall/src/main/resources/application-test.yml

@@ -32,4 +32,5 @@ swagger:
 eureka:
   instance:
     ip-address: 192.168.0.99
-gatewayUrl: http://192.168.0.99/gateway/
+gatewayUrl: http://192.168.0.99/gateway/
+notGatewayUrl: http://192.168.0.99/

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common

tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@@ -28,6 +28,7 @@
         <result column="tRealEndTime" property="realEndTime" />
         <result column="tProcess" property="process" />
         <result column="tSubProjectId" property="subProjectId" />
+        <result column="tSubProjectName" property="subProjectName" />
         <result column="tMoney" property="money" />
         <result column="tVirtual" property="virtual" />
         <result column="tDelay" property="delay" />
@@ -76,6 +77,7 @@
         s.real_end_time as tRealEndTime,
         s.complated_status as tProcess,
         d.sub_project_id as tSubProjectId,
+        d.sub_project as tSubProjectName,
         d.money as tMoney,
         d.virtual as tVirtual,
         d.delay as tDelay,
@@ -152,6 +154,7 @@
         s.real_end_time as tRealEndTime,
         s.complated_status as tProcess,
         d.sub_project_id as tSubProjectId,
+        d.sub_project as tSubProjectName,
         d.money as tMoney,
         d.virtual as tVirtual,
         d.delay as tDelay,
@@ -225,6 +228,7 @@
         s.real_end_time as tRealEndTime,
         s.complated_status as tProcess,
         d.sub_project_id as tSubProjectId,
+        d.sub_project as tSubProjectName,
         d.money as tMoney,
         d.virtual as tVirtual,
         d.delay as tDelay,
@@ -279,6 +283,7 @@
         s.real_end_time as tRealEndTime,
         s.complated_status as tProcess,
         d.sub_project_id as tSubProjectId,
+        d.sub_project as tSubProjectName,
         d.money as tMoney,
         d.virtual as tVirtual,
         d.delay as tDelay,
@@ -360,6 +365,7 @@
         s.real_end_time as tRealEndTime,
         s.complated_status as tProcess,
         d.sub_project_id as tSubProjectId,
+        d.sub_project as tSubProjectName,
         d.money as tMoney,
         d.virtual as tVirtual,
         d.delay as tDelay,

util/src/main/java/com/ccsens/util/PropUtil.java

@@ -17,12 +17,17 @@ public class PropUtil {
     public static String projectName;
     public static String contextPath;
     public static String gatewayUrl;
+    public static String notGatewayUrl;
     public static String qrCode;
 
     @Value("${gatewayUrl:}")
     public void setGatewayUrl(String gatewayUrl) {
         PropUtil.gatewayUrl = gatewayUrl;
     }
+    @Value("${notGatewayUrl:}")
+    public void setNotGatewayUrl(String notGatewayUrl) {
+        PropUtil.notGatewayUrl = notGatewayUrl;
+    }
     @Value("${file.path:}")
     public void setPath(String path) {
         PropUtil.path = path;

util/src/main/java/com/ccsens/util/WebConstant.java

@@ -64,7 +64,7 @@ public class WebConstant {
     public static final String DEFAULT_NICKNAME = "普通用户";
     public static final String DEFAULT_DESCRIPTION = "这个人很懒，什么都没有留下";
     public static final String DEFAULT_AVATAR = "";
-    public static final String DEFAULT_AVATAR_LOGO = "";
+    public static final String DEFAULT_AVATAR_LOGO = "/home/cloud/tall/uploads";
 
     public static final String KEY_WEBSOCKET_GROUPID = "WebScoket_groupId";
     public static final String PREFIX_WEBSOCKET_GROUPID = "groupId=";