feat:完善项目

This commit is contained in:
henry
2021-11-04 16:16:57 +08:00
parent 42c6fb01bb
commit c41adc075a
10 changed files with 74 additions and 28 deletions

View File

@ -52,17 +52,19 @@ func (c *Instance) Login(account, password, captchaKey, captchaValue, ip string)
}
}
session := service.NewSession()
session.Token = utils.JWTEncrypt(config.SettingInfo.TokenEffectTime, map[string]interface{}{
config.TokenForUID: mSysUser.UUID,
})
session.UID = mSysUser.UUID
key := session.UIDToString()
session.Token = utils.JWTEncrypt(config.SettingInfo.TokenEffectTime, map[string]interface{}{
config.TokenForUID: key,
})
session.TenantID = mSysUser.TenantID
session.Name = mSysUser.Name
session.Avatar = mSysUser.Avatar
session.Mobile = mSysUser.Mobile
session.IsAdmin = mSysUser.IsAdminUser()
service.Publish(config.EventForRedisHashProduce, config.RedisKeyForAccount, session.UIDToString(), session)
service.Publish(config.EventForRedisHashProduce, config.RedisKeyForAccount, key, session)
service.Publish(config.EventForAccountLoginProduce, session.TenantID, session.UID, ip)
return &InstanceLoginResponse{Token: session.Token, EffectTime: config.SettingInfo.TokenEffectTime}, nil

View File

@ -22,9 +22,9 @@ type (
}
// MaterialParams 基本参数
MaterialParams struct {
ID, ManufacturerID uint64
Code, Title, Image, Remark string
Unit int
ID, ManufacturerID uint64
Code, Title, Image, Position, Remark string
Unit int
}
)
@ -97,6 +97,7 @@ func (c *Material) Form(params *MaterialParams) error {
mManageMaterial.Code = params.Code
mManageMaterial.Title = params.Title
mManageMaterial.Unit = model2.ManageMaterialUnit(params.Unit)
mManageMaterial.Position = params.Position
mManageMaterial.Remark = params.Remark
if mManageMaterial.ID > 0 {
@ -121,10 +122,6 @@ func (c *Material) Delete(id uint64) error {
return model2.Delete(mManageMaterial.ManageMaterial)
}
func (c *Material) Supplier() {
}
func NewMaterial() MaterialHandle {
return func(session *service.Session) *Material {
return &Material{session}