From 578615092d3c9754e12588701be87f4475887fdc Mon Sep 17 00:00:00 2001
From: yirenyishi <mail_yanpeng@163.com>
Date: Thu, 15 Nov 2018 22:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf                       |   5 ++
 controllers/UserController.go       | 120 +++++++++++++++++++++++++++-
 models/Attachment.go                |  11 +++
 models/Blog.go                      |  20 +++++
 models/Comment.go                   |  13 +++
 models/{datainit.go => DataInit.go} |   3 +-
 models/Like.go                      |  10 +++
 models/Note.go                      |  10 +++
 models/Result.go                    |  22 +++++
 models/User.go                      |  19 +++++
 models/struct.go                    |   8 --
 models/topic.go                     |  15 ----
 routers/UserRouter.go               |  12 +++
 routers/router.go                   |   4 +-
 service/UserService.go              |  35 ++++++++
 tests/default_test.go               |  39 ---------
 16 files changed, 277 insertions(+), 69 deletions(-)
 create mode 100644 models/Attachment.go
 create mode 100644 models/Blog.go
 create mode 100644 models/Comment.go
 rename models/{datainit.go => DataInit.go} (81%)
 create mode 100644 models/Like.go
 create mode 100644 models/Note.go
 create mode 100644 models/Result.go
 create mode 100644 models/User.go
 delete mode 100644 models/struct.go
 delete mode 100644 models/topic.go
 create mode 100644 routers/UserRouter.go
 create mode 100644 service/UserService.go
 delete mode 100644 tests/default_test.go

diff --git a/conf/app.conf b/conf/app.conf
index 83d998b..5123650 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -1,3 +1,8 @@
 appname = beeblog
 httpport = 8082
 runmode = dev
+
+EnableGzip = true
+EnableDocs = true
+
+host = aiprose.com
diff --git a/controllers/UserController.go b/controllers/UserController.go
index c4593e2..d13aa81 100644
--- a/controllers/UserController.go
+++ b/controllers/UserController.go
@@ -1,15 +1,127 @@
 package controllers
 
-import "github.com/astaxie/beego"
+import (
+	"github.com/astaxie/beego"
+	"beeblog/service"
+	"beeblog/models"
+	"strings"
+	"crypto/md5"
+	"time"
+	"strconv"
+	"encoding/hex"
+)
 
 type UserController struct {
 	beego.Controller
 }
 
 func (u *UserController) LoginPage() {
+	//o := orm.NewOrm()
+	//
+	//category := &models.Category{Title: "slene", Views: 5, TopicCount: 0}
+	//
+	//id,err := o.Insert(category)
+	//fmt.Printf("ID: %d, ERR: %v\n", id, err)
+	//
+	//category.Title = "nelson"
+	//num, err := o.Update(&category)
+	//fmt.Printf("NUM: %d, ERR: %v\n", num, err)
+	//
+	//c := &models.Category{Id:1}
+	//err := o.Read(c)
+	//fmt.Printf("ERR: %v\n", err)
+	//fmt.Println(c.Title)
+	////c.Title = "nelson"
+	////num, err := o.Update(c)
+	////fmt.Printf("NUM: %d, ERR: %v\n", num, err)
+	//qs := o.QueryTable(&models.Category{})
+	//var tests []*models.Category
+	//qs.Filter("Title","slene")
+	//qs.All(&tests)
+	//
+	//for i:=0; i<len(tests) ; i++ {
+	//	fmt.Println(tests[i].Title,tests[i].Id)
+	//}
+	//fmt.Println(len(tests))
+	//num, err = o.Delete(&u)
+	//fmt.Printf("NUM: %d, ERR: %v\n", num, err)
+
 	u.Ctx.WriteString("login page")
 }
 
