Merge branch 'pool_424_pdf_remote_gen' of eta_server/eta_data_analysis into master

routers/commentsRouter.go

@@ -7,12 +7,6 @@ import (
 
 func init() {
 
-<<<<<<< HEAD
-    beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"] = append(beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"],
-        beego.ControllerComments{
-            Method: "GeneratePdf",
-            Router: `/generate_pdf`,
-=======
     beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:KplerController"] = append(beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:KplerController"],
         beego.ControllerComments{
             Method: "GetFlowData",
@@ -35,7 +29,15 @@ func init() {
         beego.ControllerComments{
             Method: "GetZoneData",
             Router: `/getZoneData`,
->>>>>>> master
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"] = append(beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"],
+        beego.ControllerComments{
+            Method: "GeneratePdf",
+            Router: `/generate_pdf`,
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,

routers/router.go

@@ -24,15 +24,14 @@ func init() {
 				&controllers.RzdController{},
 			),
 		),
-<<<<<<< HEAD
 		web.NSNamespace("/pdf",
 			web.NSInclude(
 				&controllers.PdfController{},
-=======
+			),
+		),
 		web.NSNamespace("/kpler",
 			web.NSInclude(
 				&controllers.KplerController{},
->>>>>>> master
 			),
 		),
 	)

utils/config.go

@@ -134,7 +134,6 @@ var (
 	ClarkSonsOpen     string //是否配置克拉克森数据源，1已配置
 )
 
-<<<<<<< HEAD
 // minio配置
 var (
 	MinIoAccessKeyId     string
@@ -175,7 +174,8 @@ var (
 	Upload_Audio_Dir string
 	AccessKeyId      string
 	AccessKeySecret  string
-=======
+)
+
 // Kpler
 var (
 	KplerExcelFilePath string //excel文件地址
@@ -187,7 +187,6 @@ var (
 
 var (
 	CacheClient *cache.Cache
->>>>>>> master
 )
 
 func init() {