merge

api/internal/logic/integraldetailedchecklogic.go

@@ -40,6 +40,7 @@ func (l *IntegralDetailedCheckLogic) IntegralDetailedCheck(req types.DetailedReq
 		return nil, err
 	}
 	result.Count=resp.Count
+	data:=[]*types.Point{}
 	for _, value := range resp.Data {
 		point:=types.Point{}
 		point.EndDate=value.EndDate
@@ -50,8 +51,9 @@ func (l *IntegralDetailedCheckLogic) IntegralDetailedCheck(req types.DetailedReq
 		point.SourceId=value.SourceId
 		point.SourceType=value.SourceType
 		point.Name=value.Name
-		result.Data=append(result.Data,&point )
+		data=append(data,&point)
 	}
+	result.Data=data
 	result.Code = resp.Code
 	result.Message = resp.Message
 	return result, nil

rpc/etc/integral.yaml

@@ -4,7 +4,7 @@ Etcd:
   Hosts:
     - 127.0.0.1:2379
   Key: integral.rpc
-DataSource: root:root@tcp(127.0.0.1:3306)/jypoints?charset=utf8
+DataSource: root:Topnet123@tcp(192.168.3.11:3366)/jypoints?charset=utf8mb4&parseTime=true&loc=Local
 Cache:
   - Host: localhost:6379
 FileSystemConf: