From e752c4c35f3173190ffad190cb2599fb7ab4b286 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 1 Jul 2020 14:58:20 +0800
Subject: [PATCH] 0701v1.1

---
 .../com/ccsens/tall/persist/dao/ProNotesDao.java | 16 ++++++++--------
 .../com/ccsens/tall/web/PluginController.java    |  2 +-
 tall/src/main/resources/application.yml          |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProNotesDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProNotesDao.java
index 346df847..dda2d072 100644
--- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProNotesDao.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProNotesDao.java
@@ -12,13 +12,13 @@ import java.util.List;
  */
 @Repository
 public interface ProNotesDao extends ProNotesMapper {
-    /**
-     * 查找任务下的笔记
-     * @param userId 用户id
-     * @param taskId 任务id
-     * @param pluginId 被记笔记的插件的id，可以为null
-     * @return 返回笔记list
-     */
-    List<PluginVo.NotesInfo> listNotesInfo(@Param("userId") Long userId, @Param("taskId")Long taskId,@Param("pluginId") Long pluginId);
+//    /**
+//     * 查找任务下的笔记
+//     * @param userId 用户id
+//     * @param taskId 任务id
+//     * @param pluginId 被记笔记的插件的id，可以为null
+//     * @return 返回笔记list
+//     */
+//    List<PluginVo.NotesInfo> listNotesInfo(@Param("userId") Long userId, @Param("taskId")Long taskId,@Param("pluginId") Long pluginId);
 
 }
diff --git a/tall/src/main/java/com/ccsens/tall/web/PluginController.java b/tall/src/main/java/com/ccsens/tall/web/PluginController.java
index 3c04c726..c81ea2e9 100644
--- a/tall/src/main/java/com/ccsens/tall/web/PluginController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/PluginController.java
@@ -124,7 +124,7 @@ public class PluginController {
             @ApiImplicitParam(name = "page", value = "任务Id", required = true, paramType = "query"),
             @ApiImplicitParam(name = "page", value = "被查询的插件的id，不是笔记插件的id,只查询任务的笔记时不需要传参", required = true, paramType = "query")
     })
-    @RequestMapping(value = "comment", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "notes", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<PluginVo.NotesInfo>> getNotesInfo(HttpServletRequest request,
                                                                @RequestParam(required = true) Long taskId,
                                                                @RequestParam(required = false) Long pluginId) throws Exception {
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index c88e995d..b2acd365 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: dev
+    include: util-dev,common