From e242867f418c416aad0741e1af2d28ba070003e6 Mon Sep 17 00:00:00 2001 From: daofeng Date: Wed, 26 May 2021 00:50:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:api=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9,?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alidrive/req_bean.go | 5 ++++ bootstrap/config.go | 48 ++++++++++++++++++++++++++++++++++++ server/controllers/common.go | 27 ++++++++++---------- 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/alidrive/req_bean.go b/alidrive/req_bean.go index ac3a1c9a..34560505 100644 --- a/alidrive/req_bean.go +++ b/alidrive/req_bean.go @@ -73,3 +73,8 @@ type VideoPreviewUrlReq struct { FileId string `json:"file_id"` ExpireSec int `json:"expire_sec"` } +type ReqData struct { + Code int `json:"code"` + Data interface{} `json:"data"` + Message string `json:"message"` +} \ No newline at end of file diff --git a/bootstrap/config.go b/bootstrap/config.go index fda3980e..790d3635 100644 --- a/bootstrap/config.go +++ b/bootstrap/config.go @@ -1,11 +1,13 @@ package bootstrap import ( + "bufio" "github.com/Xhofe/alist/conf" "github.com/Xhofe/alist/utils" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" "io/ioutil" + "os" "strings" ) @@ -14,6 +16,7 @@ func ReadConf(config string) bool { log.Infof("读取配置文件...") if !utils.Exists(config) { log.Infof("找不到配置文件:%s", config) + Write() return false } confFile, err := ioutil.ReadFile(config) @@ -31,3 +34,48 @@ func ReadConf(config string) bool { conf.Origins = strings.Split(conf.Conf.Server.SiteUrl, ",") return true } +func Write() { + log.Infof("创建默认配置文件") + filePath :="conf.yml" + file,err :=os.OpenFile(filePath,os.O_WRONLY | os.O_CREATE,0644) + if err != nil { + log.Infof("文件创建失败...") + return + } + defer file.Close() + str := ` +info: + title: AList #标题 + logo: "" #网站logo 如果填写,则会替换掉默认的 + footer_text: Xhofe's Blog #网页底部文字 + footer_url: https://www.nn.ci #网页底部文字链接 + music_img: https://img.xhofe.top/2020/12/19/0f8b57866bdb5.gif #预览音乐文件时的图片 + check_update: true #前端是否显示更新 + script: #自定义脚本,可以是脚本的链接,也可以直接是脚本内容 + autoplay: true #视频是否自动播放 + preview: + text: [txt,htm,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,yml,go,sh,c,cpp,h,hpp] #要预览的文本文件的后缀,可以自行添加 +server: + address: "0.0.0.0" + port: "5244" + search: true + static: dist + site_url: '*' + password: password #用于重建目录 +ali_drive: + api_url: https://api.aliyundrive.com/v2 + max_files_count: 3000 + drives: + - refresh_token: xxx #refresh_token + root_folder: root #根目录的file_id + name: drive0 #盘名,多个盘不可重复,这里只是示例,不是一定要叫这个名字,可随意修改 + password: pass #该盘密码,空('')则不设密码,修改需要重建生效 + hide: false #是否在主页隐藏该盘,不可全部隐藏,至少暴露一个 +database: + type: sqlite3 + dBFile: alist.db +` + writer := bufio.NewWriter(file) + writer.WriteString(str) + writer.Flush() +} diff --git a/server/controllers/common.go b/server/controllers/common.go index 2e5a2f2b..98d5443c 100644 --- a/server/controllers/common.go +++ b/server/controllers/common.go @@ -1,24 +1,23 @@ package controllers -import "github.com/gin-gonic/gin" +import ( + "github.com/Xhofe/alist/alidrive" +) // common meta response -func MetaResponse(code int, msg string) gin.H { - return gin.H{ - "meta": gin.H{ - "code": code, - "msg": msg, - }, +func MetaResponse(code int, msg string) alidrive.ReqData { + return alidrive.ReqData{ + Code: code, + Data: nil, + Message: msg, } } // common data response -func DataResponse(data interface{}) gin.H { - return gin.H{ - "meta": gin.H{ - "code": 200, - "msg": "success", - }, - "data": data, +func DataResponse(data interface{}) alidrive.ReqData { + return alidrive.ReqData{ + Code: 200, + Data: data, + Message: "ok", } }