zhangjinkun 7 tahun lalu
induk
melakukan
396f3973e8

+ 6 - 0
src/config.json

@@ -0,0 +1,6 @@
+{
+    "port": "9090",
+    "mgodb": "192.168.3.207:27082",
+    "dbsize": 5,
+    "dbname": "rztest"
+} 

+ 3 - 2
src/jy/admin/admin.go

@@ -4,8 +4,9 @@ import (
 	. "jy/router"
 )
 
+var Admin = Router.Group("/admin")
+
 func init() {
-	admin := Router.Group("/admin")
-	admin.Use(AuthMiddleWare())
+	Admin.Use(AuthMiddleWare())
 	Router.LoadHTMLGlob("web/templates/admin/*")
 }

+ 11 - 12
src/jy/admin/user.go

@@ -3,7 +3,6 @@ package admin
 
 import (
 	. "jy/mongodbutil"
-	. "jy/router"
 	. "jy/util"
 	"net/http"
 	"time"
@@ -12,16 +11,16 @@ import (
 )
 
 func init() {
-	Router.GET("/admin/index", func(c *gin.Context) {
+	Admin.GET("/index", func(c *gin.Context) {
 		c.HTML(http.StatusOK, "index.html", gin.H{})
 	})
-	Router.GET("/admin/user", func(c *gin.Context) {
+	Admin.GET("/user", func(c *gin.Context) {
 		c.HTML(http.StatusOK, "user.html", gin.H{})
 	})
-	Router.POST("/admin/user/data", User)
-	Router.POST("/admin/user/save", UserSave)
-	Router.POST("/admin/user/searchbyid", UserSearchById)
-	Router.POST("/admin/user/del", UserDel)
+	Admin.POST("/user/data", User)
+	Admin.POST("/user/save", UserSave)
+	Admin.POST("/user/searchbyid", UserSearchById)
+	Admin.POST("/user/del", UserDel)
 }
 
 func User(c *gin.Context) {
@@ -35,11 +34,11 @@ func UserSave(c *gin.Context) {
 	name, _ := c.GetPostForm("name")
 	role, _ := c.GetPostForm("role")
 	data := map[string]interface{}{
-		"email":  email,
-		"pwd":    Se.EncodeString(pwd),
-		"name":   name,
-		"role":   role,
-		"intime": time.Now().Unix(),
+		"email": email,
+		"pwd":   Se.EncodeString(pwd),
+		"name":  name,
+		"role":  role,
+		"mtime": time.Now().Unix(),
 	}
 	b := Mgo.Update("user", `{"email":"`+email+`"}`, data, true, false)
 	c.JSON(200, gin.H{"rep": b})

+ 10 - 4
src/jy/front/front.go

@@ -1,22 +1,29 @@
 package front
 
 import (
+	"encoding/gob"
 	"fmt"
 	. "jy/mongodbutil"
 	. "jy/router"
 	. "jy/util"
+	"time"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
+	"gopkg.in/mgo.v2/bson"
 )
 
 func init() {
+	gob.Register(&map[string]interface{}{})
+	gob.Register(&[]map[string]interface{}{})
+	gob.Register(&time.Time{})
+	gob.Register(bson.ObjectIdHex("5b8781f5904a2ea61544f852"))
 	front := Router.Group("/")
 	{
 		front.Static("/front", "./web/templates/front")
 	}
-	Router.Static("/res", "./web/res")
-	Router.POST("/login", Login) //登录
+	front.Static("/res", "./web/res")
+	front.POST("/login", Login) //登录
 }
 
 func Login(c *gin.Context) {
@@ -26,8 +33,7 @@ func Login(c *gin.Context) {
 	res, _ := Mgo.FindOne("user", fmt.Sprintf(`{"email":"%s","pwd":"%s"}`, email, Se.EncodeString(pwd)))
 	if res != nil && len(*res) > 0 {
 		session := sessions.Default(c)
-		session.Set("email", email)
-		session.Set("name", (*res)["name"])
+		session.Set("user", res)
 		session.Save()
 		c.JSON(200, gin.H{"checked": true})
 	} else {

+ 0 - 1
src/jy/mongodbutil/mongodbutil.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	_ "jy/util"
 	"log"
 	"qfw/util"
 	"runtime"

+ 7 - 4
src/jy/mongodbutil/pool.go

@@ -1,19 +1,22 @@
 package mongodbutil
 
 import (
+	"jy/util"
 	"log"
+	qu "qfw/util"
 	"sync"
 	"time"
 
-	_ "jy/util"
-
 	mgo "gopkg.in/mgo.v2"
 )
 
 var Mgo *Pool
 
-func init() {
-	Mgo = MgoFactory(2, 15, 120, "192.168.3.207:27082", "rztest")
+func InitMgoPool() {
+	initCap := qu.IntAll(util.Config["dbsize"])
+	addr := qu.ObjToString(util.Config["mgodb"])
+	dbname := qu.ObjToString(util.Config["dbname"])
+	Mgo = MgoFactory(initCap, initCap*3, 120, addr, dbname)
 }
 
 type Pool struct {

+ 1 - 1
src/jy/router/router.go

@@ -18,7 +18,7 @@ func init() {
 func AuthMiddleWare() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		session := sessions.Default(c)
-		if session.Get("name") != nil {
+		if session.Get("user") != nil {
 			c.Next()
 			return
 		}

+ 1 - 0
src/jy/util/util.go

@@ -9,6 +9,7 @@ import (
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
+var Config map[string]interface{}
 var Se = qu.SimpleEncrypt{Key: "topnet@extract"}
 
 func init() {

+ 10 - 3
src/main.go

@@ -3,14 +3,21 @@ package main
 import (
 	_ "jy/admin"
 	_ "jy/front"
-	_ "jy/mongodbutil"
+	"jy/mongodbutil"
 	. "jy/router"
+	"jy/util"
 	"log"
+	qu "qfw/util"
 	"time"
 )
 
+func init() {
+	qu.ReadConfig(&util.Config)
+	mongodbutil.InitMgoPool()
+}
+
 func main() {
-	go Router.Run(":9090")
-	go log.Println("启动..")
+	go Router.Run(":" + qu.ObjToString(util.Config["port"]))
+	go log.Println("启动..", qu.ObjToString(util.Config["port"]))
 	time.Sleep(99999 * time.Hour)
 }