-func (u *UserController) Login() {
-	u.Ctx.WriteString("login method")
-}
\ No newline at end of file
+func (this *UserController) Login() {
+	username := this.GetString("username")
+	userpwd := this.GetString("userpwd")
+	if username == "" {
+		this.Data["json"] = models.ReurnError("用户名为空")
+		this.ServeJSON()
+	}
+	if len(username) < 4 {
+		this.Data["json"] = models.ReurnError("用户名最低4位")
+		this.ServeJSON()
+	}
+	if userpwd == "" {
+		this.Data["json"] = models.ReurnError("密码为空")
+		this.ServeJSON()
+	}
+	if len(userpwd) < 6 {
+		this.Data["json"] = models.ReurnError("密码最低6位")
+		this.ServeJSON()
+	}
+	user, error := service.FindByUserName(username)
+	if error == nil && user != nil {
+		h := md5.New()
+		h.Write([]byte(userpwd + user.Salt))
+		userpwd = hex.EncodeToString(h.Sum(nil))
+		if userpwd == user.UserPwd {
+			this.Data["json"] = models.ReurnSuccess("")
+		} else {
+			this.Data["json"] = models.ReurnError("用户名或密码错误")
+		}
+	} else {
+		this.Data["json"] = models.ReurnError("用户名不存在")
+	}
+	this.ServeJSON()
+}
+
+func (this *UserController) Regist() {
+	username := this.GetString("username")
+	userpwd := this.GetString("userpwd")
+	username = strings.Replace(username, " ", "", -1)
+	userpwd = strings.Replace(userpwd, " ", "", -1)
+	if username == "" {
+		this.Data["json"] = models.ReurnError("用户名为空")
+		this.ServeJSON()
+	}
+	if len(username) < 4 {
+		this.Data["json"] = models.ReurnError("用户名最低4位")
+		this.ServeJSON()
+	}
+	if userpwd == "" {
+		this.Data["json"] = models.ReurnError("密码为空")
+		this.ServeJSON()
+	}
+	if len(userpwd) < 6 {
+		this.Data["json"] = models.ReurnError("密码最低6位")
+		this.ServeJSON()
+	}
+	user, _ := service.FindByUserName(username)
+	if user != nil {
+		this.Data["json"] = models.ReurnError("用户已经存在")
+		this.ServeJSON()
+	}
+	h := md5.New()
+	h.Write([]byte(strconv.FormatInt(time.Now().Unix(), 10) + beego.AppConfig.String("host")))
+	salt := hex.EncodeToString(h.Sum(nil))
+	h = md5.New()
+	h.Write([]byte(userpwd + salt))
+	userpwd = hex.EncodeToString(h.Sum(nil))
+	user = &models.User{UserName: username, UserPwd: userpwd, Salt: salt}
+	err := service.SaveUser(user)
+	if err == nil {
+		this.Data["json"] = user
+	} else {
+		this.Data["json"] = models.ReurnError("注册失败")
+	}
+	this.ServeJSON()
+}
diff --git a/models/Attachment.go b/models/Attachment.go
new file mode 100644
index 0000000..cb46cef
--- /dev/null
+++ b/models/Attachment.go
@@ -0,0 +1,11 @@
+package models
+
+import "time"
+
+type Attachment struct {
+	Id         int64
+	Name       string
+	Alias       string
+	Path       string    `orm:"index"`
+	UploadTime time.Time `orm:"datetime"`
+}
diff --git a/models/Blog.go b/models/Blog.go
new file mode 100644
index 0000000..997db41
--- /dev/null
+++ b/models/Blog.go
@@ -0,0 +1,20 @@
+package models
+
+import "time"
+
+type Blog struct {
+	Id int64
+	UserId int64
+	Title string
+	BlogValue string  `orm:"size(5000)"`
+	BlogHtml string  `orm:"size(5000)"`
+	Ctime time.Time `orm:"datetime"`
+	Utime time.Time `orm:"datetime"`
+	Browses int64 `orm:"datetime"`
+	Top int
+	Hot int
+	Ttime time.Time `orm:"datetime"`
+	Htime time.Time `orm:"datetime"`
+	Delflag int
+	CategoryId int64
+}
diff --git a/models/Comment.go b/models/Comment.go
new file mode 100644
index 0000000..cadbf24
--- /dev/null
+++ b/models/Comment.go
@@ -0,0 +1,13 @@
+package models
+
+import "time"
+
+type Comment struct {
+	Id      int64
+	CuserId int64
+	BuserId int64
+	BlogId  int64
+	Ctime   time.Time `orm:"datetime"`
+	Pid     int64
+	ComVal  string    `orm:"size(2000)"`
+}
diff --git a/models/datainit.go b/models/DataInit.go
similarity index 81%
rename from models/datainit.go
rename to models/DataInit.go
index 021a5f5..2144fef 100644
--- a/models/datainit.go
+++ b/models/DataInit.go
@@ -18,7 +18,8 @@ func RegistDB()  {
 		os.MkdirAll(path.Dir(_DB_NAME),os.ModePerm)
 		os.Create(_DB_NAME)
 	}
