#6 新代码提交

Merged
weichenglei merged 1 commits from feature_user into develop 3 years ago
  1. +2
    -2
      conf/config.yaml
  2. +19
    -0
      dao/base/Plant.dao.go
  3. +15
    -0
      dao/base/RoleMenu.dao.go
  4. +15
    -0
      dao/base/User.dao.go
  5. +17
    -0
      dao/base/implments/Plant.dao.impl.go
  6. +14
    -0
      dao/base/implments/RoleMenu.dao.impl.go
  7. +18
    -2
      dao/base/implments/User.dao.impl.go
  8. +1
    -1
      db/db.go
  9. +3
    -3
      global/User.go
  10. +1
    -1
      main.go
  11. +18
    -18
      meta/base/User.meta.go
  12. +19
    -0
      services/base/Plant.service.go
  13. +19
    -0
      services/base/RoleMenu.service.go
  14. +19
    -0
      services/base/User.service.go
  15. +19
    -0
      services/base/implments/Plant.service.impl.go
  16. +21
    -0
      services/base/implments/RoleMenu.service.impl.go
  17. +21
    -0
      services/base/implments/User.service.impl.go
  18. +195
    -0
      web/controllers/home/Home.rest.go
  19. +54
    -0
      web/controllers/home/home.go
  20. +17
    -16
      web/middleware/jwts/jwts.go
  21. +3
    -3
      web/routes/routes.go

+ 2
- 2
conf/config.yaml View File

@ -2,7 +2,7 @@
finr: 100
# mongdb数据库配置参数
mongdbname: GAASDB
mongdbname: MDSDB
mongdbip: 127.0.0.1
mongdbport: 27017
@ -11,7 +11,7 @@ masterdbdrivername: mssql
masterdbserver: 101.201.121.115
masterdbuser: sa
masterdbpassword: Leit2020
masterdbname: GAAS
masterdbname: MDS_MOM
masterdbport: 1433
# 打印模板文件夹路径


+ 19
- 0
dao/base/Plant.dao.go View File

@ -217,6 +217,25 @@ type PlantDAO interface {
*
******************************************************************************/
UpdateWhere([]grmi.Predicate, *model.Plant, ...string) error
/******************************************************************************
*
* @Function Name : GetPlants
*-----------------------------------------------------------------------------
*
* @Description : 项目组
*
* @Function Parameters : 当前访问人员信息
*
* @Function Parameters : 需要修改的Plant列表
*
* @Return Value : 执行时发生的错误
*
* @Author : 代码生成器创建
*
* @Date : 2021-08-16 16:11:14
*
******************************************************************************/
GetPlants() ([]model.Plant, error)
}
/******************************************************************************


+ 15
- 0
dao/base/RoleMenu.dao.go View File

@ -221,6 +221,21 @@ type RoleMenuDAO interface {
*
******************************************************************************/
UpdateWhere([]grmi.Predicate, *model.RoleMenu, ...string) error
/******************************************************************************
*
* @Function Name : GetByRoleId
*-----------------------------------------------------------------------------
*
* @Description : 查询
*
* @Return Value : 执行时发生的错误
*
* @Author : 代码生成器创建
*
* @Date : 2021-04-13 15:04:54
*
******************************************************************************/
GetByRoleId(roleId int) ([]model.Menu, error)
}
/******************************************************************************


+ 15
- 0
dao/base/User.dao.go View File

@ -217,6 +217,21 @@ type UserDAO interface {
*
******************************************************************************/
UpdateWhere([]grmi.Predicate, *model.User, ...string) error
/******************************************************************************
*
* @Function Name : GetUserByUsername
*-----------------------------------------------------------------------------
*
* @Description : 查询user
*
* @Return Value : 执行时发生的错误
*
* @Author : 代码生成器创建
*
* @Date : 2021-08-16 16:11:14
*
******************************************************************************/
GetUserByUsername(plantNr int,userId string) (*model.User, error)
}
/******************************************************************************


+ 17
- 0
dao/base/implments/Plant.dao.impl.go View File

@ -296,3 +296,20 @@ func (impl *PlantDAOImplement) UpdateWhere(predicates []grmi.Predicate, entity *
}
return nil
}
/******************************************************************************
*
* @Reference leit.com/LAPP_CHEERSSON_BACKEND/dao/base/PlantDAO.GetPlants
*
******************************************************************************/
func (impl *PlantDAOImplement) GetPlants() ([]model.Plant, error) {
session := impl.session.Table(impl.meta.TableName)
data := make([]model.Plant, 0, 10)
err := session.Find(&data)
if err != nil {
return nil, grmi.NewDataBaseError(err)
}
return data, nil
}

