路由修改

routers/commentsRouter.go

@@ -4624,8 +4624,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-<<<<<<< HEAD
-    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:OutLinkController"],
+    beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"],
         beego.ControllerComments{
             Method: "AllList",
             Router: `/all`,
@@ -4634,7 +4633,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:OutLinkController"],
+    beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"],
         beego.ControllerComments{
             Method: "Del",
             Router: `/del`,
@@ -4643,7 +4642,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:OutLinkController"],
+    beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"],
         beego.ControllerComments{
             Method: "List",
             Router: `/list`,
@@ -4652,7 +4651,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:OutLinkController"],
+    beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"],
         beego.ControllerComments{
             Method: "Save",
             Router: `/save`,
@@ -4661,10 +4660,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:PdfToImgCommonController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:PdfToImgCommonController"],
-=======
     beego.GlobalControllerRouter["eta/eta_api/controllers:PdfToImgCommonController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:PdfToImgCommonController"],
->>>>>>> master
         beego.ControllerComments{
             Method: "PdfToImgConvert",
             Router: `/convert`,