From 7b7936eccf58f3c05200f4c7f9c2ffb8a1c6f523 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 17 二月 2020 14:00:17 +0800
Subject: [PATCH] fix
---
fileAnalysis.go | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/fileAnalysis.go b/fileAnalysis.go
index 391c88d..a11148e 100644
--- a/fileAnalysis.go
+++ b/fileAnalysis.go
@@ -25,26 +25,42 @@
return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
}
-func (api FileAnalysisApi) FindAllFile(fileName string) (files []protomsg.FileAnalysis,err error){
- url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/findAllFile"
+func (api FileAnalysisApi) Show(id string) (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/show/"+id
client := NewClient()
- paramQuery := map[string]string {
- "fileName": fileName,
- }
- body, err := client.DoGetRequest(url, paramQuery, nil)
+ body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return files, err
+ return false, nil
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return files,err
+ return false, nil
}
- bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &files)
+ return res.Success, res.Data
+}
- return files, err
+func (api FileAnalysisApi) FindAllFile(fileName string,fType int, page int, size int) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/findAllFile"
+ client := NewClient()
+ paramQuery := map[string]string {
+ "fileName": fileName,
+ "type": strconv.Itoa(fType),
+ "page": strconv.Itoa(page),
+ "size": strconv.Itoa(size),
+ }
+ body, err := client.DoGetRequest(url, paramQuery, nil)
+ if err != nil {
+ return false, nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false, nil
+ }
+
+ return res.Success, res.Data
}
func (api FileAnalysisApi) GetAnalysisFiles() (files []protomsg.FileAnalysis,err error){
--
Gitblit v1.8.0