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

controllers/partial/SystemController.go

@@ -4,12 +4,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"html/template"
+
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/logs"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
-	"html/template"
 
 	"strconv"
 	"strings"
@@ -2632,7 +2633,7 @@ func System_GetOptionsetByCode(c *entitys.CtrlContext) {
 	code := c.Ctx.Query("code")
 
 	var option sysmodel.SysOptionset
-	exit, err := c.Db.Table(new(sysmodel.SysOptionset)).Where("code = ?", code).Get(&option)
+	exit, err := c.Db.Table(new(sysmodel.SysOptionset)).Where("code=? and del_flag=0", code).Get(&option)
 	if exit && err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", option})
 	} else {

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)