Merge branch 'master' of http://192.168.3.207:10080/qmx/jy-data-extract

src/jy/admin/admin.go

@@ -2,11 +2,8 @@ package admin
 
 import (
 	. "jy/router"
-	qu "qfw/util"
 )
 
-var Se = qu.SimpleEncrypt{Key: "topnet@extract"}
-
 func init() {
 	admin := Router.Group("/admin")
 	admin.Use(AuthMiddleWare())

src/jy/admin/user.go

@@ -4,6 +4,7 @@ package admin
 import (
 	. "jy/mongodbutil"
 	. "jy/router"
+	. "jy/util"
 	"net/http"
 	"time"
 

src/jy/front/front.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	. "jy/mongodbutil"
 	. "jy/router"
+	. "jy/util"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
@@ -21,7 +22,8 @@ func init() {
 func Login(c *gin.Context) {
 	email := c.PostForm("email")
 	pwd := c.PostForm("pwd")
-	res, _ := Mgo.FindOne("user", fmt.Sprintf(`{"email":"%s","pwd":"%s"}`, email, pwd))
+
+	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)

src/jy/util/util.go

@@ -4,10 +4,13 @@ import (
 	"io"
 	"log"
 	"os"
+	qu "qfw/util"
 
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
+var Se = qu.SimpleEncrypt{Key: "topnet@extract"}
+
 func init() {
 	//输出日志配置,多输出源
 	filelog := &lumberjack.Logger{