Merge branch 'master' into dev

.gitattributes

@@ -0,0 +1,3 @@
+*.js linguist-language=Go
+*.css linguist-language=Go
+./.env

.travis.yml

@@ -13,7 +13,8 @@ before_install:
   - go get github.com/golang/freetype
 
 script:
-  - go get -t -v ./...
+  - curl https://glide.sh/get | sh
+  - glide update
   - GO_ENABLED=1 go build -v -x -tags "pam" && go install
 
 before_deploy:
@@ -22,9 +23,7 @@ before_deploy:
   - rm -rf commands controllers models modules data routers tasks vendor docs search utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile gide.yaml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock *.md
   - cp conf/app.conf.example conf/app.conf
   - zip -r mindoc_linux_amd64.zip conf logs static uploads views lib mindoc_linux_amd64
-  - zip -r mindoc_darwin_amd64.zip conf logs static uploads views lib mindoc_darwin_amd64
-  - zip -r mindoc_windows_amd64.zip conf logs static uploads views lib mindoc_windows_amd64.exe
-  - zip -r mindoc_windows_i386.zip conf logs static uploads views lib mindoc_windows_i386.exe
+
 
 
 deploy:

Dockerfile

@@ -1,18 +1,19 @@
-FROM golang:1.8.1-alpine
+FROM golang:1.8.3-alpine3.6
 
+# add china aliyun repo  新增了 alpine 3.6 的阿里源
+RUN cp   /etc/apk/repositories /etc/apk/repositories.back && \
+    echo "https://mirrors.aliyun.com/alpine/v3.6/main/" >  /etc/apk/repositories && \
+    echo "https://mirrors.aliyun.com/alpine/v3.6/community/" >> /etc/apk/repositories
 
-RUN apk add --update bash git make gcc
+RUN apk add --update bash git make gcc g++
 
 ADD . /go/src/github.com/lifei6671/mindoc
 
-
 WORKDIR /go/src/github.com/lifei6671/mindoc
 
 RUN chmod +x start.sh
 
-RUN  go get -d ./... && \
-    go get github.com/mitchellh/gox && \
+#RUN  go get -d ./... && \  # 这行 docker build 不过去,所以注释掉了
+RUN go get github.com/mitchellh/gox && \
     gox -os "windows linux darwin" -arch amd64
-
-
-CMD ["./start.sh"]
+CMD ["./start.sh"]

README.md

@@ -17,7 +17,7 @@ MinDoc 的前身是 SmartWiki 文档系统。SmartWiki 是基于 PHP 框架 lara
 
 **如果你的服务器上没有安装golang程序请手动设置一个环境变量如下：键名为 ZONEINFO，值为MinDoc跟目录下的/lib/time/zoneinfo.zip 。**
 
