mmm-go / oppmg · 提交

转到一个项目

作者 唐旭辉
提交 9e1e8f70db54941e600ddc750ddffd69825692dd 1 个父辈 e2ba665e

bug fix

内嵌 并排对比
正在显示 3 个修改的文件 包含 33 行增加 和 1 行删除
@@ -103,6 +103,14 @@ func (c *AuthController) LoginSms() { @@ -103,6 +103,14 @@ func (c *AuthController) LoginSms() {
103 } 103 }
104 104
105 logintoken, err := serveauth.LoginAuthBySmsCode(param.Account, param.Code) 105 logintoken, err := serveauth.LoginAuthBySmsCode(param.Account, param.Code)
  106 + err = serveauth.ResetLoginToken(logintoken)
  107 + if err != nil {
  108 + log.Error("token 信息记录数据库失败")
  109 + }
  110 + err = serveauth.ResetLoginTokenRedis(logintoken)
  111 + if err != nil {
  112 + log.Error("token 信息记录redis失败")
  113 + }
106 data := protocol.ResponseLogin{ 114 data := protocol.ResponseLogin{
107 Access: logintoken, 115 Access: logintoken,
108 } 116 }
@@ -479,6 +479,7 @@ func UserDelete(userCompanyids []int64, companyid int64) error { @@ -479,6 +479,7 @@ func UserDelete(userCompanyids []int64, companyid int64) error {
479 Filter("id__in", ids). 479 Filter("id__in", ids).
480 Update(orm.Params{ 480 Update(orm.Params{
481 "delete_at": time.Now().String(), 481 "delete_at": time.Now().String(),
  482 + "enable": models.USERCOMPANY_ENABLE_NO,
482 }) 483 })
483 if err != nil { 484 if err != nil {
484 e := fmt.Errorf("UserDelete err:%s", err) 485 e := fmt.Errorf("UserDelete err:%s", err)
@@ -35,7 +35,30 @@ type PermissionBase struct { @@ -35,7 +35,30 @@ type PermissionBase struct {
35 ActionName string 35 ActionName string
36 } 36 }
37 37
38 -var routerPermission = map[string]PermissionBase{} 38 +var routerPermission = map[string]PermissionBase{
  39 + "/v1/department/list": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
  40 + "/v1/department/add": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
  41 + "/v1/department/edit": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
  42 + "/v1/department/delete": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
  43 + "/v1/company/current/edit": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},
  44 + "/v1/company/current/info": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},
  45 + "/v1/position/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
  46 + "/v1/position/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
  47 + "/v1/position/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
  48 + "/v1/position/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
  49 + "/v1/rbac/role/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  50 + "/v1/rbac/role/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  51 + "/v1/rbac/role/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  52 + "/v1/rbac/role/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  53 + "/v1/rbac/role_group/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  54 + "/v1/rbac/role_group/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  55 + "/v1/rbac/role_group/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  56 + "/v1/rbac/menu/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  57 + "/v1/rbac/menu": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  58 + "/v1/rbac/menu/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  59 + "/v1/rbac/menu/opportunity": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  60 + "/v1/rbac/menu/opportunity/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
  61 +}
39 62
40 type CodeToObject func() PermissionOptionObject 63 type CodeToObject func() PermissionOptionObject
41 64