+ 14
- 0
dao/base/implments/RoleMenu.dao.impl.go View File

@ -296,3 +296,17 @@ func (impl *RoleMenuDAOImplement) UpdateWhere(predicates []grmi.Predicate, entit
}
return nil
}
/******************************************************************************
*
* @Reference leit.com/LAPP_CHEERSSON_BACKEND/dao/base/RoleMenuDAO.GetByRoleId
*
******************************************************************************/
func (impl *RoleMenuDAOImplement) GetByRoleId(roleId int) ([]model.Menu,error) {
menus := make([]model.Menu, 0)
err := impl.session.Table("Menu").Join("LEFT","RoleMenu","RoleMenu.MenuId=Menu.MenuId").Where("RoleMenu.RoleId=? and Menu.MenuType in ('M','C') and Menu.Visible = 0", roleId).Find(&menus)
if err != nil {
return menus,err
}
return menus,nil
}

+ 18
- 2
dao/base/implments/User.dao.impl.go View File

@ -231,7 +231,6 @@ func (impl *UserDAOImplement) SelectAndPaging(paging *grmi.Paging, predicates []
} else {
session = session.Where(where, parameters...)
}
count, err := session.Count(impl.meta.Indicator)
if err != nil {
return grmi.EmptyPagingResult, err
@ -246,7 +245,8 @@ func (impl *UserDAOImplement) SelectAndPaging(paging *grmi.Paging, predicates []
parameters = append(parameters, paging.Offset(), paging.Size)
data := make([]model.User, 0, 10)
where = " where " + where
err = impl.session.Table(impl.meta.TableName).SQL("select * from "+impl.meta.TableName+where+orderBy+" offset ? row fetch next ? row only", parameters...).Find(&data)
err = impl.session.Table(impl.meta.TableName).SQL("select * from ["+impl.meta.TableName+"]"+where+orderBy+" offset ? row fetch next ? row only", parameters...).Find(&data)
if err != nil {
return grmi.EmptyPagingResult, err
}
@ -300,3 +300,19 @@ func (impl *UserDAOImplement) UpdateWhere(predicates []grmi.Predicate, entity *m
}
return nil
}
/******************************************************************************
*
* @Reference leit.com/LAPP_CHEERSSON_BACKEND/dao/base/UserDAO.GetUserByUsername
*
******************************************************************************/
func (impl *UserDAOImplement) GetUserByUsername(plantNr int,userId string) (*model.User, error) {
var data model.User
ok, err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and UserId = ?",plantNr,userId).Get(&data)
if err != nil {
return nil, grmi.NewDataBaseError(err)
}
if !ok {
return nil, nil
}
return &data, nil
}

+ 1
- 1
db/db.go View File

@ -153,7 +153,7 @@ func InitTestDb() error {
if err != nil {
return err
}
//Eloquent.ShowSQL(true)
Eloquent.ShowSQL(true)
return nil
}


+ 3
- 3
global/User.go View File

@ -1,8 +1,8 @@
package global
type User struct {
PlantNr int `xorm:"not null pk comment('工厂ID') INT(0)" form:"pid" json:"pid"`
UserId string `xorm:"not null pk comment('用户ID') VARCHAR(40)" form:"userid" json:"userid"`
PlantNr int `xorm:"not null pk comment('工厂ID') INT(0)" form:"pid" json:"plantNr"`
UserId string `xorm:"not null pk comment('用户ID') VARCHAR(40)" form:"userid" json:"userId"`
Role string `xorm:"comment('用户角色') VARCHAR(40)" form:"role" json:"role"`
RoleId int `xorm:"comment('角色编码') int(11)" json:"role_id"` // 角色编码
RoleId int `xorm:"comment('角色编码') int(11)" json:"roleId"` // 角色编码
}

+ 1
- 1
main.go View File

@ -123,6 +123,6 @@ func imain() {
//启动监听端口
app.Run(iris.Addr(":8003"), iris.WithConfiguration(conf.C))
app.Run(iris.Addr(":9003"), iris.WithConfiguration(conf.C))
}

+ 18
- 18
meta/base/User.meta.go View File

@ -16,24 +16,24 @@ import (
* @Date : 2021-08-16 16:11:14
*
******************************************************************************/
var User_PlantNr = grmi.NewField("PlantNr", "User.PlantNr", "plantnr", grmi.TypeInt)
var User_UserId = grmi.NewField("UserId", "User.UserId", "userid", grmi.TypeString)
var User_Name = grmi.NewField("Name", "User.Name", "name", grmi.TypeString)
var User_NickName = grmi.NewField("NickName", "User.NickName", "nickname", grmi.TypeString)
var User_DepId = grmi.NewField("DepId", "User.DepId", "depid", grmi.TypeInt)
var User_Phone = grmi.NewField("Phone", "User.Phone", "phone", grmi.TypeString)
var User_Avatar = grmi.NewField("Avatar", "User.Avatar", "avatar", grmi.TypeString)
var User_Email = grmi.NewField("Email", "User.Email", "email", grmi.TypeString)
var User_Status = grmi.NewField("Status", "User.Status", "status", grmi.TypeString)
var User_Gender = grmi.NewField("Gender", "User.Gender", "gender", grmi.TypeString)
var User_Position = grmi.NewField("Position", "User.Position", "position", grmi.TypeString)
var User_Role = grmi.NewField("Role", "User.Role", "role", grmi.TypeString)
var User_Remark = grmi.NewField("Remark", "User.Remark", "remark", grmi.TypeString)
var User_Password = grmi.NewField("Password", "User.Password", "password", grmi.TypeString)
var User_RoleId = grmi.NewField("RoleId", "User.RoleId", "roleid", grmi.TypeInt)
var User_LastModify = grmi.NewField("LastModify", "User.LastModify", "lastmodify", grmi.TypeDateTime)
var User_LastUser = grmi.NewField("LastUser", "User.LastUser", "lastuser", grmi.TypeString)
var User_CreateTime = grmi.NewField("CreateTime", "User.CreateTime", "createtime", grmi.TypeDateTime)
var User_PlantNr = grmi.NewField("PlantNr", "[User].[PlantNr]", "plantnr", grmi.TypeInt)
var User_UserId = grmi.NewField("UserId", "[User].UserId", "userid", grmi.TypeString)
var User_Name = grmi.NewField("Name", "[User].Name", "name", grmi.TypeString)
var User_NickName = grmi.NewField("NickName", "[User].NickName", "nickname", grmi.TypeString)
var User_DepId = grmi.NewField("DepId", "[User].DepId", "depid", grmi.TypeInt)
var User_Phone = grmi.NewField("Phone", "[User].Phone", "phone", grmi.TypeString)
var User_Avatar = grmi.NewField("Avatar", "[User].Avatar", "avatar", grmi.TypeString)
var User_Email = grmi.NewField("Email", "[User].Email", "email", grmi.TypeString)
var User_Status = grmi.NewField("Status", "[User].Status", "status", grmi.TypeString)
var User_Gender = grmi.NewField("Gender", "[User].Gender", "gender", grmi.TypeString)
var User_Position = grmi.NewField("Position", "[User].Position", "position", grmi.TypeString)
var User_Role = grmi.NewField("Role", "[User].Role", "role", grmi.TypeString)
var User_Remark = grmi.NewField("Remark", "[User].Remark", "remark", grmi.TypeString)
var User_Password = grmi.NewField("Password", "[User].Password", "password", grmi.TypeString)
var User_RoleId = grmi.NewField("RoleId", "[User].RoleId", "roleid", grmi.TypeInt)
var User_LastModify = grmi.NewField("LastModify", "[User].LastModify", "lastmodify", grmi.TypeDateTime)
var User_LastUser = grmi.NewField("LastUser", "[User].LastUser", "lastuser", grmi.TypeString)
var User_CreateTime = grmi.NewField("CreateTime", "[User].CreateTime", "createtime", grmi.TypeDateTime)
/******************************************************************************
*


+ 19
- 0
services/base/Plant.service.go View File

@ -173,6 +173,25 @@ type PlantService interface {
*
******************************************************************************/
Update(*global.User, *[]model.Plant) error
/******************************************************************************
*
* @Function Name : GetPlants
*-----------------------------------------------------------------------------
*
* @Description : 项目组
*
* @Function Parameters : 当前访问人员信息
*
* @Function Parameters : 需要修改的Plant列表
*
* @Return Value : 执行时发生的错误
*
* @Author : 代码生成器创建
*
* @Date : 2021-08-16 16:11:14
*
******************************************************************************/
GetPlants() ([]model.Plant, error)
}
/******************************************************************************


+ 19
- 0
services/base/RoleMenu.service.go View File

@ -177,6 +177,25 @@ type RoleMenuService interface {
*
******************************************************************************/
Update(*global.User, *[]model.RoleMenu) error
/******************************************************************************
*
* @Function Name : GetMenuRole
*-----------------------------------------------------------------------------
*
* @Description : 获取动态菜单
*
* @Function Parameters : 当前访问人员信息
*
* @Function Parameters : 需要修改的RoleMenu列表
*
* @Return Value : 执行时发生的错误
*
* @Author : 代码生成器创建
*
* @Date : 2021-04-13 15:04:54
*
******************************************************************************/
GetMenuRole(user *global.User) ([]model.Menu, error)
}
/******************************************************************************


+ 19
- 0
services/base/User.service.go View File

@ -173,6 +173,25 @@ type UserService interface {
*
******************************************************************************/
Update(*global.User, *[]model.User) error
/******************************************************************************
*
* @Function Name : GetUserByUsername
*-----------------------------------------------------------------------------
*
* @Description : 查找指定键的User
*
* @Function Parameters : 主键
*
* @Return Value : 查找到的User
*
* @Return Value : 执行时发生的错误
*
* @Author : 代码生成器创建
*
* @Date : 2021-08-16 16:11:14
*
******************************************************************************/
GetUserByUsername(int,string) (*model.User, error)
}
/******************************************************************************


+ 19
- 0
services/base/implments/Plant.service.impl.go View File

@ -322,3 +322,22 @@ func (impl *PlantServiceImplement) Update(user *global.User, entities *[]model.P
}
return nil
}
/******************************************************************************
*
* @Reference leit.com/LAPP_CHEERSSON_BACKEND/services/base/PlantService.GetPlants
*
******************************************************************************/
func (impl *PlantServiceImplement) GetPlants() ([]model.Plant, error) {
engine := db.Eloquent.Master()
session := engine.NewSession()
defer session.Close()
dao := dal.NewPlantDAO(session, "sys")
plants, err := dao.GetPlants()
if err != nil {
return plants, err
}
return plants, nil
}

