Merge branch 'ETA_2.2.2' into debug

controllers/base_auth.go

@@ -213,6 +213,7 @@ func (c *BaseAuthController) Prepare() {
 					api += v.Api + "&"
 				}
 			}
+			api += "&" + models.BusinessConfMap["PublicApi"]
 			//处理uri请求，去除前缀和参数
 			api = strings.TrimRight(api, "&")
 			uri = strings.Replace(uri, "/adminapi", "", 1)

models/business_conf.go

@@ -9,6 +9,9 @@ import (
 	"time"
 )
 
+var (
+	BusinessConfMap map[string]string
+)
 const (
 	BusinessConfUseXf                        = "UseXf"
 	BusinessConfXfAppid                      = "XfAppid"
@@ -252,3 +255,11 @@ func InitUseMongoConf() {
 		utils.UseMongo = true
 	}
 }
+
+func InitBusinessConf() {
+	var e error
+	businessConfMap, e = GetBusinessConf()
+	if e != nil {
+		return
+	}
+}

models/db.go

@@ -661,4 +661,7 @@ func afterInitTable() {
 
 	// 初始化是否启用mongo配置
 	InitUseMongoConf()
+
+	// 初始化公用API
+
 }