Merge branch 'eta/1.0.2'

controllers/fix/custom_analysis.go

@@ -17,7 +17,7 @@ var fixTable = false
 // @Title 指标详情接口
 // @Description  指标详情接口
 // @Success 200 {object} models.EdbInfoDetailReq
-// @router /fix/v1 [post]
+// @router /v1 [post]
 func (this *CustomAnalysisController) FixTableV1() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -33,7 +33,7 @@ func (this *CustomAnalysisController) FixTableV1() {
 	}
 	fixTable = true
 	//ETA1.0.2 自定义分析（生成指标数据修复）
-	fix.FixTableData()
+	//fix.FixTableData()
 	//ETA1.0.2 自定义分析（修复excel与指标的关系）
 	fix.FixTableDataMapping()
 

routers/commentsRouter.go

@@ -10,7 +10,7 @@ func init() {
     beego.GlobalControllerRouter["eta/eta_index_lib/controllers/fix:CustomAnalysisController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers/fix:CustomAnalysisController"],
         beego.ControllerComments{
             Method: "FixTableV1",
-            Router: `/fix/v1`,
+            Router: `/v1`,
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,