+ 21
- 0
services/base/implments/RoleMenu.service.impl.go View File

@ -305,3 +305,24 @@ func (impl *RoleMenuServiceImplement) Update(user *global.User, entities *[]mode
}
return nil
}
/******************************************************************************
*
* @Reference leit.com/LAPP_CHEERSSON_BACKEND/services/base/RoleMenuService.GetMenuRole
*
******************************************************************************/
func (impl *RoleMenuServiceImplement) GetMenuRole(user *global.User) ([]model.Menu, error) {
grmi.Log(user, "/services/base/implments/RoleMenu.service.impl.go", "GetMenuRole", "联动获取左侧动态菜单")
engine := db.Eloquent.Master()
session := engine.NewSession()
defer session.Close()
dao := dal.NewRoleMenuDAO(session, user.UserId)
record, err := dao.GetByRoleId(user.RoleId)
if err != nil {
return record, err
}
return record, nil
}

+ 21
- 0
services/base/implments/User.service.impl.go View File

@ -264,6 +264,7 @@ func (impl *UserServiceImplement) Select(user *global.User, urlParameters map[st
condition := DefaultConditionOfUserAndPaging
engine := db.Eloquent.Master()
engine.ShowSQL(true)
session := engine.NewSession()
defer session.Close()
predicates, err := condition.BuildPredicates(urlParameters)
@ -316,3 +317,23 @@ func (impl *UserServiceImplement) Update(user *global.User, entities *[]model.Us
}
return nil
}
/******************************************************************************
*
* @Reference leit.com/LAPP_CHEERSSON_BACKEND/services/base/UserService.GetUserByUsername
*
******************************************************************************/
func (impl *UserServiceImplement) GetUserByUsername(plantNr int, userId string) (*model.User, error) {
grmi.Log(nil, "/services/base/implments/User.service.impl.go", "GetUserByUsername", "查询一个User")
engine := db.Eloquent.Master()
session := engine.NewSession()
defer session.Close()
dao := dal.NewUserDAO(session, plantNr, userId)
result, err := dao.GetUserByUsername(plantNr, userId)
if err != nil {
return nil, err
}
return result, nil
}

+ 195
- 0
web/controllers/home/Home.rest.go View File

@ -0,0 +1,195 @@
package home
import (
"github.com/kataras/iris/v12"
"github.com/kataras/iris/v12/core/router"
"leit.com/LAPP_CHEERSSON_BACKEND/global"
model "leit.com/LAPP_CHEERSSON_BACKEND/models/base"
"leit.com/LAPP_CHEERSSON_BACKEND/utils"
"leit.com/LAPP_CHEERSSON_BACKEND/web/middleware/jwts"
"leit.com/LAPP_CHEERSSON_BACKEND/web/supports"
)
/******************************************************************************
*
* @Function Name : RegisterLogin
*-----------------------------------------------------------------------------
*
* @Description : 登录接口
*
* @Function Parameters : 路由分组
*
* @Function Parameters : HTTP方法
*
* @Function Parameters : 路径
*
* @Function Parameters : 实际处理请求的方法
*
* @Author : 代码生成器创建
*
* @Date : 2021-04-13 15:04:54
*
******************************************************************************/
func RegisterLogin(party router.Party, httpMethod string, path string, method func(int,string) (*model.User, error)) {
party.Handle(httpMethod, path, func(ctx iris.Context) {
var err error = nil
entity := new(model.User)
if ctx.GetContentLength() > 0 {
err := ctx.ReadJSON(entity)
if err != nil {
supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
return
}
} else {
entity = nil
supports.Error(ctx, iris.StatusBadRequest, "参数缺少!", nil)
return
}
mUser, err := method(entity.PlantNr,entity.UserId)
if err != nil {
supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
return
}
if mUser == nil { // 用户名不正确
supports.Error(ctx, iris.StatusPaymentRequired, supports.UsernameFailur, nil)
return
}
ckPassword, err := utils.CompareHashAndPassword(mUser.Password, entity.Password)
if !ckPassword {
supports.Error(ctx, iris.StatusPaymentRequired, supports.PasswordFailur, nil)
return
}
gobalUser := new(global.User)
gobalUser.UserId = mUser.UserId
gobalUser.Role = mUser.Role
gobalUser.RoleId = mUser.RoleId
gobalUser.PlantNr = mUser.PlantNr
token, err := jwts.GenerateToken(gobalUser)
if err != nil {
supports.Error(ctx, iris.StatusInternalServerError, supports.TokenCreateFailur, nil)
return
}
data := make(map[string]string)
data["token"] = token
supports.Ok(ctx, supports.LoginSuccess, data)
})
}
/******************************************************************************
*
* @Function Name : RegisterDynamicMenu
*-----------------------------------------------------------------------------
*
* @Description : 动态获取路由
*
* @Function Parameters : 路由分组
*
* @Function Parameters : 路径
*
* @Function Parameters : 实际处理请求的方法
*
* @Author : 代码生成器创建
*
* @Date : 2021-04-13 15:04:54
*
******************************************************************************/
func RegisterDynamicMenu(party router.Party, httpMethod string, path string, method func(*global.User) ([]model.Menu, error)) {
party.Handle(httpMethod, path, func(ctx iris.Context) {
user, ok := jwts.ParseToken(ctx)
if !ok {
supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil)
return
}
result, err := method(user)
if err != nil {
supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
return
}
supports.Ok(ctx, supports.OptionSuccess, result)
})
}
/******************************************************************************
*
* @Function Name : RegisterSelectPlant
*-----------------------------------------------------------------------------
*
* @Description : 为一个查询Plant的方法注册路由
*
* @Function Parameters : 路由分组
*
* @Function Parameters : 路径
*
* @Function Parameters : 实际处理请求的方法
*
* @Author : 代码生成器创建
*
* @Date : 2021-03-18 22:49:12
*
******************************************************************************/
func RegisterSelectPlants(party router.Party, httpMethod, path string, method func() ([]model.Plant, error)) {
party.Handle(httpMethod, path, func(ctx iris.Context) {
result, err := method()
if err != nil {
supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
return
}
supports.Ok(ctx, supports.OptionSuccess, result)
})
}
/******************************************************************************
*
* @Function Name : RegisterGetUserInfo
*-----------------------------------------------------------------------------
*
* @Description : 为一个查询Plant的方法注册路由
*
* @Function Parameters : 路由分组
*
* @Function Parameters : 路径
*
* @Function Parameters : 实际处理请求的方法
*
* @Author : 代码生成器创建
*
* @Date : 2021-03-18 22:49:12
*
******************************************************************************/
func RegisterGetUserInfo(party router.Party, httpMethod, path string, method func(*global.User, string) (*model.User, error)) {
party.Handle(httpMethod, path, func(ctx iris.Context) {
user, ok := jwts.ParseToken(ctx)
if !ok {
supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil)
return
}
mUser, err := method(user, user.UserId)
if err != nil {
supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
return
}
var mp = make(map[string]interface{})
var roles = make([]string, 1)
roles[0] = user.Role
var permissions = make([]string, 1)
permissions[0] = "*:*:*"
mp["permissions"] = permissions
mp["introduction"] = " am a super administrator"
mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif"
if mUser.Avatar != "" {
mp["avatar"] = mUser.Avatar
}
mp["name"] = mUser.Name
mp["nickName"] = mUser.NickName
supports.Ok(ctx, supports.Success, mp)
})
}

