songxiaohang 1 год назад
Родитель
Сommit
bc413cc4ab

+ 1 - 1
app/cmd/dtgateway/desc/dtgateway/dtgateway.api

@@ -6,7 +6,7 @@ type CommonParams {
     Sign string `form:"sign"`
     SignFlag uint8 `form:"sign_flag,optional"`
     AppName string `header:"APP-NAME"`
-    Order string `form:"order,optional,default=desc"`
+    Order string `form:"order,optional,default=asc"`
 }
 
 type CommonResponse {

+ 11 - 11
app/cmd/dtgateway/etc/dtgateway.yaml

@@ -1,7 +1,7 @@
 Name: dtgateway-api
 Host: 0.0.0.0
 Port: 1009
-Mode: pro
+Mode: dev
 Timeout: 0
 #100MB
 MaxBytes: 104857600
@@ -18,17 +18,17 @@ Log:
   Level: error
 
 DtDataStoreDB:
-#    DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(192.168.60.201:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
-  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(172.16.0.195:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
+    DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(192.168.60.201:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
+#  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(172.16.0.195:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
 
 #rpc service
-#OrganizationRpcConf:
-#  Endpoints:
-#    - 127.0.0.1:1117
-#  NonBlock: true
-#  Timeout: 0
-
 OrganizationRpcConf:
-  Timeout: 50000
-  Target: k8s://gt-datacenter/organization-rpc-svc:1117 #goctl kube 默认生成的k8s yaml的serviceName: {rpc中定义的name}-svc
+  Endpoints:
+    - 127.0.0.1:1117
+  NonBlock: true
+  Timeout: 0
+
+#OrganizationRpcConf:
+#  Timeout: 50000
+#  Target: k8s://gt-datacenter/organization-rpc-svc:1117 #goctl kube 默认生成的k8s yaml的serviceName: {rpc中定义的name}-svc
 

+ 1 - 0
app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataInfoLogic.go

@@ -29,6 +29,7 @@ func (l *ItemHistoryDataInfoLogic) ItemHistoryDataInfo(req *types.ItemHistoryDat
 		ItemName:  req.ItemName,
 		Stime:     req.STime,
 		Etime:     req.ETime,
+		Order:     req.Order,
 	})
 	if err != nil {
 		return nil, err

+ 1 - 0
app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataListLogic.go

@@ -33,6 +33,7 @@ func (l *ItemHistoryDataListLogic) ItemHistoryDataList(req *types.ItemHistoryDat
 		Stime:      req.STime,
 		Etime:      req.ETime,
 		Size:       req.Size,
+		Order:      req.Order,
 	})
 	if err != nil {
 		return nil, err

+ 1 - 1
app/cmd/dtgateway/internal/types/types.go

@@ -7,7 +7,7 @@ type CommonParams struct {
 	Sign      string `form:"sign"`
 	SignFlag  uint8  `form:"sign_flag,optional"`
 	AppName   string `header:"APP-NAME"`
-	Order     string `form:"order,optional,default=desc"`
+	Order     string `form:"order,optional,default=asc"`
 }
 
 type CommonResponse struct {

+ 2 - 2
app/cmd/organization/etc/organization.yaml

@@ -13,8 +13,8 @@ Log:
 GtServerIp: 172.16.69.188:8900
 
 DtDataStoreDB:
-#  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(192.168.60.201:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
-  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(172.16.0.195:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
+  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(192.168.60.201:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
+#  DataSource: ws_data:c712f89fc4f8edaf30e41b828f4e3d26@tcp(172.16.0.195:4000)/ws_data?charset=utf8mb4&parseTime=True&loc=&loc=Asia%2FShanghai
 
 Redis:
   Host: 172.16.69.193:36379