浏览代码

未开启匿名访问时能够访问公开项目

Minho 8 年之前
父节点
当前提交
4d51baf42f
共有 5 个文件被更改,包括 20 次插入14 次删除
  1. 1 2
      conf/app.conf.example
  2. 0 6
      conf/editor.json
  3. 12 0
      controllers/document.go
  4. 6 6
      models/options.go
  5. 1 0
      routers/filter.go

+ 1 - 2
conf/app.conf.example

@@ -28,10 +28,9 @@ timezone = Asia/Shanghai
 #数据库配置
 db_host=127.0.0.1
 db_port=3306
-db_database=webhook_db
+db_database=mindoc_db
 db_username=root
 db_password=123456
-db_prefix=md_
 
 #项目默认封面
 cover=/static/images/book.jpg

+ 0 - 6
conf/editor.json

@@ -1,6 +0,0 @@
-[{
-  "name":"Editor.md",
-  "description" : "",
-  "style" : "",
-  "script" : ""
-}]

+ 12 - 0
controllers/document.go

@@ -91,6 +91,11 @@ func (c *DocumentController) Index()  {
 	if identify == "" {
 		c.Abort("404")
 	}
+	//如果没有开启你们访问则跳转到登录
+	if !c.EnableAnonymous && c.Member == nil {
+		c.Redirect(beego.URLFor("AccountController.Login"),302)
+		return
+	}
 	bookResult := isReadable(identify,token,c)
 
 
@@ -119,6 +124,13 @@ func (c *DocumentController) Read() {
 	if identify == "" || id == ""{
 		c.Abort("404")
 	}
+
+	//如果没有开启你们访问则跳转到登录
+	if !c.EnableAnonymous && c.Member == nil {
+		c.Redirect(beego.URLFor("AccountController.Login"),302)
+		return
+	}
+
 	bookResult := isReadable(identify,token,c)
 
 	c.TplName = "document/" + bookResult.Theme + "_read.tpl"

+ 6 - 6
models/options.go

@@ -33,25 +33,25 @@ func NewOption() *Option  {
 	return &Option{}
 }
 
-func (p *Option) Find(id int) error {
+func (p *Option) Find(id int) (*Option,error) {
 	o := orm.NewOrm()
 
 	p.OptionId = id
 
 	if err := o.Read(p);err != nil {
-		return err
+		return p,err
 	}
-	return  nil
+	return  p,nil
 }
 
-func (p *Option) FindByKey(key string) error {
+func (p *Option) FindByKey(key string) (*Option,error) {
 	o := orm.NewOrm()
 
 	p.OptionName = key
 	if err := o.Read(p);err != nil {
-		return err
+		return p,err
 	}
-	return  nil
+	return  p,nil
 }
 
 func GetOptionValue(key, def string) string {

+ 1 - 0
routers/filter.go

@@ -5,6 +5,7 @@ import (
 	"github.com/astaxie/beego/context"
 	"github.com/lifei6671/godoc/conf"
 	"github.com/lifei6671/godoc/models"
+	"strings"
 )
 
 func init()  {