+ 54
- 0
web/controllers/home/home.go View File

@ -0,0 +1,54 @@
// Copyright (c) Shenyang Leading Edge Intelligent Technology Co., Ltd. All rights reserved.
/******************************************************************************
*
* @Interface Name : RegisterRoutes
*-----------------------------------------------------------------------------
*
* @Description : 基础接口
*
* @Author : lou wenzhi
*
* @Date : 2021-07-21 10:36:05
*
******************************************************************************/
package home
import (
"github.com/kataras/iris/v12/core/router"
svr "leit.com/LAPP_CHEERSSON_BACKEND/services/base"
)
/******************************************************************************
*
* @Interface Name : RegisterBaseRoutes
*-----------------------------------------------------------------------------
*
* @Description : 注册基本路由路由
*
* @Author : 代码生成器创建
*
* @Date : 2021-07-21 10:36:05
*
******************************************************************************/
func RegisterBaseRoutes(home router.Party) {
// RoleMenu的服务实例
var serviceOfRoleMenu = svr.NewRoleMenuService()
//获取动态菜单
RegisterDynamicMenu(home, "GET", "/sysMenu", serviceOfRoleMenu.GetMenuRole)
user := home.Party("/user")
// User的服务实例
var serviceOfUser = svr.NewUserService()
//登录接口
RegisterLogin(user, "POST", "/login", serviceOfUser.GetUserByUsername)
//获取用户基本信息
RegisterGetUserInfo(user, "GET", "/getuserinfo", serviceOfUser.SelectOne)
// Plant的服务实例
var serviceOfPlant = svr.NewPlantService()
//获取工厂列表
RegisterSelectPlants(user, "GET", "/plants", serviceOfPlant.GetPlants)
}

