diff --git a/src/framework/i18n/i18n.go b/src/framework/i18n/i18n.go index 657964fa..3d24f114 100644 --- a/src/framework/i18n/i18n.go +++ b/src/framework/i18n/i18n.go @@ -15,14 +15,6 @@ type localeItem struct { Code string `json:"code"` } -// localeMap 国际化数据组 -var localeMap = make(map[string][]localeItem) - -// ClearLocaleData 清空国际化数据 -func ClearLocaleData() { - localeMap = make(map[string][]localeItem) -} - // LoadLocaleData 加载国际化数据 func LoadLocaleData(language string) []localeItem { dictType := fmt.Sprintf("i18n_%s", language) @@ -35,16 +27,12 @@ func LoadLocaleData(language string) []localeItem { Code: v.DictCode, }) } - localeMap[language] = localeData return localeData } // UpdateKeyValue 更新键对应的值 func UpdateKeyValue(language, key, value string) bool { - arr, ok := localeMap[language] - if !ok || len(arr) == 0 { - arr = LoadLocaleData(language) - } + arr := LoadLocaleData(language) code := "" if key == "" { @@ -64,7 +52,6 @@ func UpdateKeyValue(language, key, value string) bool { item.DictValue = value row := sysDictDataService.UpdateDictData(item) if row > 0 { - delete(localeMap, language) return true } } @@ -77,10 +64,7 @@ func TFindKeyPrefix(language, keyPrefix, value string) string { if value == "" { return key } - arr, ok := localeMap[language] - if !ok || len(arr) == 0 { - arr = LoadLocaleData(language) - } + arr := LoadLocaleData(language) for _, v := range arr { if strings.HasPrefix(v.Key, keyPrefix) && strings.HasPrefix(v.Value, value) { @@ -97,10 +81,7 @@ func TKey(language, key string) string { if key == "" { return value } - arr, ok := localeMap[language] - if !ok || len(arr) == 0 { - arr = LoadLocaleData(language) - } + arr := LoadLocaleData(language) for _, v := range arr { if v.Key == key { diff --git a/src/modules/system/controller/sys_dict_type.go b/src/modules/system/controller/sys_dict_type.go index 5d0158a4..dd01bdc1 100644 --- a/src/modules/system/controller/sys_dict_type.go +++ b/src/modules/system/controller/sys_dict_type.go @@ -220,7 +220,6 @@ func (s *SysDictTypeController) Remove(c *gin.Context) { // PUT /refreshCache func (s *SysDictTypeController) RefreshCache(c *gin.Context) { s.sysDictTypeService.ResetDictCache() - i18n.ClearLocaleData() // 清空国际化数据 c.JSON(200, result.Ok(nil)) }