From c223f521d70362844337d3ee744f42abe33f423f Mon Sep 17 00:00:00 2001 From: "pzrr@qq.com" Date: Tue, 24 Apr 2018 08:46:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?####=20Version=201.4.9.3=20*=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4UploadFile.Size=E5=AE=9E=E7=8E=B0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9EHeader.Size?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20*=20=E8=B0=83=E6=95=B4dotweb.Classic?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E4=B8=BAClassic(logPath=20string),=E8=8B=A5?= =?UTF-8?q?=E4=BC=A0=E5=85=A5logPath=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BB=A5"bin-root/logs"=E4=B8=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9B=AE=E5=BD=95=20*=20=E6=96=B0=E5=A2=9Edotweb.Clas?= =?UTF-8?q?sicWithConf(config=20*config.Config),=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BC=A0=E5=85=A5config=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=20*=20=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4Log?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=94=B1"bin-root"=E4=B8=BA"bin-root/logs"?= =?UTF-8?q?=20*=202018-04-24=2008:30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dotweb.go | 16 ++++++++++++++-- logger/logger.go | 2 +- uploadfile.go | 12 +----------- version.MD | 7 +++++++ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dotweb.go b/dotweb.go index e58c520..54544fc 100644 --- a/dotweb.go +++ b/dotweb.go @@ -88,14 +88,18 @@ func New() *DotWeb { return app } -// Classic create and return DotApp instance +// Classic create and return DotApp instance\ +// if set logPath = "", it will use bin-root/logs for log-root // 1.SetEnabledLog(true) // 2.use RequestLog Middleware // 3.print logo -func Classic() *DotWeb { +func Classic(logPath string) *DotWeb { app := New() app.StartMode = StartMode_Classic + if logPath != ""{ + app.SetLogPath(logPath) + } app.SetEnabledLog(true) app.UseRequestLog() //print logo @@ -104,6 +108,14 @@ func Classic() *DotWeb { return app } +// ClassicWithConf create and return DotApp instance +// must set config info +func ClassicWithConf(config *config.Config) *DotWeb{ + app := Classic(config.App.LogPath) + app.SetConfig(config) + return app +} + // RegisterMiddlewareFunc register middleware with gived name & middleware func (app *DotWeb) RegisterMiddlewareFunc(name string, middleFunc MiddlewareFunc) { app.middlewareMutex.Lock() diff --git a/logger/logger.go b/logger/logger.go index 826e5dd..37fbe50 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -69,7 +69,7 @@ func SetEnabledConsole(enabled bool) { func InitLog() { if DefaultLogPath == "" { - DefaultLogPath = file.GetCurrentDirectory() + DefaultLogPath = file.GetCurrentDirectory() +"/logs" } if appLog == nil { appLog = NewXLog() diff --git a/uploadfile.go b/uploadfile.go index c18b16a..3224882 100644 --- a/uploadfile.go +++ b/uploadfile.go @@ -26,11 +26,6 @@ func NewUploadFile(file multipart.File, header *multipart.FileHeader) *UploadFil } } -// 获取文件大小的接口 -type sizer interface { - Size() int64 -} - //get upload file client-local name func (f *UploadFile) FileName() string { return f.fileName @@ -38,12 +33,7 @@ func (f *UploadFile) FileName() string { //get upload file size func (f *UploadFile) Size() int64 { - if f.fileSize <= 0 { - if sizer, ok := f.File.(sizer); ok { - f.fileSize = sizer.Size() - } - } - return f.fileSize + return f.Header.Size } // SaveFile save file in server-local with filename diff --git a/version.MD b/version.MD index ae5e981..1aeddf6 100644 --- a/version.MD +++ b/version.MD @@ -1,5 +1,12 @@ ## dotweb版本记录： +#### Version 1.4.9.3 +* 调整UploadFile.Size实现方法，直接返回Header.Size数据 +* 调整dotweb.Classic签名为Classic(logPath string),若传入logPath为空，则默认以"bin-root/logs"为日志目录 +* 新增dotweb.ClassicWithConf(config *config.Config),支持初始化传入config设置 +* 调整默认Log目录由"bin-root"为"bin-root/logs" +* 2018-04-24 08:30 + #### Version 1.4.9.2 * 修复BUG for #112 * 调整CharsetUTF8值为"charset=utf-8" From 7ab65b894f1672042443b0a55fe360d82e2ecf71 Mon Sep 17 00:00:00 2001 From: "pzrr@qq.com" Date: Tue, 24 Apr 2018 08:56:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?####=20Version=201.4.9.3=20*=20=E9=87=8D?= =?UTF-8?q?=E8=A6=81=EF=BC=9Ago=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=BA1.9+=20*=20=E8=B0=83=E6=95=B4UploadF?= =?UTF-8?q?ile.Size=E5=AE=9E=E7=8E=B0=E6=96=B9=E6=B3=95=EF=BC=8C=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=BF=94=E5=9B=9EHeader.Size=E6=95=B0=E6=8D=AE=20*=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4dotweb.Classic=E7=AD=BE=E5=90=8D=E4=B8=BAClas?= =?UTF-8?q?sic(logPath=20string),=E8=8B=A5=E4=BC=A0=E5=85=A5logPath?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=88=99=E9=BB=98=E8=AE=A4=E4=BB=A5?= =?UTF-8?q?"bin-root/logs"=E4=B8=BA=E6=97=A5=E5=BF=97=E7=9B=AE=E5=BD=95=20?= =?UTF-8?q?*=20=E6=96=B0=E5=A2=9Edotweb.ClassicWithConf(config=20*config.C?= =?UTF-8?q?onfig),=E6=94=AF=E6=8C=81=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BC=A0?= =?UTF-8?q?=E5=85=A5config=E8=AE=BE=E7=BD=AE=20*=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=BB=98=E8=AE=A4Log=E7=9B=AE=E5=BD=95=E7=94=B1"bin-root"?= =?UTF-8?q?=E4=B8=BA"bin-root/logs"=20*=202018-04-24=2008:30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- dotweb.go | 2 ++ version.MD | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e9dc65..55350c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: go sudo: required go: - - 1.8 + - 1.9 env: - GO15VENDOREXPERIMENT="1" diff --git a/dotweb.go b/dotweb.go index 54544fc..86aa401 100644 --- a/dotweb.go +++ b/dotweb.go @@ -55,6 +55,8 @@ const ( // DefaultHTTPPort default http port; fixed for #70 UPDATE default http port 80 to 8080 DefaultHTTPPort = 8080 + DefaultLogPath = "" + // RunMode_Development app runmode in development mode RunMode_Development = "development" // RunMode_Production app runmode in production mode diff --git a/version.MD b/version.MD index 1aeddf6..4fd7b29 100644 --- a/version.MD +++ b/version.MD @@ -1,6 +1,7 @@ ## dotweb版本记录： #### Version 1.4.9.3 +* 重要：go版本适配升级为1.9+ * 调整UploadFile.Size实现方法，直接返回Header.Size数据 * 调整dotweb.Classic签名为Classic(logPath string),若传入logPath为空，则默认以"bin-root/logs"为日志目录 * 新增dotweb.ClassicWithConf(config *config.Config),支持初始化传入config设置 From 5bfc712f7fbb1f0f73e120876f5abd76351238c5 Mon Sep 17 00:00:00 2001 From: "pzrr@qq.com" Date: Tue, 24 Apr 2018 09:00:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?####=20Version=201.4.9.3=20*=20=E9=87=8D?= =?UTF-8?q?=E8=A6=81=EF=BC=9Ago=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=BA1.9+=20*=20=E8=B0=83=E6=95=B4UploadF?= =?UTF-8?q?ile.Size=E5=AE=9E=E7=8E=B0=E6=96=B9=E6=B3=95=EF=BC=8C=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=BF=94=E5=9B=9EHeader.Size=E6=95=B0=E6=8D=AE=20*=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4dotweb.Classic=E7=AD=BE=E5=90=8D=E4=B8=BAClas?= =?UTF-8?q?sic(logPath=20string),=E8=8B=A5=E4=BC=A0=E5=85=A5logPath?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=88=99=E9=BB=98=E8=AE=A4=E4=BB=A5?= =?UTF-8?q?"bin-root/logs"=E4=B8=BA=E6=97=A5=E5=BF=97=E7=9B=AE=E5=BD=95=20?= =?UTF-8?q?*=20=E6=96=B0=E5=A2=9Edotweb.ClassicWithConf(config=20*config.C?= =?UTF-8?q?onfig),=E6=94=AF=E6=8C=81=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BC=A0?= =?UTF-8?q?=E5=85=A5config=E8=AE=BE=E7=BD=AE=20*=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=BB=98=E8=AE=A4Log=E7=9B=AE=E5=BD=95=E7=94=B1"bin-root"?= =?UTF-8?q?=E4=B8=BA"bin-root/logs"=20*=202018-04-24=2008:30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/start/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/start/main.go b/example/start/main.go index bca5858..4856415 100644 --- a/example/start/main.go +++ b/example/start/main.go @@ -7,7 +7,7 @@ import ( ) func main(){ - app := dotweb.Classic() + app := dotweb.Classic(dotweb.DefaultLogPath) //app := dotweb.New() //开启development模式 app.SetDevelopmentMode()