-更多信息请查看手册： [MinDoc 使用手册](https://github.com/lifei6671/mindoc/wiki/MinDoc-%E4%BD%BF%E7%94%A8%E6%89%8B%E5%86%8C)
+更多信息请查看手册： [MinDoc 使用手册](https://github.com/lifei6671/mindoc/wiki)
 
 对于没有Golang使用经验的用户，可以从 [https://github.com/lifei6671/mindoc/releases](https://github.com/lifei6671/mindoc/releases) 这里下载编译完的程序。
 
@@ -40,9 +40,7 @@ MinDoc 使用MySQL储存数据，且编码必须是`utf8mb4_general_ci`。请在
 
 如果conf目录下不存在 app.conf 请重命名 app.conf.example 为 app.conf。
  
-如果 MinDoc 根目录下存在 install.lock 文件表示已经初始化过数据库，想要重新初始化数据库，只需要删除该文件重新启动程序即可。
-
-**默认程序会自动创建表，同时初始化一个超级管理员用户：admin 密码：123456 。请登录后重新设置密码。**
+**默认程序会自动初始化一个超级管理员用户：admin 密码：123456 。请登录后重新设置密码。**
 
 ## Linux 下后台运行
 
@@ -110,7 +108,6 @@ mail_expired=30
 
 
 # 使用Docker部署
-
 如果是Docker用户，可参考项目内置的Dockerfile文件编译镜像。
 
 在启动镜像时需要提供如下的环境变量：
@@ -129,6 +126,28 @@ HTTP_PORT                   程序监听的端口号
 ```bash
 docker run -p 8181:8181 -e MYSQL_PORT_3306_TCP_ADDR=127.0.0.1 -e MYSQL_PORT_3306_TCP_PORT=3306 -e MYSQL_INSTANCE_NAME=mindoc_db -e MYSQL_USERNAME=root -e MYSQL_PASSWORD=123456 -e httpport=8181 -d daocloud.io/lifei6671/mindoc:latest
 ```
+### docker-compose 一键安装
+1. 生成配置文件
+    > cp env-example .env
+
+    按照自己的环境填写配置信息到.env文件中
+2. 一键完成所有环境搭建
+    > docker-compose up -d mindoc
+3. 浏览器访问
+    > http://localhost:8181/
+    
+    整个部署完成了
+4. 常用命令参考
+   - 启动
+        > docker-compose up -d mindoc
+   - 停止
+        > docker-compose stop mindoc
+   - 重启
+        > docker-compose restart mindoc        
+   - 停止删除容器，释放所有资源
+        > docker-compose down
+        
+   更多 docker-compose 的使用相关的内容 请查看官网文档或百度
 
 # 项目截图
 

TODO

@@ -0,0 +1,10 @@
+1、把 log 提取出 dbgout 之类的方法；已改作 beego.Info() 调用；
+2、把源代码里的 TODO 完成；
+3、Export 的两个 URL 应该可以合并，用是否有 :id 来区分；这样 0 号文档输出整个 book 更顺；已完成；
+4、统一代码风格，空格、命名之类的；
+5、美化 PDF 的输出格式；
+6、自动登录新开标签页而且并不能跳转至起始请求页的问题；
+7、用户分组管理；
+8、[自动]展示历史版本；增强历史版本对比显示的能力；
+9、[自动]展示作者信息；也许可以和上一需求合并考虑；
+10、查看了解评论功能；

conf/enumerate.go

@@ -19,7 +19,7 @@ const RegexpEmail = `^(\w)+(\.\w+)*@(\w)+((\.\w+)+)$`
 const RegexpAccount = `^[a-zA-Z][a-zA-z0-9\.]{2,50}$`
 
 // PageSize 默认分页条数.
-const PageSize = 5
+const PageSize = 15
 
 // 用户权限
 const (

controllers/account.go

@@ -1,40 +1,52 @@
 package controllers
 
 import (
-	"time"
-	"strings"
 	"regexp"
+	"strconv"
+	"strings"
+	"time"
 
 	"net/smtp"
-	"github.com/lifei6671/mindoc/conf"
-	"github.com/lifei6671/mindoc/models"
-	"github.com/lifei6671/mindoc/utils"
+
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/logs"
 	"github.com/lifei6671/gocaptcha"
-	"strconv"
+	"github.com/lifei6671/mindoc/conf"
+	"github.com/lifei6671/mindoc/models"
+	"github.com/lifei6671/mindoc/utils"
 )
 
-// AccountController 用户登录与注册.
+// AccountController 用户登录与注册
 type AccountController struct {
 	BaseController
 }
 
-// Login 用户登录.
-func (c *AccountController) Login()  {
+// Login 用户登录
+func (c *AccountController) Login() {
 	c.Prepare()
 	c.TplName = "account/login.tpl"
 
-	var remember struct { MemberId int ; Account string; Time time.Time}
+	var remember struct {
+		MemberId int
+		Account  string
+		Time     time.Time
+	}
+
+	// 显式指定的 URL 参数优先；为了统一处理，将之更新到 Session 中
+	turl := c.GetString("turl", "")
+	if turl != "" {
+		c.SetSession("turl", turl)
+	}
 
-	//如果Cookie中存在登录信息
-	if cookie,ok := c.GetSecureCookie(conf.GetAppKey(),"login");ok{
+	beego.Info("AccountController.Login(): turl is: " + turl)
 
-		if err := utils.Decode(cookie,&remember); err == nil {
-			if member,err := models.NewMember().Find(remember.MemberId); err == nil {
+	// 如果 Cookie 中存在登录信息
+	if cookie, ok := c.GetSecureCookie(conf.GetAppKey(), "login"); ok {
+		if err := utils.Decode(cookie, &remember); err == nil {
+			if member, err := models.NewMember().Find(remember.MemberId); err == nil {
 				c.SetMember(*member)
 
-				c.Redirect(beego.URLFor("HomeController.Index"), 302)
+				c.LoggedIn(false)
 				c.StopRun()
 			}
 		}
@@ -46,48 +58,72 @@ func (c *AccountController) Login()  {
 		captcha := c.GetString("code")
 		is_remember := c.GetString("is_remember")
 
-		//如果开启了验证码
-		if v,ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v,"true") {
-			v,ok := c.GetSession(conf.CaptchaSessionName).(string);
-			if !ok || !strings.EqualFold(v,captcha){
-				c.JsonResult(6001,"验证码不正确")
+		// 如果开启了验证码
+		if v, ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v, "true") {
+			v, ok := c.GetSession(conf.CaptchaSessionName).(string)
+			if !ok || !strings.EqualFold(v, captcha) {
+				c.JsonResult(6001, "验证码不正确")
 			}
 		}
-		member,err := models.NewMember().Login(account,password)
 
-		//如果没有数据
+		member, err := models.NewMember().Login(account, password)
 		if err == nil {
 			member.LastLoginTime = time.Now()
 			member.Update()
 
 			c.SetMember(*member)
-			if strings.EqualFold(is_remember,"yes") {
+			if strings.EqualFold(is_remember, "yes") {
 				remember.MemberId = member.MemberId
 				remember.Account = member.Account
 				remember.Time = time.Now()
-				v ,err := utils.Encode(remember)
+				v, err := utils.Encode(remember)
 				if err == nil {
-					c.SetSecureCookie(conf.GetAppKey(),"login",v)
+					c.SetSecureCookie(conf.GetAppKey(), "login", v)
 				}
-
 			}
 
-			c.JsonResult(0,"ok")
-		}else{
-			logs.Error("用户登录 =>",err)
-			c.JsonResult(500,"账号或密码错误",nil)
+			data := c.LoggedIn(true)
+			c.JsonResult(0, "ok", data)
+		} else {
+			logs.Error("用户登录 =>", err)
+			c.JsonResult(500, "账号或密码错误", nil)
 		}
+	}
+}
 
-		return
+// 登录成功后的操作，如重定向到原始请求页面
+func (c *AccountController) LoggedIn(isPost bool) interface{} {
+	turl := ""
+	value := c.GetSession("turl")
+	if value != nil {
+		turl = value.(string)
+	}
+	c.DelSession("turl")
+
+	beego.Info("AccountController.LoggedIn(): turl is: " + turl)
+
+	if !isPost {
+		// 检查是否存在 turl 参数，如果有则重定向至 turl 处，否则进入 Home 页面
+		if turl == "" {
+			turl = beego.URLFor("HomeController.Index")
+		}
+		c.Redirect(turl, 302)
+		return nil
+	} else {
+		var data struct {
+			TURL string `json:"turl"`
+		}
+		data.TURL = turl
+		return data
 	}
 }
 
-//用户注册.
-func (c *AccountController) Register()  {
+// 用户注册
+func (c *AccountController) Register() {
 	c.TplName = "account/register.tpl"
 
-	//如果没有开启用户注册
-	if v,ok := c.Option["ENABLED_REGISTER"]; ok && !strings.EqualFold(v,"true") {
+	// 如果没有开启用户注册
+	if v, ok := c.Option["ENABLED_REGISTER"]; ok && !strings.EqualFold(v, "true") {
 		c.Abort("404")
 	}
 
@@ -98,30 +134,30 @@ func (c *AccountController) Register()  {
 		email := c.GetString("email")
 		captcha := c.GetString("code")
 
-		if ok,err := regexp.MatchString(conf.RegexpAccount,account); account == "" || !ok || err != nil {
-			c.JsonResult(6001,"账号只能由英文字母数字组成，且在3-50个字符")
+		if ok, err := regexp.MatchString(conf.RegexpAccount, account); account == "" || !ok || err != nil {
+			c.JsonResult(6001, "账号只能由英文字母数字组成，且在3-50个字符")
 		}
-		if  l := strings.Count(password1,"") ; password1 == "" || l > 50 || l < 6{
-			c.JsonResult(6002,"密码必须在6-50个字符之间")
+		if l := strings.Count(password1, ""); password1 == "" || l > 50 || l < 6 {
+			c.JsonResult(6002, "密码必须在6-50个字符之间")
 		}
 		if password1 != password2 {
-			c.JsonResult(6003,"确认密码不正确")
+			c.JsonResult(6003, "确认密码不正确")
 		}
-		if  ok,err := regexp.MatchString(conf.RegexpEmail,email); !ok || err != nil || email == "" {
-			c.JsonResult(6004,"邮箱格式不正确")
+		if ok, err := regexp.MatchString(conf.RegexpEmail, email); !ok || err != nil || email == "" {
+			c.JsonResult(6004, "邮箱格式不正确")
 		}
-		//如果开启了验证码
-		if v,ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v,"true") {
-			v,ok := c.GetSession(conf.CaptchaSessionName).(string);
-			if !ok || !strings.EqualFold(v,captcha){
-				c.JsonResult(6001,"验证码不正确")
+		// 如果开启了验证码
+		if v, ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v, "true") {
+			v, ok := c.GetSession(conf.CaptchaSessionName).(string)
+			if !ok || !strings.EqualFold(v, captcha) {
+				c.JsonResult(6001, "验证码不正确")
 			}
 		}
 
 		member := models.NewMember()
 
-		if _,err := member.FindByAccount(account); err == nil && member.MemberId > 0 {
-			c.JsonResult(6005,"账号已存在")
+		if _, err := member.FindByAccount(account); err == nil && member.MemberId > 0 {
+			c.JsonResult(6005, "账号已存在")
 		}
 
 		member.Account = account
@@ -133,15 +169,15 @@ func (c *AccountController) Register()  {
 		member.Status = 0
 		if err := member.Add(); err != nil {
 			beego.Error(err)
-			c.JsonResult(6006,"注册失败，请联系系统管理员处理")
+			c.JsonResult(6006, "注册失败，请联系系统管理员处理")
 		}
 
-		c.JsonResult(0,"ok",member)
+		c.JsonResult(0, "ok", member)
 	}
 }
 
-//找回密码.
-func (c *AccountController) FindPassword()  {
+// 找回密码
+func (c *AccountController) FindPassword() {
 	c.TplName = "account/find_password_setp1.tpl"
 	mail_conf := conf.GetMailConfig()
 
@@ -151,63 +187,63 @@ func (c *AccountController) FindPassword()  {
 		captcha := c.GetString("code")
 
 		if email == "" {
-			c.JsonResult(6005,"邮箱地址不能为空")
+			c.JsonResult(6005, "邮箱地址不能为空")
 		}
 		if !mail_conf.EnableMail {
-			c.JsonResult(6004,"未启用邮件服务")
+			c.JsonResult(6004, "未启用邮件服务")
 		}
 
-		//如果开启了验证码
-		if v,ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v,"true") {
-			v,ok := c.GetSession(conf.CaptchaSessionName).(string);
-			if !ok || !strings.EqualFold(v,captcha){
-				c.JsonResult(6001,"验证码不正确")
+		// 如果开启了验证码
+		if v, ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v, "true") {
+			v, ok := c.GetSession(conf.CaptchaSessionName).(string)
+			if !ok || !strings.EqualFold(v, captcha) {
+				c.JsonResult(6001, "验证码不正确")
 			}
 		}
 
-		member ,err := models.NewMember().FindByFieldFirst("email",email)
+		member, err := models.NewMember().FindByFieldFirst("email", email)
 		if err != nil {
-			c.JsonResult(6006,"邮箱不存在")
+			c.JsonResult(6006, "邮箱不存在")
 		}
 		if member.Status != 0 {
-			c.JsonResult(6007,"账号已被禁用")
+			c.JsonResult(6007, "账号已被禁用")
 		}
 		if member.AuthMethod == conf.AuthMethodLDAP {
-			c.JsonResult(6011,"当前用户不支持找回密码")
+			c.JsonResult(6011, "当前用户不支持找回密码")
 		}
 
-		count,err := models.NewMemberToken().FindSendCount(email,time.Now().Add(-1*time.Hour),time.Now())
+		count, err := models.NewMemberToken().FindSendCount(email, time.Now().Add(-1*time.Hour), time.Now())
 
 		if err != nil {
 			beego.Error(err)
-			c.JsonResult(6008,"发送邮件失败")
+			c.JsonResult(6008, "发送邮件失败")
 		}
 		if count > mail_conf.MailNumber {
-			c.JsonResult(6008,"发送次数太多，请稍候再试")
+			c.JsonResult(6008, "发送次数太多，请稍候再试")
 		}
 
 		member_token := models.NewMemberToken()
 
-		member_token.Token = string(utils.Krand(32,utils.KC_RAND_KIND_ALL))
+		member_token.Token = string(utils.Krand(32, utils.KC_RAND_KIND_ALL))
 		member_token.Email = email
 		member_token.MemberId = member.MemberId
 		member_token.IsValid = false
-		if _,err := member_token.InsertOrUpdate(); err != nil {
-			c.JsonResult(6009,"邮件发送失败")
+		if _, err := member_token.InsertOrUpdate(); err != nil {
+			c.JsonResult(6009, "邮件发送失败")
 		}
 
 		data := map[string]interface{}{
-			"SITE_NAME" : c.Option["SITE_NAME"],
-			"url" : c.BaseUrl() + beego.URLFor("AccountController.FindPassword", "token",member_token.Token,"mail",email),
+			"SITE_NAME": c.Option["SITE_NAME"],
+			"url":       c.BaseUrl() + beego.URLFor("AccountController.FindPassword", "token", member_token.Token, "mail", email),
 		}
 
-		body,err := c.ExecuteViewPathTemplate("account/mail_template.tpl",data)
+		body, err := c.ExecuteViewPathTemplate("account/mail_template.tpl", data)
 		if err != nil {
 			beego.Error(err)
-			c.JsonResult(6003,"邮件发送失败")
+			c.JsonResult(6003, "邮件发送失败")
 		}
 
-		go func(mail_conf *conf.SmtpConf,email string,body string) {
+		go func(mail_conf *conf.SmtpConf, email string, body string) {
 			auth := smtp.PlainAuth(
 				"",
 				mail_conf.SmtpUserName,
@@ -215,30 +251,29 @@ func (c *AccountController) FindPassword()  {
 				mail_conf.SmtpHost,
 			)
 
-			mime := "MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n";
+			mime := "MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n"
 			subject := "Subject: 找回密码!\n"
 
 			err = smtp.SendMail(
-				mail_conf.SmtpHost + ":" + strconv.Itoa(mail_conf.SmtpPort),
+				mail_conf.SmtpHost+":"+strconv.Itoa(mail_conf.SmtpPort),
 				auth,
 				mail_conf.FormUserName,
-				[]string{ email },
-				[]byte(subject + mime +"\n" +body),
+				[]string{email},
+				[]byte(subject+mime+"\n"+body),
 			)
 			if err != nil {
-				beego.Error("邮件发送失败 => ",email,err)
+				beego.Error("邮件发送失败 => ", email, err)
 			}
-		}(mail_conf,email,body)
-
+		}(mail_conf, email, body)
 
-		c.JsonResult(0,"ok", c.BaseUrl() + beego.URLFor("AccountController.Login"))
+		c.JsonResult(0, "ok", c.BaseUrl()+beego.URLFor("AccountController.Login"))
 	}
 
 	token := c.GetString("token")
 	mail := c.GetString("mail")
 
 	if token != "" && mail != "" {
-		member_token,err := models.NewMemberToken().FindByFieldFirst("token",token)
+		member_token, err := models.NewMemberToken().FindByFieldFirst("token", token)
 
 		if err != nil {
 			beego.Error(err)
@@ -248,7 +283,7 @@ func (c *AccountController) FindPassword()  {
 		}
 		sub_time := member_token.SendTime.Sub(time.Now())
 
-		if !strings.EqualFold(member_token.Email,mail) || sub_time.Minutes() > float64(mail_conf.MailExpired) || !member_token.ValidTime.IsZero() {
+		if !strings.EqualFold(member_token.Email, mail) || sub_time.Minutes() > float64(mail_conf.MailExpired) || !member_token.ValidTime.IsZero() {
 			c.Data["ErrorMessage"] = "验证码已过期，请重新操作。"
 			c.TplName = "errors/error.tpl"
 			return
@@ -260,7 +295,7 @@ func (c *AccountController) FindPassword()  {
 	}
 }
 
-//校验邮件并修改密码.
+// 校验邮件并修改密码
 func (c *AccountController) ValidEmail() {
 	c.Prepare()
 	password1 := c.GetString("password1")
@@ -270,48 +305,48 @@ func (c *AccountController) ValidEmail() {
 	mail := c.GetString("mail")
 
 	if password1 == "" {
-		c.JsonResult(6001,"密码不能为空")
+		c.JsonResult(6001, "密码不能为空")
 	}
-	if l :=  strings.Count(password1,""); l <6 || l > 50{
-		c.JsonResult(6001,"密码不能为空且必须在6-50个字符之间")
+	if l := strings.Count(password1, ""); l < 6 || l > 50 {
+		c.JsonResult(6001, "密码不能为空且必须在6-50个字符之间")
 	}
-	if password2 == ""{
-		c.JsonResult(6002,"确认密码不能为空")
+	if password2 == "" {
+		c.JsonResult(6002, "确认密码不能为空")
 	}
 	if password1 != password2 {
-		c.JsonResult(6003,"确认密码输入不正确")
+		c.JsonResult(6003, "确认密码输入不正确")
 	}
 	if captcha == "" {
-		c.JsonResult(6004,"验证码不能为空")
+		c.JsonResult(6004, "验证码不能为空")
 	}
-	v,ok := c.GetSession(conf.CaptchaSessionName).(string);
-	if !ok || !strings.EqualFold(v,captcha){
-		c.JsonResult(6001,"验证码不正确")
+	v, ok := c.GetSession(conf.CaptchaSessionName).(string)
+	if !ok || !strings.EqualFold(v, captcha) {
+		c.JsonResult(6001, "验证码不正确")
 	}
 
 	mail_conf := conf.GetMailConfig()
-	member_token,err := models.NewMemberToken().FindByFieldFirst("token",token)
+	member_token, err := models.NewMemberToken().FindByFieldFirst("token", token)
 
 	if err != nil {
 		beego.Error(err)
-		c.JsonResult(6007,"邮件已失效")
+		c.JsonResult(6007, "邮件已失效")
 	}
 	sub_time := member_token.SendTime.Sub(time.Now())
 
-	if !strings.EqualFold(member_token.Email,mail) || sub_time.Minutes() > float64(mail_conf.MailExpired) || !member_token.ValidTime.IsZero() {
+	if !strings.EqualFold(member_token.Email, mail) || sub_time.Minutes() > float64(mail_conf.MailExpired) || !member_token.ValidTime.IsZero() {
 
-		c.JsonResult(6008,"验证码已过期，请重新操作。")
+		c.JsonResult(6008, "验证码已过期，请重新操作。")
 	}
-	member ,err := models.NewMember().Find(member_token.MemberId)
-	if err != nil{
+	member, err := models.NewMember().Find(member_token.MemberId)
+	if err != nil {
 		beego.Error(err)
-		c.JsonResult(6005,"用户不存在")
+		c.JsonResult(6005, "用户不存在")
 	}
-	hash ,err := utils.PasswordHash(password1);
+	hash, err := utils.PasswordHash(password1)
 
-	if  err != nil {
+	if err != nil {
 		beego.Error(err)
-		c.JsonResult(6006,"保存密码失败")
+		c.JsonResult(6006, "保存密码失败")
 	}
 
 	member.Password = hash
@@ -321,25 +356,24 @@ func (c *AccountController) ValidEmail() {
 	member_token.IsValid = true
 	member_token.InsertOrUpdate()
 
-	if  err != nil {
+	if err != nil {
 		beego.Error(err)
-		c.JsonResult(6006,"保存密码失败")
+		c.JsonResult(6006, "保存密码失败")
 	}
-	c.JsonResult(0,"ok",c.BaseUrl() + beego.URLFor("AccountController.Login"))
+	c.JsonResult(0, "ok", c.BaseUrl()+beego.URLFor("AccountController.Login"))
 }
 
+// Logout 退出登录
+func (c *AccountController) Logout() {
+	c.SetMember(models.Member{})
 
-// Logout 退出登录.
-func (c *AccountController) Logout(){
-	c.SetMember(models.Member{});
+	c.SetSecureCookie(conf.GetAppKey(), "login", "", -3600)
 
-	c.SetSecureCookie(conf.GetAppKey(),"login","",-3600)
-	
-	c.Redirect(beego.URLFor("AccountController.Login"),302)
+	c.Redirect(beego.URLFor("AccountController.Login"), 302)
 }
 
-//验证码.
-func (c *AccountController) Captcha()  {
+// 验证码
+func (c *AccountController) Captcha() {
 	c.Prepare()
 
 	captchaImage, err := gocaptcha.NewCaptchaImage(140, 40, gocaptcha.RandLightColor())
@@ -351,17 +385,16 @@ func (c *AccountController) Captcha()  {
 
 	captchaImage.DrawNoise(gocaptcha.CaptchaComplexLower)
 
-	//captchaImage.DrawTextNoise(gocaptcha.CaptchaComplexHigh)
+	// captchaImage.DrawTextNoise(gocaptcha.CaptchaComplexHigh)
 	txt := gocaptcha.RandText(4)
 
-	c.SetSession(conf.CaptchaSessionName,txt)
+	c.SetSession(conf.CaptchaSessionName, txt)
 
 	captchaImage.DrawText(txt)
-	//captchaImage.Drawline(3);
+	// captchaImage.Drawline(3);
 	captchaImage.DrawBorder(gocaptcha.ColorToRGB(0x17A7A7A))
-	//captchaImage.DrawHollowLine()
-
+	// captchaImage.DrawHollowLine()
 
 	captchaImage.SaveImage(c.Ctx.ResponseWriter, gocaptcha.ImageFormatJpeg)
 	c.StopRun()
-}
+}

controllers/manager.go

@@ -248,12 +248,15 @@ func (c *ManagerController) DeleteMember()  {
 		c.JsonResult(404,"参数错误")
 	}
 
-	_ ,err := models.NewMember().Find(member_id)
+	member ,err := models.NewMember().Find(member_id)
 
 	if err != nil {
 		beego.Error(err)
 		c.JsonResult(500,"用户不存在")
 	}
+	if member.Role == conf.MemberSuperRole {
+		c.JsonResult(500,"不能删除超级管理员")
+	}
 	superMember,err := models.NewMember().FindByFieldFirst("role",0)
 
 	if err != nil {

docker-compose.yml

@@ -0,0 +1,37 @@
+version: '2'
+
+services:
+
+### Applications Code Container #############################
+
+    applications:
+      image: tianon/true
+### Workspace Utilities Container ###########################
+
+    mindoc:
+      build:
+        context: ./
+      env_file: .env
+      environment:
+        - MYSQL_PORT_3306_TCP_ADDR=${MYSQL_PORT_3306_TCP_ADDR}
+        - MYSQL_PORT_3306_TCP_PORT=${MYSQL_PORT_3306_TCP_PORT}
+        - MYSQL_INSTANCE_NAME=${MYSQL_INSTANCE_NAME}
+        - MYSQL_USERNAME=${MYSQL_USERNAME}
+        - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+        - HTTP_PORT=${HTTP_PORT}
+      ports:
+        - "${HTTP_PORT}:8181"
+      volumes_from:
+        - applications
+      tty: true
+      networks:
+        - backend
+
+
+### Networks Setup ############################################
+
+networks:
+  backend:
+    driver: "bridge"
+
+

env-example

@@ -0,0 +1,21 @@
+###########################################################
+# General Setup
+###########################################################
+
+### Application Path ###################################################################################################
+# Point to your code, will be available at `/var/www/mindoc`.
+
+APPLICATION=../mindoc_volume/
+
+### GLOBAL ENVIRONMENT #################################################################################################
+
+### 数据库配置 ，如果你的数据库不在容器内或没有用 --link过 那必须要写外部数据库ip
+MYSQL_PORT_3306_TCP_ADDR=192.168.4.25
+MYSQL_PORT_3306_TCP_PORT=3306
+MYSQL_INSTANCE_NAME=mindoc_db
+MYSQL_USERNAME=root
+MYSQL_PASSWORD=root
+# expose port
+HTTP_PORT=8181
+
+

models/member.go

@@ -376,11 +376,44 @@ func (m *Member) Delete(oldId int,newId int) error {
 		o.Rollback()
 		return err
 	}
-	_,err = o.Raw("UPDATE md_relationship SET member_id = ? WHERE member_id = ?",newId,oldId).Exec()
-	if err != nil {
-		o.Rollback()
-		return err
+	//_,err = o.Raw("UPDATE md_relationship SET member_id = ? WHERE member_id = ?",newId,oldId).Exec()
+	//if err != nil {
+	//
+	//	if err != nil {
+	//		o.Rollback()
+	//		return err
+	//	}
+	//}
+	var relationship_list []*Relationship
+
+	_,err = o.QueryTable(NewRelationship().TableNameWithPrefix()).Filter("member_id",oldId).All(&relationship_list)
+
+	if err == nil {
+		for _,relationship := range relationship_list {
+			//如果存在创始人，则删除
+			if relationship.RoleId == 0 {
+				rel := NewRelationship()
+
+				err = o.QueryTable(relationship.TableNameWithPrefix()).Filter("book_id",relationship.BookId).Filter("member_id",newId).One(rel)
+				if err == nil {
+					if _,err := o.Delete(relationship) ; err != nil{
+						beego.Error(err)
+					}
+					relationship.RelationshipId = rel.RelationshipId
+				}
+				relationship.MemberId = newId
+				relationship.RoleId = 0
+				if _,err := o.Update(relationship) ; err != nil{
+					beego.Error(err)
+				}
+			}else{
+				if _,err := o.Delete(relationship) ; err != nil{
+					beego.Error(err)
+				}
+			}
+		}
 	}
+
 	if err = o.Commit();err != nil {
 		o.Rollback()
 		return err

routers/router.go

@@ -5,86 +5,85 @@ import (
 	"github.com/lifei6671/mindoc/controllers"
 )
 
-func init()  {
-	beego.Router("/",&controllers.HomeController{},"*:Index")
-
-	beego.Router("/login", &controllers.AccountController{},"*:Login")
-	beego.Router("/logout", &controllers.AccountController{},"*:Logout")
-	beego.Router("/register", &controllers.AccountController{},"*:Register")
-	beego.Router("/find_password", &controllers.AccountController{},"*:FindPassword")
-	beego.Router("/valid_email", &controllers.AccountController{},"post:ValidEmail")
-	beego.Router("/captcha", &controllers.AccountController{},"*:Captcha")
-
-	beego.Router("/manager", &controllers.ManagerController{},"*:Index")
-	beego.Router("/manager/users", &controllers.ManagerController{},"*:Users")
-	beego.Router("/manager/users/edit/:id", &controllers.ManagerController{},"*:EditMember")
-	beego.Router("/manager/member/create", &controllers.ManagerController{},"post:CreateMember")
-	beego.Router("/manager/member/delete", &controllers.ManagerController{},"post:DeleteMember")
-	beego.Router("/manager/member/update-member-status",&controllers.ManagerController{},"post:UpdateMemberStatus")
-	beego.Router("/manager/member/change-member-role", &controllers.ManagerController{},"post:ChangeMemberRole")
-	beego.Router("/manager/books", &controllers.ManagerController{},"*:Books")
-	beego.Router("/manager/books/edit/:key", &controllers.ManagerController{},"*:EditBook")
-	beego.Router("/manager/books/delete", &controllers.ManagerController{},"*:DeleteBook")
-	beego.Router("/manager/comments", &controllers.ManagerController{},"*:Comments")
-	beego.Router("/manager/books/token", &controllers.ManagerController{},"post:CreateToken")
-	beego.Router("/manager/setting",&controllers.ManagerController{},"*:Setting")
-	beego.Router("/manager/books/transfer", &controllers.ManagerController{},"post:Transfer")
-	beego.Router("/manager/books/open", &controllers.ManagerController{},"post:PrivatelyOwned")
-	beego.Router("/manager/attach/list", &controllers.ManagerController{},"*:AttachList")
-	beego.Router("/manager/attach/detailed/:id", &controllers.ManagerController{},"*:AttachDetailed")
-	beego.Router("/manager/attach/delete", &controllers.ManagerController{},"post:AttachDelete")
-
-
-	beego.Router("/setting", &controllers.SettingController{},"*:Index")
-	beego.Router("/setting/password", &controllers.SettingController{},"*:Password")
-	beego.Router("/setting/upload", &controllers.SettingController{},"*:Upload")
-
-	beego.Router("/book", &controllers.BookController{},"*:Index")
-	beego.Router("/book/:key/dashboard", &controllers.BookController{},"*:Dashboard")
-	beego.Router("/book/:key/setting", &controllers.BookController{},"*:Setting")
-	beego.Router("/book/:key/users", &controllers.BookController{},"*:Users")
-	beego.Router("/book/:key/release", &controllers.BookController{},"post:Release")
-	beego.Router("/book/:key/sort", &controllers.BookController{},"post:SaveSort")
-
-	beego.Router("/book/create", &controllers.BookController{},"*:Create")
-	beego.Router("/book/users/create", &controllers.BookMemberController{},"post:AddMember")
-	beego.Router("/book/users/change", &controllers.BookMemberController{},"post:ChangeRole")
-	beego.Router("/book/users/delete", &controllers.BookMemberController{},"post:RemoveMember")
-
-	beego.Router("/book/setting/save", &controllers.BookController{},"post:SaveBook")
-	beego.Router("/book/setting/open", &controllers.BookController{},"post:PrivatelyOwned")
-	beego.Router("/book/setting/transfer", &controllers.BookController{},"post:Transfer")
-	beego.Router("/book/setting/upload", &controllers.BookController{},"post:UploadCover")
-	beego.Router("/book/setting/token", &controllers.BookController{},"post:CreateToken")
-	beego.Router("/book/setting/delete", &controllers.BookController{},"post:Delete")
-
-	beego.Router("/api/attach/remove/", &controllers.DocumentController{},"post:RemoveAttachment")
-	beego.Router("/api/:key/edit/?:id", &controllers.DocumentController{},"*:Edit")
-	beego.Router("/api/upload",&controllers.DocumentController{},"post:Upload")
-	beego.Router("/api/:key/create",&controllers.DocumentController{},"post:Create")
-	beego.Router("/api/:key/delete", &controllers.DocumentController{},"post:Delete")
-	beego.Router("/api/:key/content/?:id",&controllers.DocumentController{},"*:Content")
-	beego.Router("/api/:key/compare/:id", &controllers.DocumentController{},"*:Compare")
-
-	beego.Router("/history/get", &controllers.DocumentController{},"get:History")
-	beego.Router("/history/delete", &controllers.DocumentController{},"*:DeleteHistory")
-	beego.Router("/history/restore", &controllers.DocumentController{},"*:RestoreHistory")
-
-	beego.Router("/docs/:key", &controllers.DocumentController{},"*:Index")
-	beego.Router("/docs/:key/:id", &controllers.DocumentController{},"*:Read")
-	beego.Router("/docs/:key/search", &controllers.DocumentController{},"post:Search")
-	beego.Router("/export/:key", &controllers.DocumentController{},"*:Export")
-	beego.Router("/qrcode/:key.png",&controllers.DocumentController{},"get:QrCode")
-
-	beego.Router("/attach_files/:key/:attach_id",&controllers.DocumentController{},"get:DownloadAttachment")
-
-	beego.Router("/comment/create", &controllers.CommentController{},"post:Create")
-	beego.Router("/comment/lists", &controllers.CommentController{},"get:Lists")
-	beego.Router("/comment/index", &controllers.CommentController{},"*:Index")
-
-	beego.Router("/search",&controllers.SearchController{},"get:Index")
-
-	beego.Router("/tag/:key", &controllers.LabelController{},"get:Index")
-	beego.Router("/tags", &controllers.LabelController{},"get:List")
+func init() {
+	beego.Router("/", &controllers.HomeController{}, "*:Index")
+
+	beego.Router("/login", &controllers.AccountController{}, "*:Login")
+	beego.Router("/logout", &controllers.AccountController{}, "*:Logout")
+	beego.Router("/register", &controllers.AccountController{}, "*:Register")
+	beego.Router("/find_password", &controllers.AccountController{}, "*:FindPassword")
+	beego.Router("/valid_email", &controllers.AccountController{}, "post:ValidEmail")
+	beego.Router("/captcha", &controllers.AccountController{}, "*:Captcha")
+
+	beego.Router("/manager", &controllers.ManagerController{}, "*:Index")
+	beego.Router("/manager/users", &controllers.ManagerController{}, "*:Users")
+	beego.Router("/manager/users/edit/:id", &controllers.ManagerController{}, "*:EditMember")
+	beego.Router("/manager/member/create", &controllers.ManagerController{}, "post:CreateMember")
+	beego.Router("/manager/member/delete", &controllers.ManagerController{}, "post:DeleteMember")
+	beego.Router("/manager/member/update-member-status", &controllers.ManagerController{}, "post:UpdateMemberStatus")
+	beego.Router("/manager/member/change-member-role", &controllers.ManagerController{}, "post:ChangeMemberRole")
+	beego.Router("/manager/books", &controllers.ManagerController{}, "*:Books")
+	beego.Router("/manager/books/edit/:key", &controllers.ManagerController{}, "*:EditBook")
+	beego.Router("/manager/books/delete", &controllers.ManagerController{}, "*:DeleteBook")
+	beego.Router("/manager/comments", &controllers.ManagerController{}, "*:Comments")
+	beego.Router("/manager/books/token", &controllers.ManagerController{}, "post:CreateToken")
+	beego.Router("/manager/setting", &controllers.ManagerController{}, "*:Setting")
+	beego.Router("/manager/books/transfer", &controllers.ManagerController{}, "post:Transfer")
+	beego.Router("/manager/books/open", &controllers.ManagerController{}, "post:PrivatelyOwned")
+	beego.Router("/manager/attach/list", &controllers.ManagerController{}, "*:AttachList")
+	beego.Router("/manager/attach/detailed/:id", &controllers.ManagerController{}, "*:AttachDetailed")
+	beego.Router("/manager/attach/delete", &controllers.ManagerController{}, "post:AttachDelete")
+
+	beego.Router("/setting", &controllers.SettingController{}, "*:Index")
+	beego.Router("/setting/password", &controllers.SettingController{}, "*:Password")
+	beego.Router("/setting/upload", &controllers.SettingController{}, "*:Upload")
+
+	beego.Router("/book", &controllers.BookController{}, "*:Index")
+	beego.Router("/book/:key/dashboard", &controllers.BookController{}, "*:Dashboard")
+	beego.Router("/book/:key/setting", &controllers.BookController{}, "*:Setting")
+	beego.Router("/book/:key/users", &controllers.BookController{}, "*:Users")
+	beego.Router("/book/:key/release", &controllers.BookController{}, "post:Release")
+	beego.Router("/book/:key/sort", &controllers.BookController{}, "post:SaveSort")
+
+	beego.Router("/book/create", &controllers.BookController{}, "*:Create")
+	beego.Router("/book/users/create", &controllers.BookMemberController{}, "post:AddMember")
+	beego.Router("/book/users/change", &controllers.BookMemberController{}, "post:ChangeRole")
+	beego.Router("/book/users/delete", &controllers.BookMemberController{}, "post:RemoveMember")
+
+	beego.Router("/book/setting/save", &controllers.BookController{}, "post:SaveBook")
+	beego.Router("/book/setting/open", &controllers.BookController{}, "post:PrivatelyOwned")
+	beego.Router("/book/setting/transfer", &controllers.BookController{}, "post:Transfer")
+	beego.Router("/book/setting/upload", &controllers.BookController{}, "post:UploadCover")
+	beego.Router("/book/setting/token", &controllers.BookController{}, "post:CreateToken")
+	beego.Router("/book/setting/delete", &controllers.BookController{}, "post:Delete")
+
+	beego.Router("/api/attach/remove/", &controllers.DocumentController{}, "post:RemoveAttachment")
+	beego.Router("/api/:key/edit/?:id", &controllers.DocumentController{}, "*:Edit")
+	beego.Router("/api/upload", &controllers.DocumentController{}, "post:Upload")
+	beego.Router("/api/:key/create", &controllers.DocumentController{}, "post:Create")
+	beego.Router("/api/:key/delete", &controllers.DocumentController{}, "post:Delete")
+	beego.Router("/api/:key/content/?:id", &controllers.DocumentController{}, "*:Content")
+	beego.Router("/api/:key/compare/:id", &controllers.DocumentController{}, "*:Compare")
+
+	beego.Router("/history/get", &controllers.DocumentController{}, "get:History")
+	beego.Router("/history/delete", &controllers.DocumentController{}, "*:DeleteHistory")
+	beego.Router("/history/restore", &controllers.DocumentController{}, "*:RestoreHistory")
+
+	beego.Router("/docs/:key", &controllers.DocumentController{}, "*:Index")
+	beego.Router("/docs/:key/:id", &controllers.DocumentController{}, "*:Read")
+	beego.Router("/docs/:key/search", &controllers.DocumentController{}, "post:Search")
+	beego.Router("/export/:key", &controllers.DocumentController{}, "*:ExportBook")
+	beego.Router("/export/:key/:id", &controllers.DocumentController{}, "*:ExportDoc")
+	beego.Router("/qrcode/:key.png", &controllers.DocumentController{}, "get:QrCode")
+
+	beego.Router("/attach_files/:key/:attach_id", &controllers.DocumentController{}, "get:DownloadAttachment")
+
+	beego.Router("/comment/create", &controllers.CommentController{}, "post:Create")
+	beego.Router("/comment/lists", &controllers.CommentController{}, "get:Lists")
+	beego.Router("/comment/index", &controllers.CommentController{}, "*:Index")
+
+	beego.Router("/search", &controllers.SearchController{}, "get:Index")
+
+	beego.Router("/tag/:key", &controllers.LabelController{}, "get:Index")
+	beego.Router("/tags", &controllers.LabelController{}, "get:List")
 }
-

static/css/kancloud.css

@@ -417,7 +417,8 @@ table>tbody>tr:hover{
 }
 .manual-article .article-head {
     position: relative;
-    zoom:1;padding: 10px 20px
+    zoom: 1;
+    padding: 10px 20px
 }
 .manual-reader .book-title{
     color: #333333;
@@ -430,7 +431,7 @@ table>tbody>tr:hover{
 .manual-article .article-head h1 {
     margin: 0;
     font-size: 20px;
-    font-weight: 200;
+    font-weight: 300;
     text-align: center;
     line-height: 30px;
     overflow: hidden;
@@ -438,6 +439,17 @@ table>tbody>tr:hover{
     white-space: nowrap;
     color: #444
 }
+.manual-article .article-head h3 {
+    margin: 0;
+    font-size: 12px;
+    font-weight: 200;
+    text-align: center;
+    line-height: 18px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #444
+}
 .manual-article .article-content{
     min-width: 980px;
     max-width: 98%;

static/js/editor.js

@@ -135,7 +135,6 @@ function pushDocumentCategory($node) {
         if(item.id === $node.id){
 
             window.documentCategory[index] = $node;
-            console.log( window.documentCategory[index]);
             return;
         }
     }

static/js/html-editor.js

@@ -48,6 +48,14 @@ $(function () {
         }
     };
 
+    window.editor.onchange = function () {
+        // 判断内容是否改变
+        if (window.source !== this.$txt.html()) {
+            window.editor.menus.save.$domNormal.addClass('selected');
+        } else {
+            window.editor.menus.save.$domNormal.removeClass('selected');
+        }
+    };
 
     window.editor.create();
 
@@ -72,6 +80,8 @@ $(function () {
                 window.isLoad = true;
                 window.editor.clear();
                 window.editor.$txt.html(res.data.content);
+                // 将原始内容备份
+                window.source = res.data.content;
                 var node = { "id" : res.data.doc_id,'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id ,"text" : res.data.doc_name,"identify" : res.data.identify,"version" : res.data.version};
                 pushDocumentCategory(node);
                 window.selectNode = node;
@@ -136,6 +146,10 @@ $(function () {
                             break;
                         }
                     }
+                    // 更新内容备份
+                    window.source = res.data.content;
+                    // 触发编辑器 onchange 回调函数
+                    window.editor.onchange();
                     if(typeof callback === "function"){
                         callback();
                     }
@@ -253,7 +267,7 @@ $(function () {
     }).on('loaded.jstree', function () {
         window.treeCatalog = $(this).jstree();
     }).on('select_node.jstree', function (node, selected, event) {
-        if($("#markdown-save").hasClass('change')) {
+        if(window.editor.menus.save.$domNormal.hasClass('selected')) {
             if(confirm("编辑内容未保存，需要保存吗？")){
                 saveDocument(false,function () {
                     loadDocument(selected);
@@ -269,6 +283,11 @@ $(function () {
 
     window.releaseBook = function () {
         if(Object.prototype.toString.call(window.documentCategory) === '[object Array]' && window.documentCategory.length > 0){
+            if(window.editor.menus.save.$domNormal.hasClass('selected')) {
+                if(confirm("编辑内容未保存，需要保存吗？")) {
+                    saveDocument();
+                }
+            }
             $.ajax({
                 url : window.releaseURL,
                 data :{"identify" : window.book.identify },

static/js/kancloud.js

@@ -4,51 +4,58 @@
  * @param $id
  * @param $callback
  */
-function loadDocument($url,$id,$callback) {
+function loadDocument($url, $id, $callback) {
     $.ajax({
         url : $url,
         type : "GET",
-        beforeSend :function (xhr) {
+        beforeSend : function (xhr) {
             var body = events.data('body_' + $id);
             var title = events.data('title_' + $id);
             var doc_title = events.data('doc_title_' + $id);
+            var doc_info = events.data('doc_info_' + $id);
 
-            if(body && title && doc_title){
-
+            if (body && title && doc_title) {
                 if (typeof $callback === "function") {
                     body = $callback(body);
                 }
+
                 $("#page-content").html(body);
                 $("title").text(title);
                 $("#article-title").text(doc_title);
+                $("#article-info").text(doc_info);
 
-                events.trigger('article.open',{ $url : $url, $init : false , $id : $id });
+                events.trigger('article.open', { $url : $url, $init : false, $id : $id });
 
                 return false;
             }
             NProgress.start();
         },
         success : function (res) {
-            if(res.errcode === 0){
+            if (res.errcode === 0) {
                 var body = res.data.body;
                 var doc_title = res.data.doc_title;
                 var title = res.data.title;
+                var doc_info = res.data.doc_info;
 
                 $body = body;
-                if (typeof $callback === "function" ){
+                if (typeof $callback === "function" ) {
                     $body = $callback(body);
                 }
+
                 $("#page-content").html($body);
                 $("title").text(title);
                 $("#article-title").text(doc_title);
+                $("#article-info").text(doc_info);
 
-                events.data('body_' + $id,body);
-                events.data('title_' + $id,title);
-                events.data('doc_title_' + $id,doc_title);
-
-                events.trigger('article.open',{ $url : $url, $init : true, $id : $id });
+                events.data('body_' + $id, body);
+                events.data('title_' + $id, title);
+                events.data('doc_title_' + $id, doc_title);
+                events.data('doc_info_' + $id, doc_info);
 
-            }else{
+                events.trigger('article.open', { $url : $url, $init : true, $id : $id });
+            } else if (res.errcode === 6000) {
+                window.location.href = "/";
+            } else {
                 layer.msg("加载失败");
             }
         },
@@ -74,9 +81,9 @@ $(function () {
     });
     $(".manual-right").scroll(function () {
         var top = $(".manual-right").scrollTop();
-        if(top > 100){
+        if (top > 100) {
             $(".view-backtop").addClass("active");
-        }else{
+        } else {
             $(".view-backtop").removeClass("active");
         }
     });
@@ -85,7 +92,7 @@ $(function () {
     initHighlighting();
 
     window.jsTree = $("#sidebar").jstree({
-        'plugins':["wholerow","types"],
+        'plugins' : ["wholerow", "types"],
         "types": {
             "default" : {
                 "icon" : false  // 删除默认图标
@@ -93,31 +100,31 @@ $(function () {
         },
         'core' : {
             'check_callback' : true,
-            "multiple" : false ,
+            "multiple" : false,
             'animation' : 0
         }
-    }).on('select_node.jstree',function (node,selected,event) {
+    }).on('select_node.jstree', function (node, selected, event) {
         $(".m-manual").removeClass('manual-mobile-show-left');
         var url = selected.node.a_attr.href;
 
-        if(url === window.location.href){
+        if (url === window.location.href) {
             return false;
         }
-        loadDocument(url,selected.node.id);
 
+        loadDocument(url, selected.node.id);
     });
 
-    $("#slidebar").on("click",function () {
+    $("#slidebar").on("click", function () {
         $(".m-manual").addClass('manual-mobile-show-left');
     });
-    $(".manual-mask").on("click",function () {
+    $(".manual-mask").on("click", function () {
         $(".m-manual").removeClass('manual-mobile-show-left');
     });
 
     /**
      * 关闭侧边栏
      */
-    $(".manual-fullscreen-switch").on("click",function () {
+    $(".manual-fullscreen-switch").on("click", function () {
         isFullScreen = !isFullScreen;
         if (isFullScreen) {
             $(".m-manual").addClass('manual-fullscreen-active');
@@ -126,24 +133,23 @@ $(function () {
         }
     });
 
-    //处理打开事件
+    // 处理打开事件
     events.on('article.open', function (event, $param) {
-
         if ('pushState' in history) {
             if ($param.$init === false) {
-                window.history.replaceState($param , $param.$id , $param.$url);
+                window.history.replaceState($param, $param.$id, $param.$url);
             } else {
-                window.history.pushState($param, $param.$id , $param.$url);
+                window.history.pushState($param, $param.$id, $param.$url);
             }
-
         } else {
             window.location.hash = $param.$url;
         }
+
         initHighlighting();
         $(".manual-right").scrollTop(0);
     });
 
-    $(".navg-item[data-mode]").on("click",function () {
+    $(".navg-item[data-mode]").on("click", function () {
         var mode = $(this).data('mode');
         $(this).siblings().removeClass('active').end().addClass('active');
         $(".m-manual").removeClass("manual-mode-view manual-mode-collect manual-mode-search").addClass("manual-mode-" + mode);
@@ -155,25 +161,25 @@ $(function () {
     $("#searchForm").ajaxForm({
         beforeSubmit : function () {
             var keyword = $.trim($("#searchForm").find("input[name='keyword']").val());
-            if(keyword === ""){
+            if (keyword === "") {
                 $(".search-empty").show();
                 $("#searchList").html("");
                 return false;
             }
-            $("#btnSearch").attr("disabled","disabled").find("i").removeClass("fa-search").addClass("loading");
+            $("#btnSearch").attr("disabled", "disabled").find("i").removeClass("fa-search").addClass("loading");
             window.keyword = keyword;
         },
-        success :function (res) {
+        success : function (res) {
             var html = "";
-            if(res.errcode === 0){
-                for(var i in res.data){
+            if (res.errcode === 0) {
+                for(var i in res.data) {
                     var item = res.data[i];
-                    html += '<li><a href="javascript:;" title="'+ item.doc_name +'" data-id="'+ item.doc_id+'"> '+ item.doc_name +' </a></li>';
+                    html += '<li><a href="javascript:;" title="' + item.doc_name + '" data-id="' + item.doc_id + '"> ' + item.doc_name + ' </a></li>';
                 }
             }
-            if(html !== ""){
+            if (html !== "") {
                 $(".search-empty").hide();
-            }else{
+            } else {
                 $(".search-empty").show();
             }
             $("#searchList").html(html);
@@ -184,7 +190,6 @@ $(function () {
     });
 
     window.onpopstate = function (e) {
-
         var $param = e.state;
         console.log($param);
         if($param.hasOwnProperty("$url")) {
@@ -192,18 +197,18 @@ $(function () {
 
             window.jsTree.jstree().select_node({ id : $param.$id });
             $param.$init = false;
-            //events.trigger('article.open', $param );
-        }else{
+            // events.trigger('article.open', $param);
+        } else {
             console.log($param);
         }
     };
     try {
         var $node = window.jsTree.jstree().get_selected();
         if (typeof $node === "object") {
-            $node = window.jsTree.jstree().get_node({id: $node[0]});
-            events.trigger('article.open', {$url: $node.a_attr.href, $init: true, $id: $node.a_attr.id});
+            $node = window.jsTree.jstree().get_node({ id: $node[0] });
+            events.trigger('article.open', { $url: $node.a_attr.href, $init: true, $id: $node.a_attr.id });
         }
-    }catch (e){
+    } catch (e) {
         console.log(e);
     }
 });

static/js/markdown.js

@@ -1,31 +1,32 @@
 $(function () {
     window.addDocumentModalFormHtml = $(this).find("form").html();
     window.editor = editormd("docEditor", {
-        width : "100%",
-        height : "100%",
-        path : "/static/editor.md/lib/",
-        toolbar : true,
-        placeholder: "本编辑器支持Markdown编辑，左边编写，右边预览",
+        width: "100%",
+        height: "100%",
+        path: "/static/editor.md/lib/",
+        toolbar: true,
+        placeholder: "本编辑器支持 Markdown 编辑，左边编写，右边预览。",
         imageUpload: true,
         imageFormats: ["jpg", "jpeg", "gif", "png", "JPG", "JPEG", "GIF", "PNG"],
-        imageUploadURL: window.imageUploadURL ,
-        toolbarModes : "full",
+        imageUploadURL: window.imageUploadURL,
+        toolbarModes: "full",
         fileUpload: true,
-        fileUploadURL : window.fileUploadURL,
-        taskList : true,
-        flowChart : true,
-        htmlDecode : "style,script,iframe,title,onmouseover,onmouseout,style",
-        lineNumbers : false,
-        tocStartLevel : 1,
-        tocm : true,
-        saveHTMLToTextarea : true,
-        onload : function() {
+        fileUploadURL: window.fileUploadURL,
+        taskList: true,
+        flowChart: true,
+        htmlDecode: "style,script,iframe,title,onmouseover,onmouseout,style",
+        lineNumbers: false,
+        tocStartLevel: 1,
+        tocm: true,
+        saveHTMLToTextarea: true,
+
+        onload: function() {
             this.hideToolbar();
             var keyMap = {
                 "Ctrl-S": function(cm) {
                     saveDocument(false);
                 },
-                "Cmd-S" : function(cm){
+                "Cmd-S": function(cm){
                     saveDocument(false);
                 },
                 "Ctrl-A": function(cm) {
@@ -35,7 +36,7 @@ $(function () {
             this.addKeyMap(keyMap);
 
             var $select_node_id = window.treeCatalog.get_selected();
-            if($select_node_id) {
+            if ($select_node_id) {
                 var $select_node = window.treeCatalog.get_node($select_node_id[0])
                 if ($select_node) {
                     $select_node.node = {
@@ -45,20 +46,21 @@ $(function () {
                     loadDocument($select_node);
                 }
             }
-            uploadImage("docEditor",function ($state, $res) {
-                if($state === "before"){
+
+            uploadImage("docEditor", function ($state, $res) {
+                if ($state === "before") {
                     return layer.load(1, {
-                        shade: [0.1,'#fff'] //0.1透明度的白色背景
+                        shade: [0.1, '#fff'] // 0.1 透明度的白色背景
                     });
-                }else if($state === "success"){
-                    if($res.errcode === 0) {
+                } else if ($state === "success") {
+                    if ($res.errcode === 0) {
                         var value = '![](' + $res.url + ')';
                         window.editor.insertValue(value);
                     }
                 }
             });
         },
-        onchange : function () {
+        onchange: function () {
             resetEditorChanged(true);
         }
     });
@@ -66,56 +68,50 @@ $(function () {
     /**
      * 实现标题栏操作
      */
-    $("#editormd-tools").on("click","a[class!='disabled']",function () {
+    $("#editormd-tools").on("click", "a[class!='disabled']", function () {
        var name = $(this).find("i").attr("name");
-       if(name === "attachment"){
+       if (name === "attachment") {
            $("#uploadAttachModal").modal("show");
-       }else if(name === "history"){
+       } else if (name === "history") {
            window.documentHistory();
-       }else if(name === "save"){
+       } else if (name === "save") {
             saveDocument(false);
-       }else if(name === "template"){
+       } else if (name === "template") {
            $("#documentTemplateModal").modal("show");
-       }else if(name === "sidebar"){
-            $("#manualCategory").toggle(0,"swing",function () {
-
+       } else if (name === "sidebar") {
+            $("#manualCategory").toggle(0, "swing", function () {
                 var $then = $("#manualEditorContainer");
                 var left = parseInt($then.css("left"));
-                if(left > 0){
+                if (left > 0) {
                     window.editorContainerLeft = left;
-                    $then.css("left","0");
-                }else{
-                    $then.css("left",window.editorContainerLeft + "px");
+                    $then.css("left", "0");
+                } else {
+                    $then.css("left", window.editorContainerLeft + "px");
                 }
                 window.editor.resize();
             });
-       }else if(name === "release"){
-            if(Object.prototype.toString.call(window.documentCategory) === '[object Array]' && window.documentCategory.length > 0){
-                $.ajax({
-                    url : window.releaseURL,
-                    data :{"identify" : window.book.identify },
-                    type : "post",
-                    dataType : "json",
-                    success : function (res) {
-                        if(res.errcode === 0){
-                            layer.msg("发布任务已推送到任务队列，稍后将在后台执行。");
-                        }else{
-                            layer.msg(res.message);
-                        }
+       } else if (name === "release") {
+            if (Object.prototype.toString.call(window.documentCategory) === '[object Array]' && window.documentCategory.length > 0) {
+                if ($("#markdown-save").hasClass('change')) {
+                    var comfirm_result = confirm("编辑内容未保存，需要保存吗？")
+                    if (comfirm_result) {
+                        saveDocument(false, releaseBook);
+                        return;
                     }
-                });
-            }else{
+                }
+
+                releaseBook();
+            } else {
                 layer.msg("没有需要发布的文档")
             }
-       }else if(name === "tasks") {
-           //插入GFM任务列表
+       } else if (name === "tasks") {
+           // 插入 GFM 任务列表
            var cm = window.editor.cm;
            var selection = cm.getSelection();
 
            if (selection === "") {
                cm.replaceSelection("- [x] " + selection);
-           }
-           else {
+           } else {
                var selectionText = selection.split("\n");
 
                for (var i = 0, len = selectionText.length; i < len; i++) {
@@ -123,7 +119,7 @@ $(function () {
                }
                cm.replaceSelection(selectionText.join("\n"));
            }
-       }else {
+       } else {
            var action = window.editor.toolbarHandlers[name];
 
            if (action !== "undefined") {
@@ -139,23 +135,23 @@ $(function () {
      */
     window.loadDocument = function($node) {
         var index = layer.load(1, {
-            shade: [0.1,'#fff'] //0.1透明度的白色背景
+            shade: [0.1, '#fff'] // 0.1 透明度的白色背景
         });
 
         $.get(window.editURL + $node.node.id ).done(function (res) {
             layer.close(index);
 
             resetEditor();
-            if(res.errcode === 0){
+            if (res.errcode === 0) {
                 window.isLoad = true;
                 window.editor.clear();
                 window.editor.insertValue(res.data.markdown);
-                window.editor.setCursor({line:0, ch:0});
-                var node = { "id" : res.data.doc_id,'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id ,"text" : res.data.doc_name,"identify" : res.data.identify,"version" : res.data.version};
+                window.editor.setCursor({ line : 0, ch : 0 });
+                var node = { "id": res.data.doc_id, 'parent': res.data.parent_id === 0 ? '#' : res.data.parent_id, "text": res.data.doc_name, "identify": res.data.identify, "version": res.data.version };
                 pushDocumentCategory(node);
                 window.selectNode = node;
                 pushVueLists(res.data.attach);
-            }else{
+            } else {
                 layer.msg("文档加载失败");
             }
         }).fail(function () {
@@ -168,66 +164,82 @@ $(function () {
      * 保存文档到服务器
      * @param $is_cover 是否强制覆盖
      */
-    function saveDocument($is_cover,callback) {
+    function saveDocument($is_cover, callback) {
         var index = null;
         var node = window.selectNode;
         var content = window.editor.getMarkdown();
         var html = window.editor.getPreviewedHTML();
         var version = "";
 
-        if(!node){
+        if (!node) {
             layer.msg("获取当前文档信息失败");
             return;
         }
+
         var doc_id = parseInt(node.id);
 
-        for(var i in window.documentCategory){
+        for (var i in window.documentCategory) {
             var item = window.documentCategory[i];
 
-            if(item.id === doc_id){
+            if (item.id === doc_id) {
                 version = item.version;
                 break;
             }
         }
         $.ajax({
-            beforeSend  : function () {
-                index = layer.load(1, {shade: [0.1,'#fff'] });
+            beforeSend: function () {
+                index = layer.load(1, { shade: [0.1, '#fff'] });
             },
-            url :  window.editURL,
-            data : {"identify" : window.book.identify,"doc_id" : doc_id,"markdown" : content,"html" : html,"cover" : $is_cover ? "yes":"no","version": version},
-            type :"post",
-            dataType :"json",
-            success : function (res) {
+            url: window.editURL,
+            data: { "identify": window.book.identify, "doc_id": doc_id, "markdown": content, "html": html, "cover": $is_cover ? "yes" : "no", "version": version },
+            type: "post",
+            dataType: "json",
+            success: function (res) {
                 layer.close(index);
-                if(res.errcode === 0){
+                if (res.errcode === 0) {
                     resetEditorChanged(false);
-                    for(var i in window.documentCategory){
+                    for (var i in window.documentCategory) {
                         var item = window.documentCategory[i];
 
-                        if(item.id === doc_id){
+                        if (item.id === doc_id) {
                             window.documentCategory[i].version = res.data.version;
                             break;
                         }
                     }
-                    if(typeof callback === "function"){
+                    if (typeof callback === "function") {
                         callback();
                     }
-                }else if(res.errcode === 6005){
+                } else if(res.errcode === 6005) {
                     var confirmIndex = layer.confirm('文档已被其他人修改确定覆盖已存在的文档吗？', {
-                        btn: ['确定','取消'] //按钮
-                    }, function(){
+                        btn: ['确定', '取消'] // 按钮
+                    }, function() {
                         layer.close(confirmIndex);
-                        saveDocument(true,callback);
+                        saveDocument(true, callback);
                     });
-                }else{
+                } else {
                     layer.msg(res.message);
                 }
             }
         });
     }
 
-    function resetEditor($node) {
+    function releaseBook() {
+        $.ajax({
+            url: window.releaseURL,
+            data: { "identify": window.book.identify },
+            type: "post",
+            dataType: "json",
+            success: function (res) {
+                if (res.errcode === 0) {
+                    layer.msg("发布任务已推送到任务队列，稍后将在后台执行。");
+                } else {
+                    layer.msg(res.message);
+                }
+            }
+        });
+    }
 
+    function resetEditor($node) {
     }
 
     /**
@@ -235,35 +247,34 @@ $(function () {
      * @param $is_change
      */
     function resetEditorChanged($is_change) {
-        if($is_change && !window.isLoad ){
+        if ($is_change && !window.isLoad) {
             $("#markdown-save").removeClass('disabled').addClass('change');
-        }else{
+        } else {
             $("#markdown-save").removeClass('change').addClass('disabled');
         }
         window.isLoad = false;
     }
+
     /**
      * 添加顶级文档
      */
     $("#addDocumentForm").ajaxForm({
-        beforeSubmit : function () {
+        beforeSubmit: function () {
             var doc_name = $.trim($("#documentName").val());
-            if (doc_name === ""){
-                return showError("目录名称不能为空","#add-error-message")
+            if (doc_name === "") {
+                return showError("目录名称不能为空", "#add-error-message")
             }
             $("#btnSaveDocument").button("loading");
             return true;
         },
-        success : function (res) {
-            if(res.errcode === 0){
-
-                var data = { "id" : res.data.doc_id,'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id ,"text" : res.data.doc_name,"identify" : res.data.identify,"version" : res.data.version};
+        success: function (res) {
+            if (res.errcode === 0) {
+                var data = { "id": res.data.doc_id, 'parent': res.data.parent_id === 0 ? '#' : res.data.parent_id , "text": res.data.doc_name, "identify": res.data.identify, "version": res.data.version };
 
                 var node = window.treeCatalog.get_node(data.id);
-                if(node){
-                    window.treeCatalog.rename_node({"id":data.id},data.text);
-
-                }else {
+                if (node) {
+                    window.treeCatalog.rename_node({ "id": data.id }, data.text);
+                } else {
                     window.treeCatalog.create_node(data.parent, data);
                     window.treeCatalog.deselect_all();
                     window.treeCatalog.select_node(data);
@@ -271,8 +282,8 @@ $(function () {
                 pushDocumentCategory(data);
                 $("#markdown-save").removeClass('change').addClass('disabled');
                 $("#addDocumentModal").modal('hide');
-            }else{
-                showError(res.message,"#add-error-message")
+            } else {
+                showError(res.message, "#add-error-message");
             }
             $("#btnSaveDocument").button("reset");
         }
@@ -305,7 +316,6 @@ $(function () {
                     "label": "添加文档",
                     "icon": "fa fa-plus",
                     "action": function (data) {
-
                         var inst = $.jstree.reference(data.reference),
                             node = inst.get_node(data.reference);
 
@@ -341,26 +351,26 @@ $(function () {
     }).on('loaded.jstree', function () {
         window.treeCatalog = $(this).jstree();
     }).on('select_node.jstree', function (node, selected, event) {
-        if($("#markdown-save").hasClass('change')) {
-            if(confirm("编辑内容未保存，需要保存吗？")){
-                saveDocument(false,function () {
+        if ($("#markdown-save").hasClass('change')) {
+            if (confirm("编辑内容未保存，需要保存吗？")) {
+                saveDocument(false, function () {
                     loadDocument(selected);
                 });
                 return true;
             }
         }
-        loadDocument(selected);
 
-    }).on("move_node.jstree",jstree_save);
+        loadDocument(selected);
+    }).on("move_node.jstree", jstree_save);
 
-    $("#documentTemplateModal").on("click",".section>a[data-type]",function () {
+    $("#documentTemplateModal").on("click", ".section>a[data-type]", function () {
         var $this = $(this).attr("data-type");
         var body = $("#template-" + $this).html();
         if (body) {
             window.isLoad = true;
             window.editor.clear();
             window.editor.insertValue(body);
-            window.editor.setCursor({line: 0, ch: 0});
+            window.editor.setCursor({ line: 0, ch: 0 });
             resetEditorChanged(true);
         }
         $("#documentTemplateModal").modal('hide');

static/js/splitbar.js

@@ -0,0 +1,176 @@
+$(function () {
+    var splitBar = {
+        // 设置当前屏幕为 840px 时将分割条隐藏
+        maxWidth: 840,
+
+        // 父元素选择器
+        parentSelector: '.manual-body',
+
+        /**
+         * 初始化分割条
+         */
+        init: function () {
+            var self = this;
+            $(self.parentSelector)
+            .append(
+                $('\
+                    <div id="manual-vsplitbar" unselectable="on"\
+                    style="\
+                        z-index:301;\
+                        position: absolute;\
+                        user-select: none;\
+                        cursor: col-resize;\
+                        left: 275px;\
+                        height: 100%;\
+                        display: block;\
+                        width: 3px;\
+                        border-right: 1px solid #8f949a;">\
+                        <a href="javascript:void(0)" accesskey="" tabindex="0" title="vsplitbar"></a>\
+                    </div>\
+                ')
+                .hover(
+                    function (event) {
+                        event.target.style.background = '#8f949ad8';
+                    },
+                    function (event) {
+                        event.target.style.background = '';
+                    }
+                )
+            );
+
+            self.loadingHtml();
+
+            // 设置媒体查询
+            mediaMatcher.set();
+        },
+
+        /**
+         * 加载页面时设置分割条是否显示
+         */ 
+        loadingHtml: function () {
+            var self = this;
+            var htmlWidth = document.body.clientWidth;
+            if (htmlWidth <= self.maxWidth) $('#manual-vsplitbar').css('display', 'none');
+        },
+
+        /**
+         * 在打开关闭菜单事初始化左右窗口和分割条
+         */
+        reset: function () {
+            if (isFullScreen) {
+                // 关闭菜单时，初始化左右窗口
+                $('#manual-vsplitbar').css('display', 'none');
+                splitBar.inMaxWidthReset();
+                $('.manual-left').css('width', '0px');
+            } else {
+                 // 打开菜单时，初始化左右窗口
+                $('#manual-vsplitbar').css('display', 'block');
+                splitBar.outMaxWidthReset();
+            }
+        },
+
+        /**
+         * 屏幕小于等于 840px，重置左右窗口
+         */
+        inMaxWidthReset: function () {
+            $('#manual-vsplitbar').css('display', 'none');
+            $('.m-manual.manual-reader .manual-right').css('left', '0');
+            $('.manual-left').css('width', '280px');
+        },
+
+        /**
+         * 屏幕大于 840px，重置左右窗口
+         */
+        outMaxWidthReset: function () {
+            $('.manual-right').css('left', '279px');
+            $('.manual-left').css('width', '279px');
+            $('#manual-vsplitbar').css('left', '275px').css('display', 'block');
+        }
+    }
+
+    /**
+     * 设置媒体查询
+     * 分割条隐藏
+     */
+    var mediaMatcher = {
+        mql: window.matchMedia('(max-width:' + splitBar.maxWidth + 'px)'),
+
+        /**
+         * 添加媒体查询监听事件
+         */ 
+        set: function () {
+            var self = this;
+            self.mql.addListener(self.mqCallback);
+        },
+
+        /**
+         * 删除媒体查询监听事件
+         */
+        remove: function () {
+            var self = this;
+            self.mql.removeListener(self.mqCallback);
+        },
+
+        /**
+         * 媒体查询回调函数
+         */
+        mqCallback: function (event) {
+            if (event.target.matches) { // 宽度小于等于 840 像素
+                $(".m-manual").removeClass('manual-fullscreen-active');
+                splitBar.inMaxWidthReset();
+            } else {                    // 宽度大于 840 像素
+                splitBar.outMaxWidthReset();
+            }
+        }
+    }
+
+    // 初始化分割条
+    splitBar.init();
+    
+    /**
+     * 控制菜单宽度
+     * 最小为 140px
+     */
+    $('#manual-vsplitbar').on('mousedown', function (e) {
+        var bodyEle = $('.manual-body')[0];
+
+        var leftPane = $('.manual-left')[0];
+        var splitBar = $('#manual-vsplitbar')[0];
+        var rightPane = $('.manual-right')[0];
+
+        var disX = (e || event).clientX;
+
+        splitBar.left = splitBar.offsetLeft;
+
+        var docMouseMove = document.onmousemove;
+        var docMouseUp = document.onmouseup;
+
+        document.onmousemove = function (e) {
+            var curPos = splitBar.left + ((e || event).clientX - disX);
+            var maxPos = bodyEle.clientWidth - splitBar.offsetWidth;
+
+            curPos > maxPos && (curPos = maxPos);
+            curPos < 140 && (curPos = 140);
+
+            leftPane.style.width = curPos + "px";
+            splitBar.style.left = curPos - 3 + "px";
+            rightPane.style.left = curPos + 3 + "px";
+
+            return false;
+        }
+
+        document.onmouseup = function () {
+            document.onmousemove = docMouseMove;
+            document.onmouseup = docMouseUp;
+            splitBar.releaseCapture && splitBar.releaseCapture();
+        };
+
+        splitBar.setCapture && splitBar.setCapture();
+        return false;
+    });
+
+    /**
+     * 关闭侧边栏时，同步分割条；
+     */
+    $(".manual-fullscreen-switch").on("click", splitBar.reset);
+});

views/account/login.tpl

@@ -92,60 +92,63 @@
 <script src="{{cdnjs "/static/layer/layer.js"}}" type="text/javascript"></script>
 <script type="text/javascript">
     $(function () {
-        $("#account,#passwd,#code").on('focus',function () {
-            $(this).tooltip('destroy').parents('.form-group').removeClass('has-error');;
+        $("#account,#passwd,#code").on('focus', function () {
+            $(this).tooltip('destroy').parents('.form-group').removeClass('has-error');
         });
 
         $(document).keydown(function (e) {
             var event = document.all ? window.event : e;
-            if(event.keyCode === 13){
+            if (event.keyCode === 13) {
                 $("#btn-login").click();
             }
         });
-        $("#btn-login").on('click',function () {
+
+        $("#btn-login").on('click', function () {
             var $btn = $(this).button('loading');
 
             var account = $.trim($("#account").val());
             var password = $.trim($("#password").val());
             var code = $("#code").val();
-            if(account === ""){
-                $("#account").tooltip({placement:"auto",title : "账号不能为空",trigger : 'manual'})
+
+            if (account === "") {
+                $("#account").tooltip({ placement: "auto", title: "账号不能为空", trigger: 'manual' })
                     .tooltip('show')
                     .parents('.form-group').addClass('has-error');
                 $btn.button('reset');
                 return false;
-
-            }else if(password === ""){
-                $("#password").tooltip({title : '密码不能为空',trigger : 'manual'})
+            } else if (password === "") {
+                $("#password").tooltip({ title: '密码不能为空', trigger: 'manual' })
                     .tooltip('show')
                     .parents('.form-group').addClass('has-error');
                 $btn.button('reset');
                 return false;
-            }else if(code !== undefined && code === ""){
-                $("#code").tooltip({title : '验证码不能为空',trigger : 'manual'})
+            } else if (code !== undefined && code === "") {
+                $("#code").tooltip({ title: '验证码不能为空', trigger: 'manual' })
                     .tooltip('show')
                     .parents('.form-group').addClass('has-error');
                 $btn.button('reset');
                 return false;
-            }else{
+            } else {
                 $.ajax({
-                    url : "{{urlfor "AccountController.Login"}}",
-                    data : $("form").serializeArray(),
-                    dataType : "json",
-                    type : "POST",
-                    success : function (res) {
-
-                        if(res.errcode !== 0){
+                    url: "{{urlfor "AccountController.Login"}}",
+                    data: $("form").serializeArray(),
+                    dataType: "json",
+                    type: "POST",
+                    success: function (res) {
+                        if (res.errcode !== 0) {
                             $("#captcha-img").click();
                             $("#code").val('');
                             layer.msg(res.message);
                             $btn.button('reset');
-                        }else{
-                            window.location = "/";
+                        } else {
+                            turl = res.data.turl;
+                            if (turl === "") {
+                                turl = "/";
+                            }
+                            window.location = turl;
                         }
-
                     },
-                    error :function () {
+                    error: function () {
                         $("#captcha-img").click();
                         $("#code").val('');
                         layer.msg('系统错误');
@@ -154,7 +157,6 @@
                 });
             }
 
-
             return false;
         });
     });

views/book/index.tpl

@@ -92,7 +92,7 @@
                         </template>
                     </div>
                     <template v-if="lists.length >= 0">
-                        <nav>
+                        <nav class="pagination-container">
                             {{.PageHtml}}
                         </nav>
                     </template>

views/document/default_read.tpl

@@ -47,16 +47,19 @@
                     </button>
                     <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dLabel">
                         {{if gt .Member.MemberId 0}}
+                        {{if gt .Model.RelationshipId 0}}
                         {{if eq .Model.RoleId 0 1 2}}
                         <li><a href="{{urlfor "DocumentController.Edit" ":key" .Model.Identify ":id" ""}}">返回编辑</a> </li>
                         {{end}}
+                        {{end}}
                         <li><a href="{{urlfor "BookController.Index"}}">我的项目</a> </li>
                         <li role="presentation" class="divider"></li>
                         {{end}}
                         {{if eq .Model.PrivatelyOwned 0}}
                         <li><a href="javascript:" data-toggle="modal" data-target="#shareProject">项目分享</a> </li>
                         <li role="presentation" class="divider"></li>
-                        <li><a href="{{urlfor "DocumentController.Export" ":key" .Model.Identify "output" "pdf"}}" target="_blank">项目导出PDF</a> </li>
+                        <li><a href="javascript:void(0);" onclick="ExportPdfDoc()">文档导出为 PDF</a> </li>
+                        <li><a href="{{urlfor "DocumentController.ExportBook" ":key" .Model.Identify "output" "pdf"}}" target="_blank">项目导出为 PDF</a> </li>
                         {{end}}
 
                         <li><a href="{{urlfor "HomeController.Index"}}" title="返回首页">返回首页</a> </li>
@@ -125,6 +128,7 @@
                             </div>
                             <div class="col-md-8 text-center">
                                 <h1 id="article-title">{{.Title}}</h1>
+                                <h3 id="article-info">{{.Info}}</h3>
                             </div>
                             <div class="col-md-2">
                             </div>
@@ -226,12 +230,20 @@
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
 <script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
 <script src="{{cdnjs "/static/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script>
-<script type="text/javascript" src="{{cdnjs "/static/nprogress/nprogress.js"}}"></script>
-<script type="text/javascript" src="{{cdnjs "/static/highlight/highlight.js"}}"></script>
-<script type="text/javascript" src="{{cdnjs "/static/highlight/highlightjs-line-numbers.min.js"}}"></script>
-<script type="text/javascript" src="/static/js/jquery.highlight.js"></script>
-<script type="text/javascript" src="/static/js/kancloud.js"></script>
+<script src="{{cdnjs "/static/nprogress/nprogress.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/highlight/highlight.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/highlight/highlightjs-line-numbers.min.js"}}" type="text/javascript"></script>
+<script src="/static/js/jquery.highlight.js" type="text/javascript"></script>
+<script src="/static/js/kancloud.js" type="text/javascript"></script>
+<script src="/static/js/splitbar.js" type="text/javascript"></script>
 <script type="text/javascript">
+active_book_id = {{.Model.Identify}};
+active_doc_id = {{.DocumentId}};
+$(function () {
+    $("body").on('article.open', function (event, $param) {
+        active_doc_id = $param.$id;
+    });
+});
 $(function () {
     $("#searchList").on("click","a",function () {
         var id = $(this).attr("data-id");
@@ -243,6 +255,12 @@ $(function () {
         });
     });
 });
+function ExportPdfDoc() {
+    var id = active_book_id;
+    if(active_doc_id != "0")
+        id += "/" + active_doc_id;
+    window.location.href = "/export/" + id + "?output=pdf";
+}
 </script>
 </body>
 </html>

views/manager/books.tpl

@@ -88,7 +88,7 @@
                         <div class="text-center">暂无数据</div>
                         {{end}}
                     </div>
-                    <nav>
+                    <nav class="pagination-container">
                         {{.PageHtml}}
                     </nav>
                 </div>

views/manager/users.tpl

@@ -119,7 +119,7 @@
                                 </tbody>
                             </table>
                         </template>
-                        <nav>
+                        <nav class="pagination-container">
                             {{.PageHtml}}
                         </nav>
                     </div>

views/search/index.tpl

@@ -47,7 +47,7 @@
 					<span class="empty-text">暂无相关搜索结果</span>
                 </div>
                 {{end}}
-                <nav>
+                <nav class="pagination-container">
                     {{.PageHtml}}
                 </nav>
                 <div class="clearfix"></div>