diff --git a/app/api/enterprise/controller/config/instance.go b/app/api/enterprise/controller/config/instance.go index 312c92a..5361ca9 100644 --- a/app/api/enterprise/controller/config/instance.go +++ b/app/api/enterprise/controller/config/instance.go @@ -72,7 +72,7 @@ func (c *Config) Area(key string) map[string]string { if key == "" { key = config2.DefaultChinaAreaCode } - return config2.SettingAreaInfo[key] + return config.MemoryForAreaInfo[key] } func NewConfig() *Config { diff --git a/app/api/website/controller/config.go b/app/api/website/controller/config.go index 65c2b8a..3fe9fb6 100644 --- a/app/api/website/controller/config.go +++ b/app/api/website/controller/config.go @@ -8,7 +8,7 @@ type Config struct{ *service.Session } type ConfigHandle func(session *service.Session) *Config -func (c *Config) Platform() { +func (c *Config) Basic() { } diff --git a/app/api/website/controller/index.go b/app/api/website/controller/index.go index b6d85eb..4809a4c 100644 --- a/app/api/website/controller/index.go +++ b/app/api/website/controller/index.go @@ -2,6 +2,7 @@ package controller import ( "SciencesServer/app/api/website/model" + config2 "SciencesServer/app/basic/config" model2 "SciencesServer/app/common/model" "SciencesServer/app/service" "SciencesServer/config" @@ -82,7 +83,7 @@ func (c *Index) distribution(src []*model.DataAreaDistributionInfo) map[string]* if !has { out[v.Province] = &InstanceDistributionDetailInfo{ Code: v.Province, - Name: config.SettingAreaInfo[config.DefaultChinaAreaCode][v.Province], + Name: config2.MemoryForAreaInfo[config.DefaultChinaAreaCode][v.Province], Industry: nil, Count: 1, Children: make(map[string]*InstanceDistributionDetailInfo, 0), @@ -95,7 +96,7 @@ func (c *Index) distribution(src []*model.DataAreaDistributionInfo) map[string]* out[v.Province].Children[v.City] = &InstanceDistributionDetailInfo{ Code: v.City, Count: 1, - Name: config.SettingAreaInfo[v.Province][v.City], + Name: config2.MemoryForAreaInfo[v.Province][v.City], Industry: industrys, } continue diff --git a/app/basic/config/memory.go b/app/basic/config/memory.go index d84081f..08bfac6 100644 --- a/app/basic/config/memory.go +++ b/app/basic/config/memory.go @@ -12,8 +12,12 @@ type ( ) var ( + // MemoryForAreaInfo 区域信息 + MemoryForAreaInfo map[string]map[string]string = make(map[string]map[string]string, 0) // MemoryForIndustryInfo 行业信息 MemoryForIndustryInfo map[string]string = make(map[string]string, 0) + // MemoryForPlatformInfo 平台信息 + MemoryForPlatformInfo map[string]string = make(map[string]string, 0) ) // GetIndustryInfo 获取行业信息 diff --git a/app/common/init.go b/app/common/init.go index b88cf35..19b3279 100644 --- a/app/common/init.go +++ b/app/common/init.go @@ -123,10 +123,6 @@ func initModel() { &synchronized{iModel: model.NewUserCompany()}, &synchronized{iModel: model.NewUserExpert()}, &synchronized{iModel: model.NewUserLaboratory()}, &synchronized{iModel: model.NewUserResearch()}, &synchronized{iModel: model.NewUserAgent()}, - // 入驻管理 - &synchronized{iModel: model.NewManageCompany()}, &synchronized{iModel: model.NewManageExpert()}, - &synchronized{iModel: model.NewManageLaboratory()}, &synchronized{iModel: model.NewManageResearch()}, - &synchronized{iModel: model.NewManageAgent()}, // 数据管理 &synchronized{iModel: model.NewManageCompany()}, &synchronized{iModel: model.NewManageExpert()}, &synchronized{iModel: model.NewManageLaboratory()}, &synchronized{iModel: model.NewManageResearch()}, @@ -178,6 +174,21 @@ func initCacheMode() { } }}, ) + function( + &caches{iModel: model.NewSysPlatform(), iValues: func() interface{} { + out := make([]*model.SysPlatform, 0) + _ = model.ScanFields(model.NewSysPlatform(), &out, []string{"id", "key", "link"}) + return out + }, toCache: func(values interface{}) { + out := values.([]*model.SysPlatform) + for _, v := range out { + if v.Link == "" { + continue + } + config2.MemoryForPlatformInfo[v.Link] = v.Key + } + }}, + ) } func Init() { diff --git a/app/common/model/common.go b/app/common/model/common.go index 05dd718..983294d 100644 --- a/app/common/model/common.go +++ b/app/common/model/common.go @@ -1,6 +1,7 @@ package model import ( + config2 "SciencesServer/app/basic/config" "SciencesServer/config" "SciencesServer/utils" "strings" @@ -130,13 +131,13 @@ type Area struct { func (m *Area) FormatBasic() string { address := make([]string, 0) - address = append(address, config.SettingAreaInfo[config.DefaultChinaAreaCode][m.Province]) + address = append(address, config2.MemoryForAreaInfo[config.DefaultChinaAreaCode][m.Province]) if m.City != "" { - address = append(address, config.SettingAreaInfo[m.Province][m.City]) + address = append(address, config2.MemoryForAreaInfo[m.Province][m.City]) } if m.District != "" { - address = append(address, config.SettingAreaInfo[m.City][m.District]) + address = append(address, config2.MemoryForAreaInfo[m.City][m.District]) } return strings.Join(address, "-") } diff --git a/config/config.go b/config/config.go index a7a8602..184e0a1 100644 --- a/config/config.go +++ b/config/config.go @@ -1,9 +1,8 @@ package config var ( - SettingInfo = new(Setting) - RPCServerSettingInfo = new(RPCServerSetting) - SettingAreaInfo = make(map[string]map[string]string, 0) + SettingInfo = new(Setting) + //RPCServerSettingInfo = new(RPCServerSetting) ) // Mysql 配置 diff --git a/tools/init.go b/tools/init.go index d4226c3..90e74af 100644 --- a/tools/init.go +++ b/tools/init.go @@ -1,7 +1,7 @@ package tools import ( - "SciencesServer/config" + "SciencesServer/app/basic/config" "SciencesServer/tools/ip" "SciencesServer/utils" ) @@ -11,7 +11,7 @@ func initIP() { } func initJSON() { - utils.LoadConfig("./file/area.json", &config.SettingAreaInfo) + utils.LoadConfig("./file/area.json", &config.MemoryForAreaInfo) } func Init() {