From c0f50ffeffcad2a0d87649d8132e78a386962ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E5=87=89?= <927625802@qq.com>
Date: Sun, 7 Mar 2021 21:51:26 +0800
Subject: [PATCH] =?UTF-8?q?:construction:=20=E5=8F=82=E6=95=B0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/controllers/get.go           |  4 ++--
 server/controllers/list.go          |  8 ++++++--
 server/controllers/offie_preview.go |  8 ++++++--
 server/controllers/search.go        | 10 ++++++++++
 server/router.go                    |  2 ++
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/server/controllers/get.go b/server/controllers/get.go
index 870ce413..8df36fc5 100644
--- a/server/controllers/get.go
+++ b/server/controllers/get.go
@@ -10,7 +10,7 @@ import (
 
 // get request bean
 type GetReq struct {
-	File     string `json:"file"`
+	File     string `json:"file" binding:"required"`
 	Password string `json:"password"`
 }
 
@@ -18,7 +18,7 @@ type GetReq struct {
 func Get(c *gin.Context) {
 	var get GetReq
 	if err := c.ShouldBindJSON(&get); err != nil {
-		c.JSON(200, MetaResponse(400, "Bad Request."))
+		c.JSON(200, MetaResponse(400, "Bad Request:"+err.Error()))
 		return
 	}
 	log.Debugf("list:%+v", get)
diff --git a/server/controllers/list.go b/server/controllers/list.go
index 23d46719..0415683f 100644
--- a/server/controllers/list.go
+++ b/server/controllers/list.go
@@ -9,7 +9,7 @@ import (
 
 // list request bean
 type ListReq struct {
-	Path     string `json:"path"`
+	Path     string `json:"path" binding:"required"`
 	Password string `json:"password"`
 }
 
@@ -17,7 +17,7 @@ type ListReq struct {
 func List(c *gin.Context) {
 	var list ListReq
 	if err := c.ShouldBindJSON(&list); err != nil {
-		c.JSON(200, MetaResponse(400, "Bad Request."))
+		c.JSON(200, MetaResponse(400, "Bad Request:"+err.Error()))
 		return
 	}
 	log.Debugf("list:%+v", list)
@@ -43,6 +43,10 @@ func List(c *gin.Context) {
 		return
 	}
 	files, err := models.GetFilesByParentPath(list.Path + "/")
+	// delete password
+	for i, _ := range *files {
+		(*files)[i].Password = ""
+	}
 	if err != nil {
 		c.JSON(200, MetaResponse(500, err.Error()))
 		return
diff --git a/server/controllers/offie_preview.go b/server/controllers/offie_preview.go
index e8ba2fd0..cfa38ffa 100644
--- a/server/controllers/offie_preview.go
+++ b/server/controllers/offie_preview.go
@@ -6,11 +6,15 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+type OfficePreviewReq struct {
+	FileId string `json:"file_id" binding:"required"`
+}
+
 // handle office_preview request
 func OfficePreview(c *gin.Context) {
-	var req alidrive.OfficePreviewUrlReq
+	var req OfficePreviewReq
 	if err := c.ShouldBindJSON(&req); err != nil {
-		c.JSON(200, MetaResponse(400, "Bad Request"))
+		c.JSON(200, MetaResponse(400, "Bad Request:"+err.Error()))
 		return
 	}
 	log.Debugf("preview_req:%+v", req)
diff --git a/server/controllers/search.go b/server/controllers/search.go
index 2d329367..c06aab70 100644
--- a/server/controllers/search.go
+++ b/server/controllers/search.go
@@ -1 +1,11 @@
 package controllers
+
+import "github.com/gin-gonic/gin"
+
+func LocalSearch(c *gin.Context) {
+	
+}
+
+func GlobalSearch(c *gin.Context) {
+
+}
\ No newline at end of file
diff --git a/server/router.go b/server/router.go
index 3dc38d4b..85ee1532 100644
--- a/server/router.go
+++ b/server/router.go
@@ -27,6 +27,8 @@ func InitApiRouter(engine *gin.Engine) {
 		apiV2.POST("/list", controllers.List)
 		apiV2.POST("/get", controllers.Get)
 		apiV2.POST("/office_preview", controllers.OfficePreview)
+		apiV2.POST("/local_search", controllers.LocalSearch)
+		apiV2.POST("/global_search", controllers.GlobalSearch)
 	}
 	engine.GET("/d/*file", controllers.Down)
 	engine.GET("/rebuild", controllers.RebuildTree)