From b50fdb0d44b935b96143f111b280402746356f2f Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 17 Jan 2022 09:57:57 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + app/api/admin/api/config.go | 12 +++++------ app/api/admin/controller/account.go | 5 +++-- app/api/admin/controller/activity/apply.go | 4 ++-- app/api/admin/controller/config.go | 5 +++-- .../admin/controller/service/solution_case.go | 6 +++--- app/api/admin/controller/sys/banner.go | 2 +- app/api/enterprise/api/technology.go | 2 +- .../enterprise/controller/account/instance.go | 4 ++-- .../enterprise/controller/account/login.go | 4 ++-- .../enterprise/controller/manage/company.go | 2 +- .../enterprise/controller/settled/company.go | 4 ++-- .../controller/technology/product.go | 2 +- .../enterprise/controller/user/withdrawal.go | 2 +- app/api/website/controller/activity.go | 2 +- app/api/website/controller/manage/company.go | 2 +- app/api/website/controller/manage/search.go | 4 ++-- .../website/controller/service/innovate.go | 20 ++++++++++--------- .../controller/service/solution_case.go | 8 ++++---- app/api/website/controller/sys/banner.go | 2 +- .../controller/technology/achievement.go | 4 ++-- app/basic/api/struct.go | 6 +++--- app/basic/api/upload.go | 6 ++---- app/basic/controller/config.go | 2 +- app/common/model/sys_config.go | 1 + app/service/auth_token.go | 3 ++- config/config.go | 5 ----- config/system.go | 10 +++++----- router/middleware.go | 17 ---------------- router/router.go | 7 +++++-- 30 files changed, 70 insertions(+), 84 deletions(-) diff --git a/.gitignore b/.gitignore index 03a1540..e00fcfc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ doc/* data/* main SciencesServer +dist/* *.exe *.test *.prof diff --git a/app/api/admin/api/config.go b/app/api/admin/api/config.go index 9986e21..2772aaf 100644 --- a/app/api/admin/api/config.go +++ b/app/api/admin/api/config.go @@ -23,10 +23,10 @@ func (a *Config) Index(c *gin.Context) { func (a *Config) Add(c *gin.Context) { form := &struct { - Kind int `json:"kind" form:"kind" binding:"required"` - Name string `json:"name" form:"name" binding:"required"` - Key string `json:"key" form:"key" binding:"required"` - Value interface{} `json:"value" form:"value" binding:"required"` + Kind int `json:"kind" form:"kind" binding:"required"` + Name string `json:"name" form:"name" binding:"required"` + Key string `json:"key" form:"key" binding:"required"` + Value string `json:"value" form:"value" binding:"required"` }{} if err := api.Bind(form)(c); err != nil { api.APIFailure(err.(error))(c) @@ -39,8 +39,8 @@ func (a *Config) Add(c *gin.Context) { func (a *Config) Edit(c *gin.Context) { form := &struct { api.IDStringForm - Name string `json:"name" form:"name" binding:"required"` - Value interface{} `json:"value" form:"value" binding:"required"` + Name string `json:"name" form:"name" binding:"required"` + Value string `json:"value" form:"value" binding:"required"` }{} if err := api.Bind(form)(c); err != nil { api.APIFailure(err.(error))(c) diff --git a/app/api/admin/controller/account.go b/app/api/admin/controller/account.go index 7dda5d3..325f542 100644 --- a/app/api/admin/controller/account.go +++ b/app/api/admin/controller/account.go @@ -102,12 +102,13 @@ func (c *Account) Login(mode int, params *AccountLoginParams, equipment, ip stri _uid := data.UUIDString() - _session.Token = utils.JWTEncrypt(config.SettingInfo.TokenEffectTime, map[string]interface{}{config.TokenForUID: _uid}) + _session.Token = utils.JWTEncrypt(utils.StringToInt(config.SystemConfig[config.SysTokenEffectTime]), + map[string]interface{}{config.TokenForUID: _uid}) service.Publish(config.EventForRedisHashProduce, config.RedisKeyForAccountAdmin, _uid, _session) service.Publish(config.EventForAccountLoginProduce, data.TenantID, data.ID, equipment, ip) - return &AccountLoginResponse{Token: _session.Token, EffectTime: config.SettingInfo.TokenEffectTime}, nil + return &AccountLoginResponse{Token: _session.Token, EffectTime: utils.StringToInt(config.SystemConfig[config.SysTokenEffectTime])}, nil } // Logout 退出请求 diff --git a/app/api/admin/controller/activity/apply.go b/app/api/admin/controller/activity/apply.go index 32d3981..5a9f452 100644 --- a/app/api/admin/controller/activity/apply.go +++ b/app/api/admin/controller/activity/apply.go @@ -63,7 +63,7 @@ func (c *Apply) Instance(tenantID uint64, title, contact string, page, pageSize list := make([]*ApplyInfo, 0) for _, v := range out { - v.Image.Image = v.Analysis(config.SettingInfo.Domain) + v.Image.Image = v.Analysis(config.SystemConfig[config.SysImageDomain]) list = append(list, &ApplyInfo{ ID: v.GetEncodeID(), TenantID: v.GetEncodeTenantID(), @@ -82,7 +82,7 @@ func (c *Apply) Detail(id uint64) (*ApplyDetailInfo, error) { if err != nil { return nil, err } - out.Image.Image = out.Analysis(config.SettingInfo.Domain) + out.Image.Image = out.Analysis(config.SystemConfig[config.SysImageDomain]) return &ApplyDetailInfo{ ID: out.GetEncodeID(), diff --git a/app/api/admin/controller/config.go b/app/api/admin/controller/config.go index 85a29c3..61092b7 100644 --- a/app/api/admin/controller/config.go +++ b/app/api/admin/controller/config.go @@ -27,6 +27,7 @@ func (c *Config) Config(kind, page, pageSize int) (*controller.ReturnPages, erro mSysConfig := model.NewSysConfig() where := []*model2.ModelWhereOrder{ + &model2.ModelWhereOrder{Order: model2.NewOrder("sort", model2.OrderModeToAsc)}, &model2.ModelWhereOrder{Order: model2.NewOrder("kind", model2.OrderModeToAsc)}, } if kind > 0 { @@ -50,7 +51,7 @@ func (c *Config) Config(kind, page, pageSize int) (*controller.ReturnPages, erro return &controller.ReturnPages{Data: list, Count: count}, nil } -func (c *Config) Add(kind int, name, key string, value interface{}) error { +func (c *Config) Add(kind int, name, key, value string) error { mSysConfig := model.NewSysConfig() var count int64 @@ -75,7 +76,7 @@ func (c *Config) Add(kind int, name, key string, value interface{}) error { return nil } -func (c *Config) Form(id uint64, name string, value interface{}) error { +func (c *Config) Form(id uint64, name, value string) error { mSysConfig := model.NewSysConfig() mSysConfig.ID = id diff --git a/app/api/admin/controller/service/solution_case.go b/app/api/admin/controller/service/solution_case.go index 75da320..921ee70 100644 --- a/app/api/admin/controller/service/solution_case.go +++ b/app/api/admin/controller/service/solution_case.go @@ -85,7 +85,7 @@ func (c *SolutionCase) Instance(tenantID uint64, title string, kindID uint64, pa list := make([]*SolutionCaseInfo, 0) for _, v := range out { - v.Image.Image = v.Image.Analysis(config2.SettingInfo.Domain) + v.Image.Image = v.Image.Analysis(config2.SystemConfig[config2.SysImageDomain]) list = append(list, &SolutionCaseInfo{ ID: v.GetEncodeID(), @@ -108,7 +108,7 @@ func (c *SolutionCase) Detail(id uint64) (*SolutionCaseDetailInfo, error) { } else if !isExist { return nil, errors.New("操作错误，案例信息不存在或已被删除") } - mServiceSolutionCase.Image.Image = mServiceSolutionCase.Image.Analysis(config2.SettingInfo.Domain) + mServiceSolutionCase.Image.Image = mServiceSolutionCase.Image.Analysis(config2.SystemConfig[config2.SysImageDomain]) return &SolutionCaseDetailInfo{ ID: mServiceSolutionCase.GetEncodeID(), @@ -203,7 +203,7 @@ func (c *SolutionCase) Kind(tenantID uint64, mode int, title string, page, pageS list := make([]*SolutionCaseKindInfo, 0) for _, v := range out { - v.Image.Image = v.Image.Analysis(config2.SettingInfo.Domain) + v.Image.Image = v.Image.Analysis(config2.SystemConfig[config2.SysImageDomain]) list = append(list, &SolutionCaseKindInfo{ ID: v.GetEncodeID(), diff --git a/app/api/admin/controller/sys/banner.go b/app/api/admin/controller/sys/banner.go index fc64059..d9cad0f 100644 --- a/app/api/admin/controller/sys/banner.go +++ b/app/api/admin/controller/sys/banner.go @@ -130,7 +130,7 @@ func (c *Banner) Instance(tenantID uint64, title, local string, page, pageSize i ID: v.GetEncodeID(), TenantID: v.GetEncodeTenantID(), SysBanner: v.SysBanner, Area: v.FormatBasic(), - Images: v.Images.AnalysisSlice(config.SettingInfo.Domain), + Images: v.Images.AnalysisSlice(config.SystemConfig[config.SysImageDomain]), }) } return &controller.ReturnPages{Data: list, Count: count}, nil diff --git a/app/api/enterprise/api/technology.go b/app/api/enterprise/api/technology.go index af24bb5..606cea2 100644 --- a/app/api/enterprise/api/technology.go +++ b/app/api/enterprise/api/technology.go @@ -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 { diff --git a/app/api/enterprise/controller/account/instance.go b/app/api/enterprise/controller/account/instance.go index ca0896a..7cba5c5 100644 --- a/app/api/enterprise/controller/account/instance.go +++ b/app/api/enterprise/controller/account/instance.go @@ -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])} } } diff --git a/app/api/enterprise/controller/account/login.go b/app/api/enterprise/controller/account/login.go index 5178b81..1de9d80 100644 --- a/app/api/enterprise/controller/account/login.go +++ b/app/api/enterprise/controller/account/login.go @@ -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, diff --git a/app/api/enterprise/controller/manage/company.go b/app/api/enterprise/controller/manage/company.go index 31d38bc..5ee96f8 100644 --- a/app/api/enterprise/controller/manage/company.go +++ b/app/api/enterprise/controller/manage/company.go @@ -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(), }) diff --git a/app/api/enterprise/controller/settled/company.go b/app/api/enterprise/controller/settled/company.go index 3730b32..aec6917 100644 --- a/app/api/enterprise/controller/settled/company.go +++ b/app/api/enterprise/controller/settled/company.go @@ -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(), diff --git a/app/api/enterprise/controller/technology/product.go b/app/api/enterprise/controller/technology/product.go index 4e98347..f421715 100644 --- a/app/api/enterprise/controller/technology/product.go +++ b/app/api/enterprise/controller/technology/product.go @@ -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(), diff --git a/app/api/enterprise/controller/user/withdrawal.go b/app/api/enterprise/controller/user/withdrawal.go index 973e90b..794b12e 100644 --- a/app/api/enterprise/controller/user/withdrawal.go +++ b/app/api/enterprise/controller/user/withdrawal.go @@ -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 } diff --git a/app/api/website/controller/activity.go b/app/api/website/controller/activity.go index f71c823..b21e13c 100644 --- a/app/api/website/controller/activity.go +++ b/app/api/website/controller/activity.go @@ -69,7 +69,7 @@ func (c *Activity) Detail(id uint64) (*ActivityDetail, error) { if err != nil { return nil, err } - mActivityInstance.Image.Image = mActivityInstance.Image.Analysis(config.SettingInfo.Domain) + mActivityInstance.Image.Image = mActivityInstance.Image.Analysis(config.SystemConfig[config.SysImageDomain]) return &ActivityDetail{ ID: out.GetEncodeID(), diff --git a/app/api/website/controller/manage/company.go b/app/api/website/controller/manage/company.go index b3c743e..3475afd 100644 --- a/app/api/website/controller/manage/company.go +++ b/app/api/website/controller/manage/company.go @@ -55,7 +55,7 @@ func (c *Company) Instance(id uint64) (*CompanyInstanceInfo, error) { return &CompanyInstanceInfo{ CompanyBasicInfo: CompanyBasicInfo{ ID: mManageCompany.GetEncodeID(), Kind: mManageCompany.Kind, Name: mManageCompany.Name, - Image: mManageCompany.Image.Analysis(config2.SettingInfo.Domain), + Image: mManageCompany.Image.Analysis(config2.SystemConfig[config2.SysImageDomain]), Url: mManageCompany.Url, Keywords: mManageCompany.GetKeywordAttribute(), }, diff --git a/app/api/website/controller/manage/search.go b/app/api/website/controller/manage/search.go index 9ebc583..1b183d7 100644 --- a/app/api/website/controller/manage/search.go +++ b/app/api/website/controller/manage/search.go @@ -46,7 +46,7 @@ func company(ids []uint64) (interface{}, error) { for _, v := range out { list = append(list, &CompanyBasicInfo{ 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(), }) @@ -65,7 +65,7 @@ func expert(ids []uint64) (interface{}, error) { list := make([]*ExpertBasicInfo, 0) for _, v := range out { - v.Image.Image = v.Image.Analysis(config2.SettingInfo.Domain) + v.Image.Image = v.Image.Analysis(config2.SystemConfig[config2.SysImageDomain]) list = append(list, &ExpertBasicInfo{ ID: v.GetEncodeID(), diff --git a/app/api/website/controller/service/innovate.go b/app/api/website/controller/service/innovate.go index 3683c61..5a1dc0e 100644 --- a/app/api/website/controller/service/innovate.go +++ b/app/api/website/controller/service/innovate.go @@ -20,10 +20,11 @@ type InnovateHandle func(session *session.Enterprise, tenantID uint64) *Innovate type ( // InnovateInfo 创新服务信息 InnovateInfo struct { - ID string `json:"id"` - Title string `json:"title"` - Tags []string `json:"tags"` - CreatedAt time.Time `json:"created_at"` + ID string `json:"id"` + Title string `json:"title"` + Description string `json:"description"` + Tags []string `json:"tags"` + CreatedAt time.Time `json:"created_at"` } // InnovateKindInfo 创新服务分类信息 InnovateKindInfo struct { @@ -39,7 +40,7 @@ type ( ) // Instance 首页信息 -func (c *Innovate) Instance(kind uint64, title string, page, pageSize int) (*controller.ReturnPages, error) { +func (c *Innovate) Instance(kindID uint64, title string, page, pageSize int) (*controller.ReturnPages, error) { mServiceInnovate := model.NewServiceInnovate() out := make([]*model2.ServiceInnovate, 0) @@ -48,14 +49,14 @@ func (c *Innovate) Instance(kind uint64, title string, page, pageSize int) (*con where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{Order: model2.NewOrder("id", model2.OrderModeToDesc)}} - if kind > 0 { - where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhere("kind", kind)}) + if kindID > 0 { + where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhere("kind_id", kindID)}) } if title != "" { where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhereLike("title", title)}) } - if err := model2.PagesFields(mServiceInnovate.ServiceInnovate, &out, []string{"id", "title", "tag", "created_at"}, page, pageSize, + if err := model2.PagesFields(mServiceInnovate.ServiceInnovate, &out, []string{"id", "title", "description", "tag", "created_at"}, page, pageSize, &count, where...); err != nil { return nil, err } @@ -63,7 +64,8 @@ func (c *Innovate) Instance(kind uint64, title string, page, pageSize int) (*con for _, v := range out { list = append(list, &InnovateInfo{ - ID: v.GetEncodeID(), Title: v.Title, Tags: v.GetTagAttribute(), CreatedAt: v.CreatedAt, + ID: v.GetEncodeID(), Title: v.Title, Description: v.Description, Tags: v.GetTagAttribute(), + CreatedAt: v.CreatedAt, }) } return &controller.ReturnPages{Data: list, Count: count}, nil diff --git a/app/api/website/controller/service/solution_case.go b/app/api/website/controller/service/solution_case.go index 3c301c1..09568f8 100644 --- a/app/api/website/controller/service/solution_case.go +++ b/app/api/website/controller/service/solution_case.go @@ -64,7 +64,7 @@ func (c *SolutionCase) Instance(mode int) ([]*SolutionCaseInfo, error) { detail := &SolutionCaseBasic{ ID: (&model2.Model{ID: v.DetailID}).GetEncodeID(), Title: v.DetailTitle, - Image: (&model2.Image{Image: v.DetailImage}).Analysis(config.SettingInfo.Domain), + Image: (&model2.Image{Image: v.DetailImage}).Analysis(config.SystemConfig[config.SysImageDomain]), Description: v.DetailDescription, } for _, val := range ret { @@ -77,7 +77,7 @@ func (c *SolutionCase) Instance(mode int) ([]*SolutionCaseInfo, error) { if !isExist { ret = append(ret, &SolutionCaseInfo{ ID: v.GetEncodeID(), MarkID: v.ID, Mode: v.Mode, Title: v.Title, - Image: v.Image.Analysis(config.SettingInfo.Domain), + Image: v.Image.Analysis(config.SystemConfig[config.SysImageDomain]), Description: v.Description, Children: []*SolutionCaseBasic{detail}, }) @@ -109,7 +109,7 @@ func (c *SolutionCase) List(kindID uint64, page, pageSize int) (*controller.Retu for _, v := range out { list = append(list, &SolutionCaseBasic{ ID: v.GetEncodeID(), Title: v.Title, - Image: v.Image.Analysis(config.SettingInfo.Domain), + Image: v.Image.Analysis(config.SystemConfig[config.SysImageDomain]), Description: v.Description, }) } @@ -135,7 +135,7 @@ func (c *SolutionCase) Detail(id uint64) (*SolutionCaseDetail, error) { SolutionCaseBasic: SolutionCaseBasic{ ID: mServiceSolutionCase.GetEncodeID(), Title: mServiceSolutionCase.Title, - Image: mServiceSolutionCase.Image.Analysis(config.SettingInfo.Domain), + Image: mServiceSolutionCase.Image.Analysis(config.SystemConfig[config.SysImageDomain]), Description: mServiceSolutionCase.Description, }, Visits: mServiceSolutionCase.Visits, diff --git a/app/api/website/controller/sys/banner.go b/app/api/website/controller/sys/banner.go index de65123..41e3ac6 100644 --- a/app/api/website/controller/sys/banner.go +++ b/app/api/website/controller/sys/banner.go @@ -29,7 +29,7 @@ func (c *Banner) Instance(key string) (*BannerInfo, error) { ID: mSysBanner.GetEncodeID(), Title: mSysBanner.Title, IsMultiple: mSysBanner.IsMultiple, - Images: mSysBanner.Images.AnalysisSlice(config.SettingInfo.Domain), + Images: mSysBanner.Images.AnalysisSlice(config.SystemConfig[config.SysImageDomain]), }, nil } diff --git a/app/api/website/controller/technology/achievement.go b/app/api/website/controller/technology/achievement.go index 0f2d2d6..f14013a 100644 --- a/app/api/website/controller/technology/achievement.go +++ b/app/api/website/controller/technology/achievement.go @@ -65,7 +65,7 @@ func (c *Achievement) Instance(title, industry string, page, pageSize int) (*con list = append(list, &AchievementInfo{ ID: v.GetEncodeID(), Title: v.Title, - Image: v.Image.Analysis(config.SettingInfo.Domain), + Image: v.Image.Analysis(config.SystemConfig[config.SysImageDomain]), Industrys: v.GetIndustryAttribute(), Customers: v.GetCustomerAttribute(), Maturity: v.Maturity, @@ -107,7 +107,7 @@ func (c *Achievement) Detail(id uint64) (*AchievementDetailInfo, error) { AchievementInfo: AchievementInfo{ ID: out.GetEncodeID(), Title: out.Title, - Image: out.Image.Analysis(config.SettingInfo.Domain), + Image: out.Image.Analysis(config.SystemConfig[config.SysImageDomain]), Industrys: out.GetIndustryAttribute(), Customers: out.GetCustomerAttribute(), Maturity: out.Maturity, diff --git a/app/basic/api/struct.go b/app/basic/api/struct.go index 0c2cdf3..c70bcd3 100644 --- a/app/basic/api/struct.go +++ b/app/basic/api/struct.go @@ -45,7 +45,7 @@ type ImageForm struct { } func (this *ImageForm) FilterImageURL() string { - return strings.Replace(this.Image, config.SettingInfo.Domain, "", -1) + return strings.Replace(this.Image, config.SystemConfig[config.SysImageDomain], "", -1) } type ImagesForm struct { @@ -56,7 +56,7 @@ func (this *ImagesForm) FilterImageURL() string { out := make([]string, 0) for _, v := range strings.Split(this.Images, ",") { - out = append(out, strings.Replace(v, config.SettingInfo.Domain, "", -1)) + out = append(out, strings.Replace(v, config.SystemConfig[config.SysImageDomain], "", -1)) } return strings.Join(out, ",") } @@ -66,7 +66,7 @@ type FileForm struct { } func (this *FileForm) FilterURL() string { - return strings.Replace(this.File, config.SettingInfo.Domain, "", -1) + return strings.Replace(this.File, config.SystemConfig[config.SysImageDomain], "", -1) } type PositionForm struct { diff --git a/app/basic/api/upload.go b/app/basic/api/upload.go index 9a0475e..cff3829 100644 --- a/app/basic/api/upload.go +++ b/app/basic/api/upload.go @@ -53,10 +53,8 @@ func (a *Upload) Upload(c *gin.Context) { } resp := new(lib.UploadHandle) - if resp, err = lib.Upload(config.SystemConfig[config.UploadPath].(string), - strings.Split(config.SystemConfig[config.UploadExt].(string), ","), - utils.StringToInt64(config.SystemConfig[config.UploadSize].(string)), - true).Handle()(file, config.SettingInfo.Domain); err != nil { + if resp, err = lib.Upload(config.SystemConfig[config.UploadPath], strings.Split(config.SystemConfig[config.UploadExt], ","), + utils.StringToInt64(config.SystemConfig[config.UploadSize]), true).Handle()(file, config.SystemConfig[config.SysImageDomain]); err != nil { APIFailure(err)(c) return } diff --git a/app/basic/controller/config.go b/app/basic/controller/config.go index 606d502..7335d62 100644 --- a/app/basic/controller/config.go +++ b/app/basic/controller/config.go @@ -23,7 +23,7 @@ func (c *Config) Basic() { } // Config 配置信息 -func (c *Config) Config() map[string]interface{} { +func (c *Config) Config() map[string]string { return config2.SystemConfig } diff --git a/app/common/model/sys_config.go b/app/common/model/sys_config.go index 1e9b0e2..487d2eb 100644 --- a/app/common/model/sys_config.go +++ b/app/common/model/sys_config.go @@ -7,6 +7,7 @@ type SysConfig struct { Name string `gorm:"column:name;type:varchar(30);default:'';comment:名称" json:"name"` Key string `gorm:"column:key;type:varchar(100);default:'';comment:标识" json:"key"` Value string `gorm:"column:value;type:text;comment:内容" json:"value"` + Sort int `gorm:"column:sort;type:tinyint(3);default:0;comment:排序，数值越小，优先排序" json:"sort"` ModelDeleted ModelAt } diff --git a/app/service/auth_token.go b/app/service/auth_token.go index dbadc00..8b70387 100644 --- a/app/service/auth_token.go +++ b/app/service/auth_token.go @@ -37,7 +37,8 @@ func (this *AuthToken) Auth(key string, session logic.ISession) error { if err := json.Unmarshal([]byte(cache), session); err != nil { return err } - if !config.SettingInfo.MultipleLogin && session.GetToken() != this.Token { + if (config.SystemConfig[config.SysMultipleLogin] == "0" || config.SystemConfig[config.SysMultipleLogin] == "") && + session.GetToken() != this.Token { return errors.New("登陆错误，已在其他地方登录！") } return nil diff --git a/config/config.go b/config/config.go index dd4ac4b..2c4d5cb 100644 --- a/config/config.go +++ b/config/config.go @@ -44,11 +44,6 @@ type Redis struct { // Setting 配置信息 type Setting struct { - Domain string `json:"domain" yaml:"domain"` - Name string `yaml:"name"` - TokenEffectTime int `yaml:"token_effect_time"` - MultipleLogin bool `yaml:"multiple_login"` - // Server 配置 Server struct { Port int `yaml:"port"` diff --git a/config/system.go b/config/system.go index ccbedd2..903cb25 100644 --- a/config/system.go +++ b/config/system.go @@ -1,15 +1,15 @@ package config -var SystemConfig = make(map[string]interface{}, 0) +var SystemConfig = make(map[string]string, 0) //png,jpg,csv,xls,xlsx,pcm,wav,amr,mp3,mp4,json // 基本配置 const ( - Name string = "name" // 名称 - Domain string = "domain" // 域名 - TokenEffectTime string = "token_effect_time" // Token有效时间 - MultipleLogin string = "multiple_login" // 是否开启多地登录 + SysDomain string = "sys_domain" // 系统域名 + SysImageDomain string = "sys_image_domain" // 系统图片访问地址 + SysTokenEffectTime string = "sys_token_effect_time" // Token有效时间 + SysMultipleLogin string = "sys_multiple_login" // 是否开启多地登录 ) const ( diff --git a/router/middleware.go b/router/middleware.go index 3fe8bfe..4826568 100644 --- a/router/middleware.go +++ b/router/middleware.go @@ -1,7 +1,6 @@ package router import ( - "SciencesServer/config" "SciencesServer/serve/logger" "context" "net/http" @@ -96,19 +95,3 @@ func RecoveryHandler() gin.HandlerFunc { c.Next() } } - -// ContentAnalysisHandler 消息体解析 -func ContentAnalysisHandler() gin.HandlerFunc { - return func(c *gin.Context) { - url := c.Request.URL - - var data string - - value, has := config.SystemConfig[url.String()] - - if has { - data = value.(string) - } - c.Set(config.ContentForTenantID, data) - } -} diff --git a/router/router.go b/router/router.go index a4761aa..bae0c1f 100644 --- a/router/router.go +++ b/router/router.go @@ -37,12 +37,15 @@ func (this *Router) Init() *gin.Engine { if this.IsCors { app.Use(Cors()) } - app.NoRoute(NoRouteHandler()) + app.LoadHTMLFiles("./dist/*") // 添加资源路径 + app.StaticFS("/static", http.Dir("./dist/static")) + app.StaticFile("/", "dist/index.html") //前端接口 + + //app.NoRoute(NoRouteHandler()) app.NoMethod(NoMethodHandler()) app.Use(LoggerHandle("log/gin.log", 3)) app.Use(TimeoutHandle(time.Second * 30)) //app.Use(RecoveryHandler()) - app.Use(ContentAnalysisHandler()) if this.RateLimitConfig != nil { if this.RateLimitConfig.IsRate {