-	orm.RegisterModel(new(Category),new(Topic))
+	//orm.RegisterModel(new(Attachment),new(Topic))
+	orm.RegisterModel(new(Attachment),new(User))
 	orm.RegisterDriver(_SQLITE3_DRIVER,orm.DRSqlite)
 	orm.RegisterDataBase("default",_SQLITE3_DRIVER,_DB_NAME,10)
 }
\ No newline at end of file
diff --git a/models/Like.go b/models/Like.go
new file mode 100644
index 0000000..3a29b55
--- /dev/null
+++ b/models/Like.go
@@ -0,0 +1,10 @@
+package models
+
+import "time"
+
+type Like struct {
+	Id     int64
+	UserId int64
+	BlogId int64
+	Ltime  time.Time `orm:"datetime"`
+}
diff --git a/models/Note.go b/models/Note.go
new file mode 100644
index 0000000..c8e9394
--- /dev/null
+++ b/models/Note.go
@@ -0,0 +1,10 @@
+package models
+
+type Note struct {
+	Id     int64
+	UserId int64
+	Title string
+	NoteVal string `orm:"size(3500)"`
+	NoteHtml string `orm:"size(5000)"`
+	Pid int64
+}
\ No newline at end of file
diff --git a/models/Result.go b/models/Result.go
new file mode 100644
index 0000000..3c22302
--- /dev/null
+++ b/models/Result.go
@@ -0,0 +1,22 @@
+package models
+
+type Error struct {
+	Status byte
+	Msg    string
+}
+
+func ReurnError(msg string) *Error {
+	return &Error{Status: byte(1), Msg: msg}
+}
+
+type Success struct {
+	Status byte
+	Msg    string
+}
+
+func ReurnSuccess(msg string) *Error {
+	if msg == "" {
+		msg = "success"
+	}
+	return &Error{Status: byte(0), Msg: msg}
+}
diff --git a/models/User.go b/models/User.go
new file mode 100644
index 0000000..d217d65
--- /dev/null
+++ b/models/User.go
@@ -0,0 +1,19 @@
+package models
+
+import "time"
+
+type User struct {
+	Id       int64
+	UserName string    `orm:"unique"`
+	UserPwd  string
+	Salt     string
+	Headimg  string
+	Birthday time.Time `orm:"null;type(date)"`
+	Email    string
+	Mobile   string
+	QQ       string
+	HomeUrl  string
+	Sex      int
+	DescInfo string
+	Ctime    time.Time `orm:"auto_now_add;type(datetime)"`
+}
diff --git a/models/struct.go b/models/struct.go
deleted file mode 100644
index 33b655c..0000000
--- a/models/struct.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package models
-
-type Category struct {
-	Id         int64
-	Title      string
-	Views      int64 `orm:"index"`
-	TopicCount int64
-}
diff --git a/models/topic.go b/models/topic.go
deleted file mode 100644
index c771076..0000000
--- a/models/topic.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package models
-
-import "time"
-
-type Topic struct {
-	Id         int64
-	Uid        int64
-	Title      string
-	Content    string    `orm:"size(5000)"`
-	Attachment string
-	Created    time.Time `orm:"index"`
-	ViewCount  int64     `orm:"index"`
-	Author     string
-	ReplayCount int64
-}
\ No newline at end of file
diff --git a/routers/UserRouter.go b/routers/UserRouter.go
new file mode 100644
index 0000000..dab2b3c
--- /dev/null
+++ b/routers/UserRouter.go
@@ -0,0 +1,12 @@
+package routers
+
+import (
+	"github.com/astaxie/beego"
+	"beeblog/controllers"
+)
+
+func init() {
+	beego.Router("/login", &controllers.UserController{}, "get:LoginPage")
+	beego.Router("/login", &controllers.UserController{}, "post:Login")
+	beego.Router("/regist", &controllers.UserController{}, "post:Regist")
+}
diff --git a/routers/router.go b/routers/router.go
index bd6d6d0..4c82f7b 100644
--- a/routers/router.go
+++ b/routers/router.go
@@ -6,8 +6,8 @@ import (
 )
 
 func init() {
+	//beego.Router("/login", &controllers.UserController{}, "get:LoginPage")
 	beego.Router("/", &controllers.IndexController{})
-	beego.Router("/login", &controllers.UserController{}, "Get:LoginPage")
-	beego.Router("/login", &controllers.UserController{}, "post:Login")
+	//beego.Router("/login", &controllers.UserController{}, "post:Login")
 
 }
