fix(permission): ✨ change permission checking
read permissions from settings.json instead
This commit is contained in:
parent
8744ddcb8c
commit
cd0f67bb44
6 changed files with 128 additions and 60 deletions
|
|
@ -186,42 +186,10 @@ var (
|
|||
}
|
||||
)
|
||||
|
||||
func LoadCountrySettings() []helpers.CountryName {
|
||||
res := make([]helpers.CountryName, 0)
|
||||
|
||||
// read file country.settings.json
|
||||
content, err := os.Open("country.settings.json")
|
||||
if err != nil {
|
||||
fmt.Errorf("country.settings.json not found")
|
||||
}
|
||||
|
||||
// read content to json
|
||||
var countrySettings []map[string]interface{}
|
||||
err = json.NewDecoder(content).Decode(&countrySettings)
|
||||
|
||||
if err != nil {
|
||||
fmt.Errorf("error in country.settings")
|
||||
return nil
|
||||
}
|
||||
|
||||
for _, v := range countrySettings {
|
||||
if ignore, ok := v["ignore"].(bool); ok {
|
||||
if ignore {
|
||||
continue
|
||||
}
|
||||
}
|
||||
res = append(res, helpers.CountryName{
|
||||
CountryID: v["short"].(string),
|
||||
CountryName: v["name"].(string),
|
||||
})
|
||||
}
|
||||
|
||||
return res
|
||||
}
|
||||
|
||||
func NewData(taoLogger *logger.TaoLogger, redisClient *RedisCli) *Data {
|
||||
|
||||
allRecipeFiles := helpers.ScanRecipeFiles(LoadCountrySettings())
|
||||
allRecipeFiles := helpers.ScanRecipeFiles(helpers.LoadCountrySettings())
|
||||
fmt.Println(allRecipeFiles)
|
||||
|
||||
defaultFile := "coffeethai02_600.json"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue