修改ctx

controllers/partial/SsoController.go

@@ -1,24 +1,20 @@
-
 package partial
 
 import (
-	"time"
-	"strings"
-	"strconv"
 	"fmt"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
-    sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+	sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+	"strconv"
+	"strings"
+	"time"
 	//"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 )
 
-
-
-
 // _Login
 // @Title _Login
-// @Description 用户登录         
-// @Param	logininfo      false  "登录信息"  
+// @Description 用户登录
+// @Param	logininfo      false  "登录信息"
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func Sso_Login(c *entitys.CtrlContext) {
@@ -56,6 +52,7 @@ func Sso_Login(c *entitys.CtrlContext) {
 		data.Id = user.Id
 		data.LoginId = user.LoginId
 		data.Name = user.Name
+		data.Mobile = user.Mobile
 		data.Email = user.Email
 		data.Token = token.AccessToken
 		data.Type = user.Type
@@ -69,7 +66,7 @@ func Sso_Login(c *entitys.CtrlContext) {
 
 // _Logout
 // @Title _Logout
-// @Description 用户退出         
+// @Description 用户退出
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func Sso_Logout(c *entitys.CtrlContext) {
@@ -80,12 +77,11 @@ func Sso_Logout(c *entitys.CtrlContext) {
 	ret := __none_func_sso__()
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
-
-func __none_func_sso__(params ... interface{}) bool{
+func __none_func_sso__(params ...interface{}) bool {
 	return true
 }

controllers/partial/SystemController.go

@@ -283,14 +283,16 @@ func System_AddRole(c *entitys.CtrlContext) {
 	user := tk.(*entitys.Token)
 
 	paramObj0.Id = sysutils.NewUUID()
-	paramObj0.Domain = user.Domain
 	paramObj0.CreateBy = user.UserId
 	paramObj0.LastUpdateBy = user.UserId
 	paramObj0.CreateTime = time.Now()
 	paramObj0.LastUpdateTime = time.Now().UnixNano()
 	paramObj0.DelFlag = 0
 
-	_, err := c.LocalSqlMapClient("insert_sys_role", &paramObj0).Execute()
+	//_, err := c.LocalSqlMapClient("insert_sys_role", &paramObj0).Execute()
+
+	paramMap, err := sysutils.BeanToMap(&paramObj0)
+	_, err = c.Db.SqlMapClient("insert_sys_role", paramMap).Execute()
 
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
@@ -505,7 +507,9 @@ func System_AddMenu(c *entitys.CtrlContext) {
 		paramObj0.Inheritance = fmt.Sprintf("|%s|", paramObj0.Id)
 	}
 
-	_, err := c.LocalSqlMapClient("insert_sys_menu", &paramObj0).Execute()
+	//_, err := c.LocalSqlMapClient("insert_sys_menu", &paramObj0).Execute()
+	paramMap, err := sysutils.BeanToMap(&paramObj0)
+	_, err = c.Db.SqlMapClient("insert_sys_menu", paramMap).Execute()
 
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
@@ -594,7 +598,9 @@ func System_AddOrg(c *entitys.CtrlContext) {
 		paramObj0.Inheritance = fmt.Sprintf("|%s|", paramObj0.Id)
 	}
 
-	_, err := c.LocalSqlMapClient("insert_sys_org", &paramObj0).Execute()
+	//_, err := c.LocalSqlMapClient("insert_sys_org", &paramObj0).Execute()
+	paramMap, err := sysutils.BeanToMap(&paramObj0)
+	_, err = c.Db.SqlMapClient("insert_sys_org", paramMap).Execute()
 
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})

entitys/ctrl_context.go

@@ -1,8 +1,6 @@
 package entitys
 
 import (
-	"encoding/json"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/logs"
 	"github.com/gin-gonic/gin"
 	"github.com/xormplus/xorm"
 )
@@ -12,22 +10,3 @@ type CtrlContext struct {
 	Db               *xorm.Engine
 	PlatformDbEngine *xorm.Engine
 }
-
-// LocalSqlMapClient
-// @Title 将结构图转成map[string]interface{}对象
-// @Description 添加菜单
-// @Param	    string  false  "sqlMap唯一ID, 结构体"
-// @Success *xorm.Session
-func (c CtrlContext) LocalSqlMapClient(sqlTagName string, obj interface{}) *xorm.Session {
-	jsonBytes, err := json.Marshal(obj)
-	if err != nil {
-		logs.Error(err.Error())
-	}
-
-	var mapParam map[string]interface{}
-	if err := json.Unmarshal(jsonBytes, &mapParam); err != nil {
-		logs.Error(err.Error())
-	}
-
-	return c.Db.SqlMapClient(sqlTagName, &mapParam)
-}

models/Sql_SysUser.go

@@ -1,17 +1,17 @@
 package models
 
-var SqlUserLogin = ` 
-        select 
-			id,login_id,password,name,full_name,email,org_id,type,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag
+var SqlUserLogin = `
+        select
+			id,login_id,password,name,full_name,mobile,email,org_id,type,status,domain,create_by,create_time,last_update_by,last_update_time,del_flag
         from sys_user
 		where login_id = ?`
 
-var SqlUserInfoPage = `SELECT 
+var SqlUserInfoPage = `SELECT
   sys_user.*,
   sys_org.name org_name,
   GROUP_CONCAT(sys_role.name) role_name
 FROM
-  sys_user 
+  sys_user
 LEFT JOIN
   sys_org
   ON