|
@@ -1010,73 +1010,22 @@ func (this *UserLoginController) BaseInfo() {
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
|
|
|
- icp, e := models.GetBusinessConfByKey("ICPLicense")
|
|
|
- if e != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- title, e := models.GetBusinessConfByKey("ETATitle")
|
|
|
- if e != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
|
|
|
- return
|
|
|
+ configKeys := []string{
|
|
|
+ "ICPLicense", "ETATitle", "TabName", "LogoCN", "LogoEN", "LogoCNMini", "LogoENMini", "LoginLeftImg", "ETASubTitle",
|
|
|
}
|
|
|
-
|
|
|
- tabName, e := models.GetBusinessConfByKey("TabName")
|
|
|
- if e != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- logoCn, e := models.GetBusinessConfByKey("LogoCN")
|
|
|
+ configOb := new(models.BusinessConf)
|
|
|
+ list, e := configOb.GetItemsByCondition(``, make([]interface{}, 0), []string{}, "")
|
|
|
if e != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
|
|
|
+ br.ErrMsg = fmt.Sprintf("获取配置失败, %v", e)
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- logoEn, e := models.GetBusinessConfByKey("LogoEN")
|
|
|
- if e != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- logoCnMini, e := models.GetBusinessConfByKey("LogoCNMini")
|
|
|
- if e != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- logoEnMini, e := models.GetBusinessConfByKey("LogoENMini")
|
|
|
- if e != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- type BaseInfoResp struct {
|
|
|
- Icp *models.BusinessConf `description:"Icp信息"`
|
|
|
- ETATitle *models.BusinessConf `description:"eta系统名称"`
|
|
|
- TabName *models.BusinessConf `description:"tab页名称"`
|
|
|
- LogoCn *models.BusinessConf `description:"中文logo"`
|
|
|
- LogoEn *models.BusinessConf `description:"英文logo"`
|
|
|
- LogoCnMini *models.BusinessConf `description:"中文logoMini"`
|
|
|
- LogoEnMini *models.BusinessConf `description:"英文logoMini"`
|
|
|
- }
|
|
|
-
|
|
|
- resp := BaseInfoResp{
|
|
|
- Icp: icp,
|
|
|
- ETATitle: title,
|
|
|
- TabName: tabName,
|
|
|
- LogoCn: logoCn,
|
|
|
- LogoEn: logoEn,
|
|
|
- LogoCnMini: logoCnMini,
|
|
|
- LogoEnMini: logoEnMini,
|
|
|
+ resp := make(map[string]*models.BusinessConf)
|
|
|
+ for _, v := range list {
|
|
|
+ if !utils.InArrayByStr(configKeys, v.ConfKey) {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ resp[v.ConfKey] = v
|
|
|
}
|
|
|
|
|
|
br.Data = resp
|