feat:完善项目

This commit is contained in:
henry
2022-01-17 09:57:57 +08:00
parent 6d075dab4f
commit b50fdb0d44
30 changed files with 70 additions and 84 deletions

View File

@ -132,7 +132,7 @@ type (
)
func (a *instanceForm) FilterProveImages() string {
return strings.Replace(a.ProveImages, config2.SettingInfo.Domain, "", -1)
return strings.Replace(a.ProveImages, config2.SystemConfig[config2.SysImageDomain], "", -1)
}
func (a *productForm) FilterVideo() string {

View File

@ -35,7 +35,7 @@ type (
func (c *Instance) Login() InstanceLoginCallback {
return func(params *InstanceLoginParams) *InstanceLoginReturn {
token := utils.JWTEncrypt(config.SettingInfo.TokenEffectTime, map[string]interface{}{
token := utils.JWTEncrypt(utils.StringToInt(config.SystemConfig[config.SysTokenEffectTime]), map[string]interface{}{
config.TokenForUID: fmt.Sprintf("%d", params.UID),
})
_session := session.NewEnterprise()
@ -53,7 +53,7 @@ func (c *Instance) Login() InstanceLoginCallback {
service.Publish(config.EventForRedisHashProduce, config.RedisKeyForAccountEnterprise, _session.UIDToString(), _session)
return &InstanceLoginReturn{Token: token, TokenEffectTime: config.SettingInfo.TokenEffectTime}
return &InstanceLoginReturn{Token: token, TokenEffectTime: utils.StringToInt(config.SystemConfig[config.SysTokenEffectTime])}
}
}

View File

@ -99,7 +99,7 @@ func loginForSmsCaptcha(params *LoginParams, tenantID uint64) (*InstanceLoginPar
RETURNS:
return &InstanceLoginParams{
UID: mUserInstance.UUID,
Avatar: mUserInstance.GetAvatarAttribute(config.SettingInfo.Domain), Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
Avatar: mUserInstance.GetAvatarAttribute(config.SystemConfig[config.SysImageDomain]), Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
Vip: mUserInstance.Vip, VipStatus: mUserInstance.VipStatus(), VipDeadline: mUserInstance.VipDeadline,
Currency: mUserAssets.Currency, Identity: mUserInstance.Identity, SelectIdentity: mUserIdentity.Identity,
Status: mUserInstance.Status,
@ -139,7 +139,7 @@ func loginForPassword(params *LoginParams, tenantID uint64) (*InstanceLoginParam
}
return &InstanceLoginParams{
UID: mUserInstance.UUID,
Avatar: mUserInstance.GetAvatarAttribute(config.SettingInfo.Domain), Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
Avatar: mUserInstance.GetAvatarAttribute(config.SystemConfig[config.SysImageDomain]), Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
Vip: mUserInstance.Vip, VipStatus: mUserInstance.VipStatus(), VipDeadline: mUserInstance.VipDeadline,
Currency: mUserAssets.Currency, Identity: mUserInstance.Identity, SelectIdentity: mUserIdentity.Identity,
Status: mUserInstance.Status,

View File

@ -140,7 +140,7 @@ func (c *Company) Match(title string, industrys, keywords []string) ([]*CompanyM
for _, v := range companys {
list = append(list, &CompanyMatchInfo{
ID: v.GetEncodeID(), Kind: v.Kind, Name: v.Name,
Image: v.Image.Analysis(config2.SettingInfo.Domain),
Image: v.Image.Analysis(config2.SystemConfig[config2.SysImageDomain]),
Url: v.Url,
Keywords: v.GetKeywordAttribute(),
})

View File

@ -39,8 +39,8 @@ func (c *Company) Get(code string) (*CompanyInfo, error) {
return nil, nil
}
mManageCompany.Image.Image = mManageCompany.Image.Analysis(config2.SettingInfo.Domain)
mManageCompany.License = (&model2.Image{Image: mManageCompany.License}).Analysis(config2.SettingInfo.Domain)
mManageCompany.Image.Image = mManageCompany.Image.Analysis(config2.SystemConfig[config2.SysImageDomain])
mManageCompany.License = (&model2.Image{Image: mManageCompany.License}).Analysis(config2.SystemConfig[config2.SysImageDomain])
return &CompanyInfo{
ID: mManageCompany.GetEncodeID(),

View File

@ -157,7 +157,7 @@ func (c *Product) Visit(id uint64, page, pageSize int) (*controller.ReturnPages,
for _, v := range out {
mManageCompany.Keyword = v.CompanyKeyword
mManageCompany.Image.Image = v.CompanyImage
v.CompanyImage = mManageCompany.Image.Analysis(config2.SettingInfo.Domain)
v.CompanyImage = mManageCompany.Image.Analysis(config2.SystemConfig[config2.SysImageDomain])
list = append(list, &ProductVisitInfo{
ID: v.GetEncodeID(),

View File

@ -74,7 +74,7 @@ func (c *Withdrawal) Transfer(id uint64) (*WithdrawalTransferInfo, error) {
return nil, nil
}
return &WithdrawalTransferInfo{
Images: mUserWithdrawalTransfer.Images.AnalysisSlice(config.SettingInfo.Domain),
Images: mUserWithdrawalTransfer.Images.AnalysisSlice(config.SystemConfig[config.SysImageDomain]),
Remark: mUserWithdrawalTransfer.Remark,
}, nil
}