diff --git a/app/api/manage/api/account.go b/app/api/admin/api/account.go similarity index 69% rename from app/api/manage/api/account.go rename to app/api/admin/api/account.go index 3937cbd..67caca8 100644 --- a/app/api/manage/api/account.go +++ b/app/api/admin/api/account.go @@ -1,9 +1,10 @@ package api import ( - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/api/admin/controller" + "SciencesServer/app/basic/api" "SciencesServer/app/service" - session "SciencesServer/app/session" + "SciencesServer/app/session" "SciencesServer/config" "github.com/gin-gonic/gin" @@ -43,20 +44,19 @@ type Account struct{} */ func (a *Account) Login(c *gin.Context) { form := &struct { + Mode int `json:"mode" form:"mode" binding:"required"` Account string `json:"account" form:"account" binding:"required"` - Password string `json:"password" form:"password" binding:"required"` - Captcha struct { - Key string `json:"key" form:"key"` - Value string `json:"value" form:"value"` - } `json:"captcha" form:"captcha"` + Password string `json:"password" form:"password"` + Captcha string `json:"captcha" form:"captcha"` }{} - if err := bind(form)(c); err != nil { + if err := api.Bind(form)(c); err != nil { APIFailure(err.(error))(c) return } - data, err := controller.NewAccount()(nil).Login(form.Account, form.Password, form.Captcha.Key, form.Captcha.Value, - c.GetHeader("x-equipment"), c.ClientIP()) - APIResponse(err, data)(c) + data, err := controller.NewAccount()(nil, api.GetTenantID()(c).(uint64)).Login(form.Mode, &controller.AccountLoginParams{ + Account: form.Account, Password: form.Password, Captcha: form.Captcha, + }, c.GetHeader("x-equipment"), c.ClientIP()) + api.APIResponse(err, data)(c) } /** @@ -82,10 +82,10 @@ func (a *Account) Logout(c *gin.Context) { // 因跳过中间键，故只能自己去获取token用户信息 token := c.GetHeader(config.APIRequestToken) - _session := session.NewManage() + _session := session.NewAdmin() - _ = service.NewAuthToken(token).Auth(config.RedisKeyForAccountManage, _session) + _ = service.NewAuthToken(token).Auth(config.RedisKeyForAccountAdmin, _session) - err := controller.NewAccount()(_session).Logout() - APIResponse(err)(c) + err := controller.NewAccount()(_session, 0).Logout() + api.APIResponse(err)(c) } diff --git a/app/api/manage/api/auth.go b/app/api/admin/api/auth.go similarity index 96% rename from app/api/manage/api/auth.go rename to app/api/admin/api/auth.go index a837c20..cc3f174 100644 --- a/app/api/manage/api/auth.go +++ b/app/api/admin/api/auth.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/manage/controller/auth" + "SciencesServer/app/api/admin/controller/auth" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/manage/api/base.go b/app/api/admin/api/base.go similarity index 100% rename from app/api/manage/api/base.go rename to app/api/admin/api/base.go diff --git a/app/api/manage/api/captcha.go b/app/api/admin/api/captcha.go similarity index 100% rename from app/api/manage/api/captcha.go rename to app/api/admin/api/captcha.go diff --git a/app/api/manage/api/config.go b/app/api/admin/api/config.go similarity index 93% rename from app/api/manage/api/config.go rename to app/api/admin/api/config.go index b63fb46..7a5dabd 100644 --- a/app/api/manage/api/config.go +++ b/app/api/admin/api/config.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/api/admin/controller" "github.com/gin-gonic/gin" ) diff --git a/app/api/manage/api/department.go b/app/api/admin/api/department.go similarity index 97% rename from app/api/manage/api/department.go rename to app/api/admin/api/department.go index ba8db3e..41b12ee 100644 --- a/app/api/manage/api/department.go +++ b/app/api/admin/api/department.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/api/admin/controller" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/manage/api/logs.go b/app/api/admin/api/logs.go similarity index 90% rename from app/api/manage/api/logs.go rename to app/api/admin/api/logs.go index 72def34..0d18fa8 100644 --- a/app/api/manage/api/logs.go +++ b/app/api/admin/api/logs.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/api/admin/controller" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/manage/api/manage.go b/app/api/admin/api/manage.go similarity index 92% rename from app/api/manage/api/manage.go rename to app/api/admin/api/manage.go index c9cb08c..0cf3d2d 100644 --- a/app/api/manage/api/manage.go +++ b/app/api/admin/api/manage.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/manage/controller/manage" + "SciencesServer/app/api/admin/controller/manage" "SciencesServer/app/basic/api" "SciencesServer/app/basic/config" "SciencesServer/app/service" @@ -36,7 +36,7 @@ func (*Manage) CompanyExamine(c *gin.Context) { return } form.Identity = config.TenantUserIdentityForCompany - err := form.handle(api.GetSession()(c).(*service.Session), api.GetLocal()(c).(string)) + err := form.handle(api.GetSession()(c).(*service.Session), api.GetTenantID()(c).(string)) api.APIResponse(err) } @@ -50,7 +50,7 @@ func (*Manage) Expert(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewInstance()(api.GetSession()(c).(*service.Session), api.GetLocal()(c).(string)). + data, err := manage.NewInstance()(api.GetSession()(c).(*service.Session), api.GetTenantID()(c).(string)). Expert(form.Name, form.Status, form.Page, form.PageSize) api.APIResponse(err, data) } @@ -63,7 +63,7 @@ func (*Manage) ExpertExamine(c *gin.Context) { return } form.Identity = config.TenantUserIdentityForExpert - err := form.handle(api.GetSession()(c).(*service.Session), api.GetLocal()(c).(string)) + err := form.handle(api.GetSession()(c).(*service.Session), api.GetTenantID()(c).(string)) api.APIResponse(err) } @@ -79,7 +79,7 @@ func (*Manage) LaboratoryExamine(c *gin.Context) { return } form.Identity = config.TenantUserIdentityForLaboratory - err := form.handle(api.GetSession()(c).(*service.Session), api.GetLocal()(c).(string)) + err := form.handle(api.GetSession()(c).(*service.Session), api.GetTenantID()(c).(string)) api.APIResponse(err) } @@ -95,7 +95,7 @@ func (*Manage) ResearchExamine(c *gin.Context) { return } form.Identity = config.TenantUserIdentityForResearch - err := form.handle(api.GetSession()(c).(*service.Session), api.GetLocal()(c).(string)) + err := form.handle(api.GetSession()(c).(*service.Session), api.GetTenantID()(c).(string)) api.APIResponse(err) } @@ -111,6 +111,6 @@ func (*Manage) AgentExamine(c *gin.Context) { return } form.Identity = config.TenantUserIdentityForAgent - err := form.handle(api.GetSession()(c).(*service.Session), api.GetLocal()(c).(string)) + err := form.handle(api.GetSession()(c).(*service.Session), api.GetTenantID()(c).(string)) api.APIResponse(err) } diff --git a/app/api/manage/api/menu.go b/app/api/admin/api/menu.go similarity index 99% rename from app/api/manage/api/menu.go rename to app/api/admin/api/menu.go index ef5e548..0f7a1ff 100644 --- a/app/api/manage/api/menu.go +++ b/app/api/admin/api/menu.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/manage/controller/menu" + "SciencesServer/app/api/admin/controller/menu" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/manage/api/role.go b/app/api/admin/api/role.go similarity index 99% rename from app/api/manage/api/role.go rename to app/api/admin/api/role.go index d6b67ff..3ecd84c 100644 --- a/app/api/manage/api/role.go +++ b/app/api/admin/api/role.go @@ -1,7 +1,7 @@ package api import ( - role2 "SciencesServer/app/api/manage/controller/role" + role2 "SciencesServer/app/api/admin/controller/role" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/manage/api/struct.go b/app/api/admin/api/struct.go similarity index 100% rename from app/api/manage/api/struct.go rename to app/api/admin/api/struct.go diff --git a/app/api/manage/api/tenant.go b/app/api/admin/api/tenant.go similarity index 99% rename from app/api/manage/api/tenant.go rename to app/api/admin/api/tenant.go index db93357..c2bad5b 100644 --- a/app/api/manage/api/tenant.go +++ b/app/api/admin/api/tenant.go @@ -1,7 +1,7 @@ package api import ( - tenant2 "SciencesServer/app/api/manage/controller/tenant" + tenant2 "SciencesServer/app/api/admin/controller/tenant" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/manage/api/user.go b/app/api/admin/api/user.go similarity index 99% rename from app/api/manage/api/user.go rename to app/api/admin/api/user.go index fdf54c2..5c08779 100644 --- a/app/api/manage/api/user.go +++ b/app/api/admin/api/user.go @@ -1,7 +1,7 @@ package api import ( - user2 "SciencesServer/app/api/manage/controller/user" + user2 "SciencesServer/app/api/admin/controller/user" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/admin/controller/account.go b/app/api/admin/controller/account.go index b0b429f..25b34c1 100644 --- a/app/api/admin/controller/account.go +++ b/app/api/admin/controller/account.go @@ -1 +1,125 @@ package controller + +import ( + "SciencesServer/app/api/admin/model" + model2 "SciencesServer/app/common/model" + "SciencesServer/app/handle" + "SciencesServer/app/service" + "SciencesServer/app/session" + "SciencesServer/config" + "SciencesServer/utils" + "errors" + "fmt" +) + +type Account struct { + session *session.Admin + tenantID uint64 +} + +type AccountHandle func(session *session.Admin, tenantID uint64) *Account + +type ( + // AccountLoginParams 登陆参数 + AccountLoginParams struct { + Account, Password, Captcha string + } + // AccountLoginResponse 登陆响应 + AccountLoginResponse struct { + Token string `json:"token"` + EffectTime int `json:"effect_time"` + } +) + +// loginHandle 登陆操作，1：账户密码登陆，2：短信验证登陆 +var loginHandle = map[int]func(params *AccountLoginParams, tenantID uint64) (*model.SysUser, error){ + 1: loginForPassword, 2: loginForSmsCaptcha, +} + +// loginForPassword 密码登陆 +func loginForPassword(params *AccountLoginParams, tenantID uint64) (*model.SysUser, error) { + if params.Password == "" { + return nil, errors.New("操作错误，密码不可为空") + } + mSysUser := model.NewSysUser() + + isExist, err := mSysUser.GetByAccountOrMobile(params.Account, tenantID) + + if err != nil { + return nil, err + } else if !isExist { + return nil, errors.New("操作错误，当前帐号信息不存在或已被删除") + } + if !mSysUser.ValidatePassword(params.Password) { + return nil, errors.New("操作错误，用户名或密码错误") + } + return mSysUser, nil +} + +// loginForSmsCaptcha 短信验证码登陆 +func loginForSmsCaptcha(params *AccountLoginParams, tenantID uint64) (*model.SysUser, error) { + if params.Password == "" { + return nil, errors.New("操作错误，验证码不可为空") + } + // 验证验证码 + if pass, _ := handle.NewCaptcha().Validate(&handle.CaptchaSms{Mobile: params.Account, Captcha: params.Captcha}); !pass { + return nil, errors.New("操作错误，验证码错误") + } + mSysUser := model.NewSysUser() + + isExist, err := model2.FirstField(mSysUser.SysUser, []string{ + "id", "tenant_id", "name", "mobile", "is_admin", "status", + }, model2.NewWhere("tenant_id", tenantID), model2.NewWhere("mobile", params.Account)) + + if err != nil { + return nil, err + } else if !isExist { + return nil, errors.New("操作错误，当前帐号信息不存在或已被删除") + } + return mSysUser, nil +} + +// Login 登录请求 +func (c *Account) Login(mode int, params *AccountLoginParams, equipment, ip string) (*AccountLoginResponse, error) { + _handle, has := loginHandle[mode] + + if !has { + return nil, errors.New("操作错误，未知的登陆模式") + } + data, err := _handle(params, c.tenantID) + + if err != nil { + return nil, err + } else if data.Status != model2.SysUserStatusForNormal { + return nil, errors.New(fmt.Sprintf("操作错误，当前账号【%s】状态异常，已禁止登陆，请联系管理员", data.Name)) + } + _session := session.NewAdmin() + _session.UID = data.UUID + _session.TenantID = data.TenantID + _session.Name = data.Name + _session.Mobile = data.Mobile + _session.IsAdmin = data.IsAdminUser() + + _uid := data.UUIDString() + + _session.Token = utils.JWTEncrypt(config.SettingInfo.TokenEffectTime, map[string]interface{}{config.TokenForUID: _uid}) + + service.Publish(config.EventForRedisHashProduce, config.RedisKeyForAccountAdmin, _uid, _session) + service.Publish(config.EventForAccountLoginProduce, data.TenantID, _session.UID, equipment, ip) + + return &AccountLoginResponse{Token: _session.Token, EffectTime: config.SettingInfo.TokenEffectTime}, nil +} + +// Logout 退出请求 +func (c *Account) Logout() error { + if c.session != nil && c.session.UID > 0 { + service.Publish(config.EventForRedisHashDestroy, config.RedisKeyForAccountAdmin, utils.UintToString(c.session.UID)) + } + return nil +} + +func NewAccount() AccountHandle { + return func(session *session.Admin, tenantID uint64) *Account { + return &Account{session: session, tenantID: tenantID} + } +} diff --git a/app/api/manage/controller/auth/base.go b/app/api/admin/controller/auth/base.go similarity index 96% rename from app/api/manage/controller/auth/base.go rename to app/api/admin/controller/auth/base.go index 389dca2..552fc6b 100644 --- a/app/api/manage/controller/auth/base.go +++ b/app/api/admin/controller/auth/base.go @@ -1,7 +1,7 @@ package auth import ( - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" ) diff --git a/app/api/manage/controller/auth/instance.go b/app/api/admin/controller/auth/instance.go similarity index 90% rename from app/api/manage/controller/auth/instance.go rename to app/api/admin/controller/auth/instance.go index 2a11e54..983805d 100644 --- a/app/api/manage/controller/auth/instance.go +++ b/app/api/admin/controller/auth/instance.go @@ -1,8 +1,8 @@ package auth import ( - "SciencesServer/app/api/manage/controller" - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" ) diff --git a/app/api/manage/controller/base.go b/app/api/admin/controller/base.go similarity index 100% rename from app/api/manage/controller/base.go rename to app/api/admin/controller/base.go diff --git a/app/api/manage/controller/config.go b/app/api/admin/controller/config.go similarity index 97% rename from app/api/manage/controller/config.go rename to app/api/admin/controller/config.go index 8078da1..ca6e20d 100644 --- a/app/api/manage/controller/config.go +++ b/app/api/admin/controller/config.go @@ -1,7 +1,7 @@ package controller import ( - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/config" "SciencesServer/serve/orm" diff --git a/app/api/manage/controller/department.go b/app/api/admin/controller/department.go similarity index 98% rename from app/api/manage/controller/department.go rename to app/api/admin/controller/department.go index bab39bc..acd1bfa 100644 --- a/app/api/manage/controller/department.go +++ b/app/api/admin/controller/department.go @@ -1,7 +1,7 @@ package controller import ( - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "time" diff --git a/app/api/manage/controller/logs.go b/app/api/admin/controller/logs.go similarity index 96% rename from app/api/manage/controller/logs.go rename to app/api/admin/controller/logs.go index 9401cc3..1481b49 100644 --- a/app/api/manage/controller/logs.go +++ b/app/api/admin/controller/logs.go @@ -1,7 +1,7 @@ package controller import ( - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/tools/ip" diff --git a/app/api/manage/controller/manage/examine.go b/app/api/admin/controller/manage/examine.go similarity index 99% rename from app/api/manage/controller/manage/examine.go rename to app/api/admin/controller/manage/examine.go index 6e16ae6..0bc8838 100644 --- a/app/api/manage/controller/manage/examine.go +++ b/app/api/admin/controller/manage/examine.go @@ -1,7 +1,7 @@ package manage import ( - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/model" "SciencesServer/app/basic/config" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" diff --git a/app/api/manage/controller/manage/instance.go b/app/api/admin/controller/manage/instance.go similarity index 96% rename from app/api/manage/controller/manage/instance.go rename to app/api/admin/controller/manage/instance.go index 68d154a..c53daed 100644 --- a/app/api/manage/controller/manage/instance.go +++ b/app/api/admin/controller/manage/instance.go @@ -1,8 +1,8 @@ package manage import ( - "SciencesServer/app/api/manage/controller" - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + "SciencesServer/app/api/admin/model" "SciencesServer/app/basic/config" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" diff --git a/app/api/manage/controller/menu/base.go b/app/api/admin/controller/menu/base.go similarity index 98% rename from app/api/manage/controller/menu/base.go rename to app/api/admin/controller/menu/base.go index 998953b..d72eb1d 100644 --- a/app/api/manage/controller/menu/base.go +++ b/app/api/admin/controller/menu/base.go @@ -1,7 +1,7 @@ package menu import ( - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" ) diff --git a/app/api/manage/controller/menu/menu.go b/app/api/admin/controller/menu/menu.go similarity index 96% rename from app/api/manage/controller/menu/menu.go rename to app/api/admin/controller/menu/menu.go index 1956f08..caeedd6 100644 --- a/app/api/manage/controller/menu/menu.go +++ b/app/api/admin/controller/menu/menu.go @@ -1,8 +1,8 @@ package menu import ( - "SciencesServer/app/api/manage/controller" - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "errors" diff --git a/app/api/manage/controller/role/auth.go b/app/api/admin/controller/role/auth.go similarity index 94% rename from app/api/manage/controller/role/auth.go rename to app/api/admin/controller/role/auth.go index 79db6bf..c10a702 100644 --- a/app/api/manage/controller/role/auth.go +++ b/app/api/admin/controller/role/auth.go @@ -1,9 +1,9 @@ package role import ( - "SciencesServer/app/api/manage/controller" - auth2 "SciencesServer/app/api/manage/controller/auth" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + auth2 "SciencesServer/app/api/admin/controller/auth" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/serve/orm" diff --git a/app/api/manage/controller/role/instance.go b/app/api/admin/controller/role/instance.go similarity index 98% rename from app/api/manage/controller/role/instance.go rename to app/api/admin/controller/role/instance.go index d637fe3..2c388ce 100644 --- a/app/api/manage/controller/role/instance.go +++ b/app/api/admin/controller/role/instance.go @@ -1,8 +1,8 @@ package role import ( - "SciencesServer/app/api/manage/controller" - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/utils" diff --git a/app/api/manage/controller/role/menu.go b/app/api/admin/controller/role/menu.go similarity index 92% rename from app/api/manage/controller/role/menu.go rename to app/api/admin/controller/role/menu.go index ec7a656..e11001f 100644 --- a/app/api/manage/controller/role/menu.go +++ b/app/api/admin/controller/role/menu.go @@ -1,9 +1,9 @@ package role import ( - "SciencesServer/app/api/manage/controller" - menu2 "SciencesServer/app/api/manage/controller/menu" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + menu2 "SciencesServer/app/api/admin/controller/menu" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/serve/orm" diff --git a/app/api/manage/controller/role/user.go b/app/api/admin/controller/role/user.go similarity index 95% rename from app/api/manage/controller/role/user.go rename to app/api/admin/controller/role/user.go index 3bb09a0..5c1c51a 100644 --- a/app/api/manage/controller/role/user.go +++ b/app/api/admin/controller/role/user.go @@ -1,8 +1,8 @@ package role import ( - "SciencesServer/app/api/manage/controller" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/serve/orm" diff --git a/app/api/admin/controller/tenant.go b/app/api/admin/controller/tenant.go deleted file mode 100644 index b0b429f..0000000 --- a/app/api/admin/controller/tenant.go +++ /dev/null @@ -1 +0,0 @@ -package controller diff --git a/app/api/manage/controller/tenant/auth.go b/app/api/admin/controller/tenant/auth.go similarity index 97% rename from app/api/manage/controller/tenant/auth.go rename to app/api/admin/controller/tenant/auth.go index 248e1f1..780fc06 100644 --- a/app/api/manage/controller/tenant/auth.go +++ b/app/api/admin/controller/tenant/auth.go @@ -1,8 +1,8 @@ package tenant import ( - "SciencesServer/app/api/manage/controller" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/serve/logger" diff --git a/app/api/manage/controller/tenant/instance.go b/app/api/admin/controller/tenant/instance.go similarity index 98% rename from app/api/manage/controller/tenant/instance.go rename to app/api/admin/controller/tenant/instance.go index 367f986..1025e68 100644 --- a/app/api/manage/controller/tenant/instance.go +++ b/app/api/admin/controller/tenant/instance.go @@ -1,10 +1,10 @@ package tenant import ( - "SciencesServer/app/api/manage/controller" - auth2 "SciencesServer/app/api/manage/controller/auth" - menu2 "SciencesServer/app/api/manage/controller/menu" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + auth2 "SciencesServer/app/api/admin/controller/auth" + menu2 "SciencesServer/app/api/admin/controller/menu" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/config" diff --git a/app/api/manage/controller/tenant/menu.go b/app/api/admin/controller/tenant/menu.go similarity index 93% rename from app/api/manage/controller/tenant/menu.go rename to app/api/admin/controller/tenant/menu.go index e41fc52..821e024 100644 --- a/app/api/manage/controller/tenant/menu.go +++ b/app/api/admin/controller/tenant/menu.go @@ -1,9 +1,9 @@ package tenant import ( - "SciencesServer/app/api/manage/controller" - menu2 "SciencesServer/app/api/manage/controller/menu" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + menu2 "SciencesServer/app/api/admin/controller/menu" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/serve/orm" diff --git a/app/api/manage/controller/tenant/struct.go b/app/api/admin/controller/tenant/struct.go similarity index 100% rename from app/api/manage/controller/tenant/struct.go rename to app/api/admin/controller/tenant/struct.go diff --git a/app/api/manage/controller/tenant/sub.go b/app/api/admin/controller/tenant/sub.go similarity index 100% rename from app/api/manage/controller/tenant/sub.go rename to app/api/admin/controller/tenant/sub.go diff --git a/app/api/manage/controller/user/instance.go b/app/api/admin/controller/user/instance.go similarity index 98% rename from app/api/manage/controller/user/instance.go rename to app/api/admin/controller/user/instance.go index d3a40d3..7fc1a97 100644 --- a/app/api/manage/controller/user/instance.go +++ b/app/api/admin/controller/user/instance.go @@ -1,8 +1,8 @@ package user import ( - "SciencesServer/app/api/manage/controller" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/serve/orm" diff --git a/app/api/manage/controller/user/menu.go b/app/api/admin/controller/user/menu.go similarity index 87% rename from app/api/manage/controller/user/menu.go rename to app/api/admin/controller/user/menu.go index 7ec0225..625a3a7 100644 --- a/app/api/manage/controller/user/menu.go +++ b/app/api/admin/controller/user/menu.go @@ -1,9 +1,9 @@ package user import ( - "SciencesServer/app/api/manage/controller" - menu2 "SciencesServer/app/api/manage/controller/menu" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + menu2 "SciencesServer/app/api/admin/controller/menu" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" ) diff --git a/app/api/manage/controller/user/person.go b/app/api/admin/controller/user/person.go similarity index 96% rename from app/api/manage/controller/user/person.go rename to app/api/admin/controller/user/person.go index 642fbd4..223bd27 100644 --- a/app/api/manage/controller/user/person.go +++ b/app/api/admin/controller/user/person.go @@ -1,7 +1,7 @@ package user import ( - "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "errors" diff --git a/app/api/manage/controller/user/role.go b/app/api/admin/controller/user/role.go similarity index 95% rename from app/api/manage/controller/user/role.go rename to app/api/admin/controller/user/role.go index 9ef597b..9b35218 100644 --- a/app/api/manage/controller/user/role.go +++ b/app/api/admin/controller/user/role.go @@ -1,8 +1,8 @@ package user import ( - "SciencesServer/app/api/manage/controller" - model3 "SciencesServer/app/api/manage/model" + "SciencesServer/app/api/admin/controller" + model3 "SciencesServer/app/api/admin/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/serve/orm" diff --git a/app/api/manage/model/manage_agent.go b/app/api/admin/model/manage_agent.go similarity index 100% rename from app/api/manage/model/manage_agent.go rename to app/api/admin/model/manage_agent.go diff --git a/app/api/manage/model/manage_company.go b/app/api/admin/model/manage_company.go similarity index 100% rename from app/api/manage/model/manage_company.go rename to app/api/admin/model/manage_company.go diff --git a/app/api/manage/model/manage_expert.go b/app/api/admin/model/manage_expert.go similarity index 100% rename from app/api/manage/model/manage_expert.go rename to app/api/admin/model/manage_expert.go diff --git a/app/api/manage/model/manage_laboratory.go b/app/api/admin/model/manage_laboratory.go similarity index 100% rename from app/api/manage/model/manage_laboratory.go rename to app/api/admin/model/manage_laboratory.go diff --git a/app/api/manage/model/manage_research.go b/app/api/admin/model/manage_research.go similarity index 100% rename from app/api/manage/model/manage_research.go rename to app/api/admin/model/manage_research.go diff --git a/app/api/manage/model/sys_auth.go b/app/api/admin/model/sys_auth.go similarity index 100% rename from app/api/manage/model/sys_auth.go rename to app/api/admin/model/sys_auth.go diff --git a/app/api/manage/model/sys_config.go b/app/api/admin/model/sys_config.go similarity index 100% rename from app/api/manage/model/sys_config.go rename to app/api/admin/model/sys_config.go diff --git a/app/api/manage/model/sys_deparement.go b/app/api/admin/model/sys_deparement.go similarity index 100% rename from app/api/manage/model/sys_deparement.go rename to app/api/admin/model/sys_deparement.go diff --git a/app/api/manage/model/sys_industry.go b/app/api/admin/model/sys_industry.go similarity index 100% rename from app/api/manage/model/sys_industry.go rename to app/api/admin/model/sys_industry.go diff --git a/app/api/manage/model/sys_log.go b/app/api/admin/model/sys_log.go similarity index 100% rename from app/api/manage/model/sys_log.go rename to app/api/admin/model/sys_log.go diff --git a/app/api/manage/model/sys_menu.go b/app/api/admin/model/sys_menu.go similarity index 100% rename from app/api/manage/model/sys_menu.go rename to app/api/admin/model/sys_menu.go diff --git a/app/api/manage/model/sys_role.go b/app/api/admin/model/sys_role.go similarity index 100% rename from app/api/manage/model/sys_role.go rename to app/api/admin/model/sys_role.go diff --git a/app/api/manage/model/sys_role_auth.go b/app/api/admin/model/sys_role_auth.go similarity index 100% rename from app/api/manage/model/sys_role_auth.go rename to app/api/admin/model/sys_role_auth.go diff --git a/app/api/manage/model/sys_role_menu.go b/app/api/admin/model/sys_role_menu.go similarity index 100% rename from app/api/manage/model/sys_role_menu.go rename to app/api/admin/model/sys_role_menu.go diff --git a/app/api/manage/model/sys_tenant.go b/app/api/admin/model/sys_tenant.go similarity index 100% rename from app/api/manage/model/sys_tenant.go rename to app/api/admin/model/sys_tenant.go diff --git a/app/api/manage/model/sys_tenant_auth.go b/app/api/admin/model/sys_tenant_auth.go similarity index 100% rename from app/api/manage/model/sys_tenant_auth.go rename to app/api/admin/model/sys_tenant_auth.go diff --git a/app/api/manage/model/sys_tenant_menu.go b/app/api/admin/model/sys_tenant_menu.go similarity index 100% rename from app/api/manage/model/sys_tenant_menu.go rename to app/api/admin/model/sys_tenant_menu.go diff --git a/app/api/manage/model/sys_user.go b/app/api/admin/model/sys_user.go similarity index 51% rename from app/api/manage/model/sys_user.go rename to app/api/admin/model/sys_user.go index 736cd0d..b80da7b 100644 --- a/app/api/manage/model/sys_user.go +++ b/app/api/admin/model/sys_user.go @@ -1,7 +1,7 @@ package model import ( - model2 "SciencesServer/app/common/model" + "SciencesServer/app/common/model" "SciencesServer/serve/orm" "SciencesServer/utils" "errors" @@ -11,7 +11,7 @@ import ( // SysUser 用户信息 type SysUser struct { - *model2.SysUser + *model.SysUser } func (m *SysUser) ValidatePassword(password string) bool { @@ -19,12 +19,15 @@ func (m *SysUser) ValidatePassword(password string) bool { } func (m *SysUser) IsAdminUser() bool { - return m.IsAdmin == model2.SysUserAdministratorForAdmin + return m.IsAdmin == model.SysUserAdministratorForAdmin } -func (m *SysUser) GetByAccountOrMobile(param string) (bool, error) { - db := orm.GetDB().Table(m.TableName()).Where("(account = ? OR mobile = ?)", param, param). - Where("is_deleted = ?", model2.DeleteStatusForNot) +func (m *SysUser) GetByAccountOrMobile(account string, tenantID uint64) (bool, error) { + db := orm.GetDB().Table(m.TableName()). + Select("id", "tenant_id", "name", "mobile", "password", "salt", "is_admin", "status"). + Where("tenant_id = ?", tenantID). + Where("(account = ? OR mobile = ?)", account, account). + Where("is_deleted = ?", model.DeleteStatusForNot) if err := db.First(m.SysUser).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { @@ -36,5 +39,5 @@ func (m *SysUser) GetByAccountOrMobile(param string) (bool, error) { } func NewSysUser() *SysUser { - return &SysUser{SysUser: model2.NewSysUser()} + return &SysUser{SysUser: model.NewSysUser()} } diff --git a/app/api/manage/model/sys_user_login_log.go b/app/api/admin/model/sys_user_login_log.go similarity index 100% rename from app/api/manage/model/sys_user_login_log.go rename to app/api/admin/model/sys_user_login_log.go diff --git a/app/api/manage/model/sys_user_role.go b/app/api/admin/model/sys_user_role.go similarity index 100% rename from app/api/manage/model/sys_user_role.go rename to app/api/admin/model/sys_user_role.go diff --git a/app/api/manage/model/sys_user_tenant.go b/app/api/admin/model/sys_user_tenant.go similarity index 100% rename from app/api/manage/model/sys_user_tenant.go rename to app/api/admin/model/sys_user_tenant.go diff --git a/app/api/manage/model/user_agent.go b/app/api/admin/model/user_agent.go similarity index 100% rename from app/api/manage/model/user_agent.go rename to app/api/admin/model/user_agent.go diff --git a/app/api/manage/model/user_company.go b/app/api/admin/model/user_company.go similarity index 100% rename from app/api/manage/model/user_company.go rename to app/api/admin/model/user_company.go diff --git a/app/api/manage/model/user_expert.go b/app/api/admin/model/user_expert.go similarity index 100% rename from app/api/manage/model/user_expert.go rename to app/api/admin/model/user_expert.go diff --git a/app/api/manage/model/user_identity.go b/app/api/admin/model/user_identity.go similarity index 100% rename from app/api/manage/model/user_identity.go rename to app/api/admin/model/user_identity.go diff --git a/app/api/manage/model/user_instance.go b/app/api/admin/model/user_instance.go similarity index 100% rename from app/api/manage/model/user_instance.go rename to app/api/admin/model/user_instance.go diff --git a/app/api/manage/model/user_laboratory.go b/app/api/admin/model/user_laboratory.go similarity index 100% rename from app/api/manage/model/user_laboratory.go rename to app/api/admin/model/user_laboratory.go diff --git a/app/api/manage/model/user_research.go b/app/api/admin/model/user_research.go similarity index 100% rename from app/api/manage/model/user_research.go rename to app/api/admin/model/user_research.go diff --git a/app/api/enterprise/api/account.go b/app/api/enterprise/api/account.go index 263f070..eb2afd7 100644 --- a/app/api/enterprise/api/account.go +++ b/app/api/enterprise/api/account.go @@ -34,7 +34,7 @@ func (a *Account) Login(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := account.NewLogin()(api.GetLocal()(c).(string)).Launch(account.LoginMode(form.Mode), &account.LoginParams{ + data, err := account.NewLogin()(api.GetTenantID()(c).(string)).Launch(account.LoginMode(form.Mode), &account.LoginParams{ Captcha: struct { Mobile string Captcha string @@ -54,7 +54,7 @@ func (a *Account) Register(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := account.NewRegister()(api.GetLocal()(c).(string)).Launch(&account.RegisterParams{ + data, err := account.NewRegister()(api.GetTenantID()(c).(string)).Launch(&account.RegisterParams{ Name: form.Name, Mobile: form.Mobile, Captcha: form.Captcha, Password: form.Password, RepeatPass: form.RepeatPass, }) diff --git a/app/api/enterprise/api/activity.go b/app/api/enterprise/api/activity.go index 9c555a6..3d009d8 100644 --- a/app/api/enterprise/api/activity.go +++ b/app/api/enterprise/api/activity.go @@ -18,7 +18,7 @@ func (*Activity) Applys(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Title, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -39,7 +39,7 @@ func (*Activity) ApplyLaunch(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Launch(&activity.ApplyLaunchParams{ Mode: form.Mode, MaxNUmber: form.MaxNumber, Title: form.Title, Amount: form.Amount, Content: form.Content, BeginAt: form.BeginAt, FinishAt: form.FinishAt, JoinDeadline: form.JoinDeadline, @@ -54,7 +54,7 @@ func (*Activity) ApplyRevoke(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Revoke(form.Convert()) api.APIResponse(err)(c) } @@ -66,7 +66,7 @@ func (*Activity) ApplyDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -81,7 +81,7 @@ func (*Activity) Joins(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := activity.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := activity.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Joins(form.Title, form.Status, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -93,7 +93,7 @@ func (*Activity) JoinDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := activity.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := activity.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). JoinDelete(form.Convert()) api.APIResponse(err)(c) } diff --git a/app/api/enterprise/api/home.go b/app/api/enterprise/api/home.go index f4011ba..1471410 100644 --- a/app/api/enterprise/api/home.go +++ b/app/api/enterprise/api/home.go @@ -10,6 +10,6 @@ import ( type Home struct{} func (*Home) Instance(c *gin.Context) { - data, err := home.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).Instance() + data, err := home.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).Instance() api.APIResponse(err, data) } diff --git a/app/api/enterprise/api/manage.go b/app/api/enterprise/api/manage.go index 5196807..4718c60 100644 --- a/app/api/enterprise/api/manage.go +++ b/app/api/enterprise/api/manage.go @@ -62,7 +62,7 @@ func (*Manage) Enterprise(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewEnterprise()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewEnterprise()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Mode, form.Title, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -74,7 +74,7 @@ func (*Manage) EnterpriseAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := manage.NewEnterprise()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := manage.NewEnterprise()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&manage.EnterpriseParams{Mode: form.Mode, Title: form.Title, Name: form.Name, Mobile: form.Mobile, Papers: form.paperInfo(), Patents: form.PatentInfo(), Content: form.Content, }) @@ -90,7 +90,7 @@ func (*Manage) EnterpriseEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := manage.NewEnterprise()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := manage.NewEnterprise()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&manage.EnterpriseParams{ID: form.Convert(), Mode: form.Mode, Title: form.Title, Name: form.Name, Mobile: form.Mobile, Papers: form.paperInfo(), Patents: form.PatentInfo(), Content: form.Content, }) @@ -104,7 +104,7 @@ func (*Manage) EnterpriseDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := manage.NewEnterprise()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := manage.NewEnterprise()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -120,7 +120,7 @@ func (*Manage) Equipment(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Kind, form.Code, form.Title, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -132,7 +132,7 @@ func (*Manage) EquipmentAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&manage.EquipmentParams{Kind: form.Kind, Code: form.Code, Title: form.Title, Params: form.Params, Description: form.Description}) api.APIResponse(err)(c) } @@ -146,7 +146,7 @@ func (*Manage) EquipmentEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&manage.EquipmentParams{ID: form.Convert(), Kind: form.Kind, Code: form.Code, Title: form.Title, Params: form.Params, Description: form.Description}) @@ -160,7 +160,7 @@ func (*Manage) EquipmentDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -172,7 +172,7 @@ func (*Manage) CompanyDetail(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Detail(form.Convert()) api.APIResponse(err, data)(c) } @@ -186,7 +186,7 @@ func (*Manage) CompanyProduct(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Product(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -203,7 +203,7 @@ func (*Manage) Expert(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Instance(form.Name, form.Mobile, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -217,7 +217,7 @@ func (*Manage) ExpertAchievement(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Achievement(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -231,7 +231,7 @@ func (*Manage) ExpertProject(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Project(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -245,7 +245,7 @@ func (*Manage) ExpertPatent(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Patent(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -259,7 +259,7 @@ func (*Manage) ExpertPaper(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Paper(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -273,7 +273,7 @@ func (*Manage) ExpertCooperate(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Cooperate(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -287,7 +287,7 @@ func (*Manage) ResearchLaboratory(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Laboratory(form.Name, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -301,7 +301,7 @@ func (*Manage) ResearchVisit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Visit(form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -315,7 +315,7 @@ func (*Manage) LaboratoryAchievement(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Achievement(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -329,7 +329,7 @@ func (*Manage) LaboratoryProject(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Project(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -343,7 +343,7 @@ func (*Manage) LaboratoryPatent(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Patent(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -357,7 +357,7 @@ func (*Manage) LaboratoryPaper(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Paper(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -371,7 +371,7 @@ func (*Manage) LaboratoryCooperate(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Cooperate(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -383,7 +383,7 @@ func (*Manage) LaboratoryCooperateDetail(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). CooperateDetail(form.Convert()) api.APIResponse(err, data)(c) } @@ -397,7 +397,7 @@ func (*Manage) AgentCompany(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Company(form.Name, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -411,7 +411,7 @@ func (*Manage) AgentCompanyAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(0, form.Name, form.Industrys) api.APIResponse(err)(c) } @@ -426,7 +426,7 @@ func (*Manage) AgentCompanyEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(form.Convert(), form.Name, form.Industrys) api.APIResponse(err)(c) } diff --git a/app/api/enterprise/api/service.go b/app/api/enterprise/api/service.go index 8cebe53..c119f05 100644 --- a/app/api/enterprise/api/service.go +++ b/app/api/enterprise/api/service.go @@ -31,7 +31,7 @@ func (*Service) Demand(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Title, form.Status, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -43,7 +43,7 @@ func (*Service) DemandDetail(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Detail(form.Convert()) api.APIResponse(err, data)(c) } @@ -55,7 +55,7 @@ func (*Service) DemandAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&service.DemandParams{Kinds: form.Kinds, IsSubmit: form.IsSubmit, Title: form.Title, Name: form.Name, Mobile: form.Mobile, Description: form.Description, }) @@ -71,7 +71,7 @@ func (*Service) DemandEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&service.DemandParams{ID: form.Convert(), Kinds: form.Kinds, IsSubmit: form.IsSubmit, Title: form.Title, Name: form.Name, Mobile: form.Mobile, Description: form.Description, }) @@ -85,7 +85,7 @@ func (*Service) DemandDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } diff --git a/app/api/enterprise/api/settled.go b/app/api/enterprise/api/settled.go index 793f0ae..8c85912 100644 --- a/app/api/enterprise/api/settled.go +++ b/app/api/enterprise/api/settled.go @@ -32,7 +32,7 @@ func (c *settledForm) bind() *settled.BasicParams { // Index 入驻信息 func (*Settled) Index(c *gin.Context) { - data, err := settled.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).Index() + data, err := settled.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).Index() api.APIResponse(err, data)(c) } @@ -49,7 +49,7 @@ func (*Settled) Company(c *gin.Context) { } form.License = (&api.ImageForm{Image: form.License}).FilterImageURL() - err := settled.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := settled.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Launch(form.settledForm.bind(), (&api.IDStringForm{ID: form.InviterCode}).Convert(), &form.IdentityForCompany) api.APIResponse(err)(c) } @@ -63,7 +63,7 @@ func (*Settled) CompanyGet(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := settled.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).Get(form.Code) + data, err := settled.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).Get(form.Code) api.APIResponse(err, data)(c) } @@ -77,7 +77,7 @@ func (*Settled) Expert(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := settled.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := settled.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Launch(form.settledForm.bind(), &form.IdentityForExpert) api.APIResponse(err)(c) } @@ -92,7 +92,7 @@ func (*Settled) Research(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := settled.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := settled.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Launch(form.settledForm.bind(), &form.IdentityForResearch) api.APIResponse(err)(c) } @@ -107,7 +107,7 @@ func (*Settled) Laboratory(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := settled.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := settled.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Launch(form.settledForm.bind(), &form.IdentityForLaboratory) api.APIResponse(err)(c) } @@ -133,7 +133,7 @@ func (*Settled) Agent(c *gin.Context) { form.IDImage.Behind = (&api.ImageForm{Image: form.IDImage.Behind}).FilterImageURL() form.IDImage.Hold = (&api.ImageForm{Image: form.IDImage.Hold}).FilterImageURL() - err := settled.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := settled.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Launch(form.settledForm.bind(), &form.IdentityForAgent) api.APIResponse(err)(c) } diff --git a/app/api/enterprise/api/technology.go b/app/api/enterprise/api/technology.go index 1f7501d..d349a1e 100644 --- a/app/api/enterprise/api/technology.go +++ b/app/api/enterprise/api/technology.go @@ -156,7 +156,7 @@ func (a *Technology) Instance(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Status, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -168,7 +168,7 @@ func (a *Technology) InstanceAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.InstanceParams{ PatentID: form.PatentID, Territory: form.Territory, Title: form.Title, Company: form.Company, Images: form.FilterImageURL(), ProveImages: form.FilterProveImages(), Introduce: form.Introduce, Purpose: form.Purpose, @@ -187,7 +187,7 @@ func (a *Technology) InstanceEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.InstanceParams{ ID: form.Convert(), PatentID: form.PatentID, Territory: form.Territory, Title: form.Title, Company: form.Company, @@ -207,7 +207,7 @@ func (a *Technology) InstanceShelf(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Shelf(form.Convert(), form.Status) api.APIResponse(err)(c) } @@ -219,7 +219,7 @@ func (a *Technology) InstanceDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -233,7 +233,7 @@ func (a *Technology) Paper(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Title, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -245,7 +245,7 @@ func (a *Technology) PaperAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.PaperParams{ Title: form.Title, Ext: form.Ext, Author: form.Author, PublishAt: form.PublishAt, Keywords: form.Keywords, Tags: form.Tags, Remark: form.Remark, @@ -262,7 +262,7 @@ func (a *Technology) PaperEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.PaperParams{ ID: form.Convert(), Title: form.Title, Ext: form.Ext, Author: form.Author, PublishAt: form.PublishAt, Keywords: form.Keywords, Tags: form.Tags, Remark: form.Remark, @@ -277,7 +277,7 @@ func (a *Technology) PaperDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -295,7 +295,7 @@ func (a *Technology) Patent(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Kind, form.Title, form.ApplyCode, form.OpenCode, form.IPCCode, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -307,7 +307,7 @@ func (a *Technology) PatentDetail(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Detail(form.Convert()) api.APIResponse(err, data)(c) } @@ -319,7 +319,7 @@ func (a *Technology) PatentAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.PatentParams{Kind: form.Kind, Title: form.Title, FileUrl: (&api.FileForm{File: form.FileUrl}).FilterURL(), ApplyCode: form.ApplyCode, ApplyName: form.ApplyName, ApplyAddress: form.ApplyAddress, ApplyAt: form.ApplyAt, OpenCode: form.OpenCode, OpenAt: form.OpenAt, Inventor: form.Inventor, IPCCode: form.IPCCode, @@ -337,7 +337,7 @@ func (a *Technology) PatentEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.PatentParams{ID: form.Convert(), Kind: form.Kind, Title: form.Title, FileUrl: (&api.FileForm{File: form.FileUrl}).FilterURL(), ApplyCode: form.ApplyCode, ApplyName: form.ApplyName, ApplyAddress: form.ApplyAddress, ApplyAt: form.ApplyAt, OpenCode: form.OpenCode, @@ -354,7 +354,7 @@ func (a *Technology) PatentDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewPatent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -368,7 +368,7 @@ func (a *Technology) Demand(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Status, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -380,7 +380,7 @@ func (a *Technology) DemandDetail(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Detail(form.Convert()) api.APIResponse(err, data)(c) } @@ -392,7 +392,7 @@ func (a *Technology) DemandAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.DemandParams{ Title: form.Title, Introduce: form.Introduce, Name: form.Name, Mobile: form.Mobile, Deadline: form.Deadline, Industry: form.Industry, Kinds: form.Kinds, Budget: form.Budget, BudgetMode: form.BudgetMode, @@ -414,7 +414,7 @@ func (a *Technology) DemandEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.DemandParams{ ID: form.Convert(), Title: form.Title, Introduce: form.Introduce, Name: form.Name, Mobile: form.Mobile, Deadline: form.Deadline, Industry: form.Industry, Kinds: form.Kinds, Budget: form.Budget, BudgetMode: form.BudgetMode, @@ -434,7 +434,7 @@ func (a *Technology) DemandDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -448,7 +448,7 @@ func (a *Technology) Topic(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Status, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -460,7 +460,7 @@ func (a *Technology) TopicDetail(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Detail(form.Convert()) api.APIResponse(err, data)(c) } @@ -472,7 +472,7 @@ func (a *Technology) TopicAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.TopicParams{Title: form.Title, Emcee: form.Emcee, Mechanism: form.Mechanism, Code: form.Code, BeginAt: form.BeginAt, FinishAt: form.FinishAt, Amount: form.Amount, Source: form.Source, Kind: form.Kind, Keywords: form.Keywords}) @@ -488,7 +488,7 @@ func (a *Technology) TopicEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.TopicParams{ID: form.Convert(), Title: form.Title, Emcee: form.Emcee, Mechanism: form.Mechanism, Code: form.Code, BeginAt: form.BeginAt, FinishAt: form.FinishAt, Amount: form.Amount, Source: form.Source, Kind: form.Kind, Keywords: form.Keywords}) @@ -502,7 +502,7 @@ func (a *Technology) TopicDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewTopic()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -517,7 +517,7 @@ func (*Technology) Product(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Instance(form.Title, form.Status, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -531,7 +531,7 @@ func (*Technology) ProductVisit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Visit(form.Convert(), form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -543,7 +543,7 @@ func (*Technology) ProductAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.ProductParams{ Title: form.Title, Image: form.FilterImageURL(), Video: form.FilterVideo(), Material: form.FilterMaterial(), Introduce: form.Introduce, Industrys: form.Industrys, @@ -562,7 +562,7 @@ func (*Technology) ProductEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.ProductParams{ ID: form.Convert(), Title: form.Title, Image: form.FilterImageURL(), Video: form.FilterVideo(), Material: form.FilterMaterial(), Introduce: form.Introduce, Industrys: form.Industrys, @@ -581,7 +581,7 @@ func (*Technology) ProductShelf(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Shelf(form.Convert(), form.Status) api.APIResponse(err)(c) } @@ -593,7 +593,7 @@ func (*Technology) ProductDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewProduct()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -607,7 +607,7 @@ func (a *Technology) Project(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). List(form.Title, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -619,7 +619,7 @@ func (a *Technology) ProjectAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.ProjectParams{ Title: form.Title, Kind: form.Kind, Source: form.Source, Director: form.Director, BeginAt: form.BeginAt, FinishAt: form.FinishAt, Amount: form.Amount, Role: form.Role, @@ -636,7 +636,7 @@ func (a *Technology) ProjectEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.ProjectParams{ID: form.Convert(), Title: form.Title, Kind: form.Kind, Source: form.Source, Director: form.Director, BeginAt: form.BeginAt, FinishAt: form.FinishAt, Amount: form.Amount, Role: form.Role, @@ -653,7 +653,7 @@ func (*Technology) ProjectShelf(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Shelf(form.Convert(), form.Status) api.APIResponse(err)(c) } @@ -665,7 +665,7 @@ func (a *Technology) ProjectDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewProject()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } @@ -679,7 +679,7 @@ func (*Technology) Achievement(c *gin.Context) { api.APIFailure(err.(error))(c) return } - data, err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + data, err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Instance(form.Status, form.Page, form.PageSize) api.APIResponse(err, data)(c) } @@ -691,7 +691,7 @@ func (*Technology) AchievementAdd(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.AchievementParams{Mode: form.Mode, Title: form.Title, Image: form.FilterImageURL(), File: form.FilterFile(), Introduce: form.Introduce, Industrys: form.Industrys, @@ -710,7 +710,7 @@ func (*Technology) AchievementEdit(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Form(&technology2.AchievementParams{ID: form.Convert(), Mode: form.Mode, Title: form.Title, Image: form.FilterImageURL(), File: form.FilterFile(), Introduce: form.Introduce, Industrys: form.Industrys, @@ -729,7 +729,7 @@ func (*Technology) AchievementShelf(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Shelf(form.Convert(), form.Status) api.APIResponse(err)(c) } @@ -741,7 +741,7 @@ func (*Technology) AchievementDelete(c *gin.Context) { api.APIFailure(err.(error))(c) return } - err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)). + err := technology2.NewAchievement()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)). Delete(form.Convert()) api.APIResponse(err)(c) } diff --git a/app/api/enterprise/controller/manage/common.go b/app/api/enterprise/controller/manage/common.go index f19e002..034a383 100644 --- a/app/api/enterprise/controller/manage/common.go +++ b/app/api/enterprise/controller/manage/common.go @@ -1,7 +1,6 @@ package manage import ( - "SciencesServer/app/api/enterprise/controller/technology" "SciencesServer/app/api/enterprise/model" "SciencesServer/app/basic/controller" model2 "SciencesServer/app/common/model" @@ -26,6 +25,18 @@ type ( ID string `json:"id"` *model.PatentInstance } + // PatentInstance 专利信息 + PatentInstance struct { + ID string `json:"id"` + *model.SysPatentInfo + } + // PaperInstance 论文信息 + PaperInstance struct { + ID string `json:"id"` + Title string `json:"title"` + Ext string `json:"ext"` + Keywords []string `json:"keywords"` + } // PaperInfo 论文信息 PaperInfo struct { ID string `json:"id"` @@ -41,9 +52,9 @@ type ( } // CooperateDetailInfo 合作的企业详细信息 CooperateDetailInfo struct { - Title string `json:"title"` - Patent []*technology.PatentInstance `json:"patent"` - Paper []*technology.PaperInstance `json:"paper"` + Title string `json:"title"` + Patent []*PatentInstance `json:"patent"` + Paper []*PaperInstance `json:"paper"` } EquipmentInfo struct { ID string `json:"id"` @@ -189,8 +200,8 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) { } out := &CooperateDetailInfo{ Title: mUserCooperateEnterprise.Title, - Patent: make([]*technology.PatentInstance, 0), - Paper: make([]*technology.PaperInstance, 0), + Patent: make([]*PatentInstance, 0), + Paper: make([]*PaperInstance, 0), } // 专利信息 mSysPatent := model.NewSysPatent() @@ -201,7 +212,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) { return nil, err } for _, v := range patents { - out.Patent = append(out.Patent, &technology.PatentInstance{ + out.Patent = append(out.Patent, &PatentInstance{ ID: v.GetEncodeID(), SysPatentInfo: v, }) @@ -219,7 +230,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) { return nil, err } for _, v := range papers { - out.Paper = append(out.Paper, &technology.PaperInstance{ + out.Paper = append(out.Paper, &PaperInstance{ ID: v.GetEncodeID(), Title: v.Title, Ext: v.Ext, Keywords: v.GetKeywordAttribute(), }) } diff --git a/app/api/enterprise/controller/technology/demand.go b/app/api/enterprise/controller/technology/demand.go index 7ec28b4..d319ba2 100644 --- a/app/api/enterprise/controller/technology/demand.go +++ b/app/api/enterprise/controller/technology/demand.go @@ -2,7 +2,7 @@ package technology import ( "SciencesServer/app/api/enterprise/model" - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/basic/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/session" "SciencesServer/utils" diff --git a/app/api/enterprise/controller/technology/instance.go b/app/api/enterprise/controller/technology/instance.go index 475bea4..caec401 100644 --- a/app/api/enterprise/controller/technology/instance.go +++ b/app/api/enterprise/controller/technology/instance.go @@ -2,8 +2,8 @@ package technology import ( "SciencesServer/app/api/enterprise/model" - "SciencesServer/app/api/manage/controller" "SciencesServer/app/basic/config" + "SciencesServer/app/basic/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/session" "errors" diff --git a/app/api/enterprise/controller/technology/paper.go b/app/api/enterprise/controller/technology/paper.go index 8cb3ff2..ecd791d 100644 --- a/app/api/enterprise/controller/technology/paper.go +++ b/app/api/enterprise/controller/technology/paper.go @@ -2,7 +2,7 @@ package technology import ( "SciencesServer/app/api/enterprise/model" - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/basic/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/session" "SciencesServer/utils" @@ -24,12 +24,6 @@ type ( *model2.TechnologyPaper Tags []string `json:"tags"` } - PaperInstance struct { - ID string `json:"id"` - Title string `json:"title"` - Ext string `json:"ext"` - Keywords []string `json:"keywords"` - } PaperParams struct { ID uint64 Title, Ext, Author, PublishAt, Remark string diff --git a/app/api/enterprise/controller/technology/patent.go b/app/api/enterprise/controller/technology/patent.go index cb133c3..11c6eec 100644 --- a/app/api/enterprise/controller/technology/patent.go +++ b/app/api/enterprise/controller/technology/patent.go @@ -3,7 +3,7 @@ package technology import ( "SciencesServer/app/api/enterprise/controller/sys" "SciencesServer/app/api/enterprise/model" - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/basic/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/app/session" @@ -37,11 +37,6 @@ type ( Description string `json:"description"` ApplyAt string `json:"apply_at"` } - // PatentInstance 专利信息 - PatentInstance struct { - ID string `json:"id"` - *model.SysPatentInfo - } // PatentDetailInfo 专利详细信息 PatentDetailInfo struct { ID string `json:"id"` diff --git a/app/api/enterprise/controller/technology/project.go b/app/api/enterprise/controller/technology/project.go index 5d1b93a..4434b48 100644 --- a/app/api/enterprise/controller/technology/project.go +++ b/app/api/enterprise/controller/technology/project.go @@ -2,7 +2,7 @@ package technology import ( "SciencesServer/app/api/enterprise/model" - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/basic/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/session" "SciencesServer/utils" diff --git a/app/api/enterprise/controller/technology/topic.go b/app/api/enterprise/controller/technology/topic.go index f4561f2..addc66c 100644 --- a/app/api/enterprise/controller/technology/topic.go +++ b/app/api/enterprise/controller/technology/topic.go @@ -2,7 +2,7 @@ package technology import ( "SciencesServer/app/api/enterprise/model" - "SciencesServer/app/api/manage/controller" + "SciencesServer/app/basic/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/session" "SciencesServer/utils" diff --git a/app/api/manage/controller/account.go b/app/api/manage/controller/account.go deleted file mode 100644 index 65cecf4..0000000 --- a/app/api/manage/controller/account.go +++ /dev/null @@ -1,71 +0,0 @@ -package controller - -import ( - model3 "SciencesServer/app/api/manage/model" - "SciencesServer/app/handle" - "SciencesServer/app/service" - "SciencesServer/app/session" - "SciencesServer/config" - "SciencesServer/utils" - "errors" -) - -type Account struct{ *session.Manage } - -type AccountHandle func(session *session.Manage) *Account - -type ( - AccountLoginResponse struct { - Token string `json:"token"` - EffectTime int `json:"effect_time"` - } -) - -// Login 登录请求 -func (c *Account) Login(account, password, captchaKey, captchaValue, equipment, ip string) (*AccountLoginResponse, error) { - // 验证验证码 - if pass, _ := handle.NewCaptcha().Validate(&handle.CaptchaImage{Key: captchaKey, Captcha: captchaValue}); !pass { - return nil, errors.New("验证码错误") - } - mSysUser := model3.NewSysUser() - - isExist, err := mSysUser.GetByAccountOrMobile(account) - - if err != nil { - return nil, err - } else if !isExist { - return nil, errors.New("该帐号信息不存在") - } - - if !mSysUser.ValidatePassword(password) { - return nil, errors.New("密码错误") - } - _session := session.NewManage() - _session.UID = mSysUser.UUID - _session.Name = mSysUser.Name - _session.Mobile = mSysUser.Mobile - _session.IsAdmin = mSysUser.IsAdminUser() - - uid := mSysUser.UUIDString() - - _session.Token = utils.JWTEncrypt(config.SettingInfo.TokenEffectTime, map[string]interface{}{config.TokenForUID: uid}) - - service.Publish(config.EventForRedisHashProduce, config.RedisKeyForAccountManage, uid, _session) - service.Publish(config.EventForAccountLoginProduce, 0, _session.UID, equipment, ip) - - return &AccountLoginResponse{Token: _session.Token, EffectTime: config.SettingInfo.TokenEffectTime}, nil -} - -// Logout 退出请求 -func (c *Account) Logout() error { - if c.Manage != nil && c.UID > 0 { - service.Publish(config.EventForRedisHashDestroy, config.RedisKeyForAccountManage, utils.UintToString(c.UID)) - } - return nil -} - -func NewAccount() AccountHandle { - return func(session *session.Manage) *Account { - return &Account{Manage: session} - } -} diff --git a/app/basic/api/base.go b/app/basic/api/base.go index 1ed203b..eb59ea5 100644 --- a/app/basic/api/base.go +++ b/app/basic/api/base.go @@ -30,9 +30,9 @@ func GetSession() ApiHandle { } } -func GetLocal() ApiHandle { +func GetTenantID() ApiHandle { return func(c *gin.Context) interface{} { - value, _ := c.Get(config.ContentForLocal) + value, _ := c.Get(config.ContentForTenantID) return value } } diff --git a/app/common/model/sys_user.go b/app/common/model/sys_user.go index dd3597d..dde460b 100644 --- a/app/common/model/sys_user.go +++ b/app/common/model/sys_user.go @@ -10,17 +10,19 @@ import ( type SysUser struct { Model - UUID uint64 `gorm:"column:uuid;uniqueIndex:idx_sys_user_uuid;type:int;default:0;comment:用户唯一UUID" json:"-"` - Account string `gorm:"column:account;type:varchar(50);default:'';comment:账户名" json:"account"` - Avatar string `gorm:"column:avatar;type:varchar(255);default:'';comment:头像" json:"avatar"` - Name string `gorm:"column:name;type:varchar(20);default:'';comment:真实姓名" json:"name"` - Mobile string `gorm:"column:mobile;index:idx_sys_user_mobile;type:varchar(15);default:'';comment:联系方式" json:"mobile"` - Email string `gorm:"column:email;type:varchar(50);default:'';comment:邮箱" json:"email"` + UUID uint64 `gorm:"column:uuid;uniqueIndex:idx_sys_user_uuid;type:int;default:0;comment:用户唯一UUID" json:"-"` + TenantID uint64 `gorm:"column:tenant_id;type:int;default:0;comment:租户ID，0表示系统用户" json:"-"` + Account string `gorm:"column:account;type:varchar(50);default:'';comment:账户名" json:"account"` + Avatar string `gorm:"column:avatar;type:varchar(255);default:'';comment:头像" json:"avatar"` + Name string `gorm:"column:name;type:varchar(20);default:'';comment:真实姓名" json:"name"` + Mobile string `gorm:"column:mobile;index:idx_sys_user_mobile;type:varchar(15);default:'';comment:联系方式" json:"mobile"` + Email string `gorm:"column:email;type:varchar(50);default:'';comment:邮箱" json:"email"` Gender Password string `gorm:"column:password;type:varchar(100);default:'';comment:密码" json:"-"` Salt string `gorm:"column:salt;type:varchar(10);default:'';comment:盐值" json:"-"` IsAdmin SysUserAdministrator `gorm:"column:is_admin;type:tinyint(1);default:0;comment:管理员（0：普通用户，1：管理员）" json:"-"` Remark string `gorm:"column:remark;type:varchar(255);default:'';comment:备注" json:"-"` + Status SysUserStatus `gorm:"column:status;type:tinyint(1);default:1;comment:账号状态" json:"status"` ModelDeleted ModelAt } @@ -34,6 +36,15 @@ const ( SysUserAdministratorForAdmin ) +type SysUserStatus int + +const ( + // SysUserStatusForNormal 正常 + SysUserStatusForNormal SysUserStatus = iota + 1 + // SysUserStatusForDisable 禁止登陆 + SysUserStatusForDisable +) + func (m *SysUser) TableName() string { return "sys_user" } diff --git a/app/session/admin.go b/app/session/admin.go new file mode 100644 index 0000000..d64f2df --- /dev/null +++ b/app/session/admin.go @@ -0,0 +1,35 @@ +package session + +import ( + "SciencesServer/utils" + "encoding/json" +) + +type Admin struct { + UID uint64 `json:"uid"` // 唯一标识ID + TenantID uint64 `json:"tenant_id"` // 租户ID + Token string `json:"token"` // token + Name string `json:"name"` // 名称 + Mobile string `json:"mobile"` // 手机号码 + IsAdmin bool `json:"is_admin"` // 是否超管 +} + +func (this *Admin) SetToken(token string) { + this.Token = token +} + +func (this *Admin) GetToken() string { + return this.GetToken() +} + +func (this *Admin) MarshalBinary() ([]byte, error) { + return json.Marshal(this) +} + +func (this *Admin) UnmarshalBinary(data []byte) error { + return utils.FromJSONBytes(data, this) +} + +func NewAdmin() *Admin { + return &Admin{} +} diff --git a/app/session/manage.go b/app/session/manage.go deleted file mode 100644 index cd18fbd..0000000 --- a/app/session/manage.go +++ /dev/null @@ -1,34 +0,0 @@ -package session - -import ( - "SciencesServer/utils" - "encoding/json" -) - -type Manage struct { - UID uint64 `json:"uid"` // 唯一标识ID - Token string `json:"token"` // token - Name string `json:"name"` // 名称 - Mobile string `json:"mobile"` // 手机号码 - IsAdmin bool `json:"is_admin"` // 是否超管 -} - -func (this *Manage) SetToken(token string) { - this.Token = token -} - -func (this *Manage) GetToken() string { - return this.GetToken() -} - -func (this *Manage) MarshalBinary() ([]byte, error) { - return json.Marshal(this) -} - -func (this *Manage) UnmarshalBinary(data []byte) error { - return utils.FromJSONBytes(data, this) -} - -func NewManage() *Manage { - return &Manage{} -} diff --git a/config/const.go b/config/const.go index 4a5007e..d33769c 100644 --- a/config/const.go +++ b/config/const.go @@ -6,7 +6,7 @@ const ( RedisKeyForTaskQueue string = "task_queue" RedisKeyForTaskQueueBody string = "task_queue_body" - RedisKeyForAccountManage string = "account:manage" + RedisKeyForAccountAdmin string = "account:admin" RedisKeyForAccountEnterprise string = "account:enterprise" RedisKeyForTenant string = "tenant:instance" RedisKeyForTenantKeys string = "tenant:keys" @@ -22,7 +22,7 @@ const ( ) const ( - ContentForLocal string = "local" + ContentForTenantID string = "tenant_id" ) const ( diff --git a/router/address.go b/router/address.go index 4c35156..a6b619f 100644 --- a/router/address.go +++ b/router/address.go @@ -1,8 +1,8 @@ package router import ( + api1 "SciencesServer/app/api/admin/api" api3 "SciencesServer/app/api/enterprise/api" - api1 "SciencesServer/app/api/manage/api" api2 "SciencesServer/app/api/website/api" "SciencesServer/app/basic/api" "SciencesServer/app/session" @@ -122,7 +122,7 @@ func registerAdminAPI(app *gin.Engine) { g := app.Group(apiPrefix) // 登录验证 - g.Use(NeedLogin(config.RedisKeyForAccountManage, session.NewManage(), AddSkipperURL([]string{ + g.Use(NeedLogin(config.RedisKeyForAccountAdmin, session.NewAdmin(), AddSkipperURL([]string{ apiPrefix + "/captcha", apiPrefix + "/account/login", apiPrefix + "/account/logout", diff --git a/router/middleware.go b/router/middleware.go index 991912f..d4f91e3 100644 --- a/router/middleware.go +++ b/router/middleware.go @@ -110,6 +110,6 @@ func ContentAnalysisHandler() gin.HandlerFunc { if has { data = value.(string) } - c.Set(config.ContentForLocal, data) + c.Set(config.ContentForTenantID, data) } }