+ 17
- 16
web/middleware/jwts/jwts.go View File

@ -71,10 +71,10 @@ func Serve(ctx iris.Context) bool {
func ParseToken(ctx iris.Context) (*global.User, bool) {
mapClaims := (jwts.Get(ctx).Claims).(jwt.MapClaims)
pid, ok1 := mapClaims["pid"].(float64)
uid, ok2 := mapClaims["userid"].(string)
plantNr, ok1 := mapClaims["plantNr"].(float64)
userId, ok2 := mapClaims["userId"].(string)
role, ok3 := mapClaims["role"].(string)
role_id, ok4 := mapClaims["role_id"].(float64)
roleId, ok4 := mapClaims["roleId"].(float64)
if !ok1 || !ok2 || !ok3 || !ok4 {
supports.Error(ctx, iris.StatusInternalServerError, supports.TokenParseFailur, nil)
@ -82,10 +82,10 @@ func ParseToken(ctx iris.Context) (*global.User, bool) {
}
user := global.User{
PlantNr: int(pid),
UserId: uid,
PlantNr: int(plantNr),
UserId: userId,
Role: role,
RoleId: int(role_id),
RoleId: int(roleId),
}
return &user, true
}
@ -95,10 +95,10 @@ func ParseTokenAndSignature(ctx iris.Context) (*global.User, string, bool) {
token := jwts.Get(ctx)
mapClaims := (token.Claims).(jwt.MapClaims)
pid, ok1 := mapClaims["plantNr"].(float64)
uid, ok2 := mapClaims["userId"].(string)
plantNr, ok1 := mapClaims["plantNr"].(float64)
userId, ok2 := mapClaims["userId"].(string)
role, ok3 := mapClaims["role"].(string)
role_id, ok4 := mapClaims["roleId"].(float64)
roleId, ok4 := mapClaims["roleId"].(float64)
if !ok1 || !ok2 || !ok3 || !ok4 {
supports.Error(ctx, iris.StatusInternalServerError, supports.TokenParseFailur, nil)
@ -106,10 +106,10 @@ func ParseTokenAndSignature(ctx iris.Context) (*global.User, string, bool) {
}
user := global.User{
PlantNr: int(pid),
UserId: uid,
PlantNr: int(plantNr),
UserId: userId,
Role: role,
RoleId: int(role_id),
RoleId: int(roleId),
}
return &user, token.Signature, true
}
@ -291,10 +291,10 @@ func ConfigJWT() {
}
type Claims struct {
Pid int `json:"pid"`
Userid string `json:"userid"`
Role string `json:"role"`
RoleId int `json:"role_id"`
PlantNr int `json:"plantNr"`
Userid string `json:"userId"`
Role string `json:"role"`
RoleId int `json:"roleId"`
jwt.StandardClaims
}
@ -313,6 +313,7 @@ func GenerateToken(user *global.User) (string, error) {
Issuer: "iris-casbins-jwt",
},
}
fmt.Println(claims)
tokenClaims := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
token, err := tokenClaims.SignedString([]byte(conf.AppConfig.Other.Secret))
return token, err


+ 3
- 3
web/routes/routes.go View File

@ -11,6 +11,7 @@ import (
_ "leit.com/LAPP_CHEERSSON_BACKEND/web/controllers/me"
"leit.com/LAPP_CHEERSSON_BACKEND/web/middleware"
"leit.com/LAPP_CHEERSSON_BACKEND/web/middleware/cors"
homereg "leit.com/LAPP_CHEERSSON_BACKEND/web/controllers/home"
"github.com/kataras/iris/v12"
)
@ -22,9 +23,8 @@ func Hub(app *iris.Application) {
//中间件,验证token和权限路径
main.Use(middleware.ServeHTTP)
//home := main.Party("/")
//home.Get("/sysMenu", controllers.DynamicMenu) // 获取动态菜单
home := main.Party("/")
homereg.RegisterBaseRoutes(home)
// 用户API模块
//user := main.Party("/user")


Loading…
Cancel
Save