zwxi 1 year ago
parent
commit
6b8f9a6a7e
2 changed files with 27 additions and 12 deletions
  1. 18 3
      controllers/user_login.go
  2. 9 9
      routers/commentsRouter.go

+ 18 - 3
controllers/user_login.go

@@ -924,7 +924,7 @@ func (this *UserLoginController) AreaCodeList() {
 // @Title icp备案信息
 // @Description icp备案信息
 // @Success 200 Ret=200 获取成功
-// @router /icp_license [get]
+// @router /base_info [get]
 func (this *UserLoginController) ICPLicense() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -935,15 +935,30 @@ func (this *UserLoginController) ICPLicense() {
 		this.ServeJSON()
 	}()
 
+	icp, e := models.GetBusinessConfByKey("ICPLicense")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
+		return
+	}
 
-	item, e := models.GetBusinessConfByKey("ICPLicense")
+	title, e := models.GetBusinessConfByKey("ETATitle")
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
 		return
 	}
+	type BaseInfoResp struct {
+		Icp      *models.BusinessConf `description:"手机号"`
+		ETATitle *models.BusinessConf `description:"邮箱"`
+	}
+
+	resp := BaseInfoResp{
+		Icp:      icp,
+		ETATitle: title,
+	}
 
-	br.Data = item
+	br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

+ 9 - 9
routers/commentsRouter.go

@@ -8386,6 +8386,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "ICPLicense",
+            Router: `/base_info`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
         beego.ControllerComments{
             Method: "ForgetAccountGet",
@@ -8422,15 +8431,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
-        beego.ControllerComments{
-            Method: "ICPLicense",
-            Router: `/icp_license`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
         beego.ControllerComments{
             Method: "Login",