diff --git a/service/UserService.go b/service/UserService.go
new file mode 100644
index 0000000..cb29119
--- /dev/null
+++ b/service/UserService.go
@@ -0,0 +1,35 @@
+package service
+
+import (
+	"github.com/astaxie/beego/orm"
+	"beeblog/models"
+)
+
+type UserService struct {
+}
+
+func FindByUserName(username string) (*models.User, error) {
+	o := orm.NewOrm()
+	qs := o.QueryTable(&models.User{})
+	var users []*models.User
+	_, err := qs.Filter("UserName", username).All(&users)
+	if err != nil {
+		return nil, err
+	}
+	if len(users) != 0 {
+		return users[0], nil
+	}
+	return nil, nil
+}
+
+func SaveUser(user *models.User) error {
+	o := orm.NewOrm()
+	id, eror := o.Insert(user)
+	if eror != nil {
+		return eror
+	} else {
+		user.Id = id
+		o.Commit()
+	}
+	return nil
+}
diff --git a/tests/default_test.go b/tests/default_test.go
deleted file mode 100644
index a036aa1..0000000
--- a/tests/default_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"runtime"
-	"path/filepath"
-	_ "beeblog/routers"
-
-	"github.com/astaxie/beego"
-	. "github.com/smartystreets/goconvey/convey"
-)
-
-func init() {
-	_, file, _, _ := runtime.Caller(1)
-	apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".." + string(filepath.Separator))))
-	beego.TestBeegoInit(apppath)
-}
-
-
-// TestBeego is a sample to run an endpoint test
-func TestBeego(t *testing.T) {
-	r, _ := http.NewRequest("GET", "/", nil)
-	w := httptest.NewRecorder()
-	beego.BeeApp.Handlers.ServeHTTP(w, r)
-
-	beego.Trace("testing", "TestBeego", "Code[%d]\n%s", w.Code, w.Body.String())
-
-	Convey("Subject: Test Station Endpoint\n", t, func() {
-	        Convey("Status Code Should Be 200", func() {
-	                So(w.Code, ShouldEqual, 200)
-	        })
-	        Convey("The Result Should Not Be Empty", func() {
-	                So(w.Body.Len(), ShouldBeGreaterThan, 0)
-	        })
-	})
-}
-