冲突调试

controllers/config.go

@@ -122,33 +122,3 @@ func (this *ConfigController) DescriptionOfResearch() {
 	br.Success = true
 	br.Data = resp
 }
-
-// @Title 热搜关键词
-// @Description 热搜关键词接口
-// @Success 200 {object} models.UserSearchKeyWordListResp
-// @router /hotKeyWord [get]
-func (this *ConfigController) HotKeyWord() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请重新登录"
-		br.Ret = 408
-		return
-	}
-	list, err := models.GetUserSearchKeyWord()
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-		return
-	}
-	resp := new(models.UserSearchKeyWordListResp)
-	resp.List = list
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}

controllers/research.go

@@ -464,3 +464,34 @@ func (this *ResearchController) ArticleHotList() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 热搜关键词
+// @Description 热搜关键词接口
+// @Success 200 {object} models.UserSearchKeyWordListResp
+// @router /hotKeyWord [get]
+func (this *ResearchController) HotKeyWord() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请重新登录"
+		br.Ret = 408
+		return
+	}
+	//本来应该放在config控制器下，与未上线的代码冲突，所以放在这里
+	list, err := models.GetUserSearchKeyWord()
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
+	}
+	resp := new(models.UserSearchKeyWordListResp)
+	resp.List = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

routers/commentsRouter_controllers.go

@@ -277,15 +277,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"],
-        beego.ControllerComments{
-            Method: "HotKeyWord",
-            Router: "/hotKeyWord",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ConfigController"],
         beego.ControllerComments{
             Method: "PageHistory",
@@ -529,6 +520,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
+        beego.ControllerComments{
+            Method: "HotKeyWord",
+            Router: "/hotKeyWord",
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
         beego.ControllerComments{
             Method: "HotList",