Merge branch 'v2' of https://git.i2erp.cn/packages/light-apiengine into v2

engine/apiengine.go

@@ -2,15 +2,19 @@ package engine
 
 import (
 	"fmt"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/middleware/logger"
 	"time"
 
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/middleware/logger"
+
 	//"github.com/gin-contrib/sessions"
 	//"github.com/gin-contrib/sessions/memstore"
 	//"github.com/gin-contrib/sessions/cookie"
 
+	"os"
+
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine-client/client"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/config"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine/auth"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/env"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/logs"
@@ -19,8 +23,6 @@ import (
 	"github.com/gin-contrib/gzip"
 	"github.com/gin-gonic/gin"
 	"github.com/xormplus/xorm"
-	"os"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine/auth"
 )
 
 var apiEngine *ApiEngine = nil
@@ -54,6 +56,8 @@ func NewApiEngine(driverName, dataSourceName string, addr string) *ApiEngine {
 	engine.PlatformOrmEngine, err = xorm.NewEngine(driverName, dataSourceName)
 	printError(err)
 
+	engine.PlatformOrmEngine.SetConnMaxLifetime(10 * time.Minute)
+	engine.PlatformOrmEngine.SetMaxIdleConns(10)
 	engine.PlatformOrmEngine.ShowSQL(true)
 	engine.PlatformOrmEngine.ShowExecTime(true)
 

engine/auth/light_auth.go

@@ -26,7 +26,7 @@ func (la *LightAuth) Login(c *entitys.CtrlContext) {
 	//fmt.Println(logininfo)
 	var user sysmodel.SysUser
 	ret, err := c.PlatformDbEngine.SQL(sysmodel.SqlUserLogin, logininfo.Account).Get(&user)
-	if ret && err == nil {
+	if ret && err == nil && user.Status == 0 {
 		//TODO check password
 		md5Pwd := sysutils.HashPassword(logininfo.Password, "")
 		//密码错误
@@ -44,12 +44,15 @@ func (la *LightAuth) Login(c *entitys.CtrlContext) {
 		TCPClient.SendToken(sysutils.GetGlobalTokenStore().Get(data.Token))
 
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", data})
+	} else if user.Status == 1 {
+		c.Ctx.JSON(200, sysmodel.SysReturn{400, "user disable!", nil})
 	} else {
 		//fmt.Println(err.Error())
 		c.Ctx.JSON(200, sysmodel.SysReturn{400, "username or password incorrect!", nil})
 	}
 }
 
+
 func (la *LightAuth) Logout(c *entitys.CtrlContext) {
 	token := c.Ctx.GetHeader("token")
 	fmt.Println("delete token: ", token)

models/LocalTime.go

@@ -13,7 +13,7 @@ func init() {
 
 const (
 	timeFormat = "2006-01-02 15:04:05"
-	zeroTime   = "0001-01-01 00:00:00"
+	zeroTime   = "1970-01-01 00:00:00"
 )
 
 func NowLocal() LocalTime {
@@ -42,7 +42,7 @@ func (t *LocalTime) UnmarshalJSON(data []byte) error {
 
 	if len(dataStr) > 19 {
 		dataStr = dataStr[0:19]
-		if dataStr == "0001-01-01 00:00:00" {
+		if dataStr == "1970-01-01 00:00:00" {
 			dataStr = timeFormat
 		}
 	} else if len(dataStr) == 10 {