From 8edb7833a845bbe3df79b87ceb332747d3a5fa8b Mon Sep 17 00:00:00 2001
From: zicla <ziclax@163.com>
Date: Fri, 12 Apr 2019 18:01:35 +0800
Subject: [PATCH] kick off the dav things

---
 rest/context.go                               |  3 ++-
 rest/dav/webdav.go                            |  3 ++-
 ...webdav_controller.go => dav_controller.go} | 27 +++++++++++--------
 rest/dav_service.go                           | 22 +++++++++++++++
 4 files changed, 42 insertions(+), 13 deletions(-)
 rename rest/{webdav_controller.go => dav_controller.go} (70%)
 create mode 100644 rest/dav_service.go

diff --git a/rest/context.go b/rest/context.go
index 0e57ad5..f1d5f2b 100644
--- a/rest/context.go
+++ b/rest/context.go
@@ -148,7 +148,8 @@ func (this *Context) registerBeans() {
 	this.registerBean(new(UserService))
 
 	//webdav
-	this.registerBean(new(WebdavController))
+	this.registerBean(new(DavController))
+	this.registerBean(new(DavService))
 
 }
 
diff --git a/rest/dav/webdav.go b/rest/dav/webdav.go
index f4661c7..58d8450 100644
--- a/rest/dav/webdav.go
+++ b/rest/dav/webdav.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package webdav provides a WebDAV server implementation.
-package dav // import "golang.org/x/net/webdav"
+package dav
 
 import (
 	"errors"
@@ -70,6 +70,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	// status = 0 表示没有问题
 	if status != 0 {
 		w.WriteHeader(status)
 		if status != http.StatusNoContent {
diff --git a/rest/webdav_controller.go b/rest/dav_controller.go
similarity index 70%
rename from rest/webdav_controller.go
rename to rest/dav_controller.go
index 34df77f..fefcc17 100644
--- a/rest/webdav_controller.go
+++ b/rest/dav_controller.go
@@ -1,9 +1,9 @@
 package rest
 
 import (
-	"golang.org/x/net/webdav"
 	"net/http"
 	"regexp"
+	"tank/rest/dav"
 )
 
 /**
@@ -12,7 +12,7 @@ import (
  * https://tools.ietf.org/html/rfc4918
  *
  */
-type WebdavController struct {
+type DavController struct {
 	BaseController
 	uploadTokenDao    *UploadTokenDao
 	downloadTokenDao  *DownloadTokenDao
@@ -20,10 +20,11 @@ type WebdavController struct {
 	matterService     *MatterService
 	imageCacheDao     *ImageCacheDao
 	imageCacheService *ImageCacheService
+	davService        *DavService
 }
 
 //初始化方法
-func (this *WebdavController) Init() {
+func (this *DavController) Init() {
 	this.BaseController.Init()
 
 	//手动装填本实例的Bean.
@@ -56,10 +57,15 @@ func (this *WebdavController) Init() {
 	if c, ok := b.(*ImageCacheService); ok {
 		this.imageCacheService = c
 	}
+
+	b = CONTEXT.GetBean(this.davService)
+	if c, ok := b.(*DavService); ok {
+		this.davService = c
+	}
 }
 
 //注册自己的路由。
-func (this *WebdavController) RegisterRoutes() map[string]func(writer http.ResponseWriter, request *http.Request) {
+func (this *DavController) RegisterRoutes() map[string]func(writer http.ResponseWriter, request *http.Request) {
 
 	routeMap := make(map[string]func(writer http.ResponseWriter, request *http.Request))
 
@@ -67,12 +73,12 @@ func (this *WebdavController) RegisterRoutes() map[string]func(writer http.Respo
 }
 
 //处理一些特殊的接口，比如参数包含在路径中,一般情况下，controller不将参数放在url路径中
-func (this *WebdavController) HandleRoutes(writer http.ResponseWriter, request *http.Request) (func(writer http.ResponseWriter, request *http.Request), bool) {
+func (this *DavController) HandleRoutes(writer http.ResponseWriter, request *http.Request) (func(writer http.ResponseWriter, request *http.Request), bool) {
 
 	path := request.URL.Path
 
 	//匹配 /api/webdav{subPath}
-	reg := regexp.MustCompile(`^/api/webdav(.*)$`)
+	reg := regexp.MustCompile(`^/api/dav(.*)$`)
 	strs := reg.FindStringSubmatch(path)
 	if len(strs) == 2 {
 		var f = func(writer http.ResponseWriter, request *http.Request) {
@@ -85,16 +91,15 @@ func (this *WebdavController) HandleRoutes(writer http.ResponseWriter, request *
 }
 
 //完成系统安装
-func (this *WebdavController) Index(writer http.ResponseWriter, request *http.Request, subPath string) {
+func (this *DavController) Index(writer http.ResponseWriter, request *http.Request, subPath string) {
 
 	this.logger.Info("请求访问来了：%s %s", request.RequestURI, subPath)
 
-	handler := &webdav.Handler{
-		FileSystem: webdav.Dir("/Users/fusu/d/group/golang/src/tank/tmp/webdav"),
-		LockSystem: webdav.NewMemLS(),
+	handler := &dav.Handler{
+		FileSystem: dav.Dir("/Users/fusu/d/group/golang/src/tank/tmp/dav"),
+		LockSystem: dav.NewMemLS(),
 	}
 
-
 	handler.ServeHTTP(writer, request)
 
 }
diff --git a/rest/dav_service.go b/rest/dav_service.go
new file mode 100644
index 0000000..7170220
--- /dev/null
+++ b/rest/dav_service.go
@@ -0,0 +1,22 @@
+package rest
+
+
+//@Service
+type DavService struct {
+	Bean
+	matterDao         *MatterDao
+}
+
+
+//初始化方法
+func (this *DavService) Init() {
+	this.Bean.Init()
+
+	//手动装填本实例的Bean. 这里必须要用中间变量方可。
+	b := CONTEXT.GetBean(this.matterDao)
+	if b, ok := b.(*MatterDao); ok {
+		this.matterDao = b
+	}
+
+
+}