From 9f410d497dbc50f83b08b4657d3b122679301cd8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 24 二月 2020 18:12:53 +0800
Subject: [PATCH] logPrint

---
 taskSdkRuleApi.go |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/taskSdkRuleApi.go b/taskSdkRuleApi.go
index e8718c2..dd95155 100644
--- a/taskSdkRuleApi.go
+++ b/taskSdkRuleApi.go
@@ -3,15 +3,29 @@
 import (
 	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
-	"fmt"
+	"strconv"
 )
 
 type TaskSdkRuleApi struct {
+	Ip string
+	Port int
+}
 
+func (api TaskSdkRuleApi) getBasicUrl() string {
+	if api.Ip == "" {
+		return BASIC_URL
+	}
+	if api.Ip == "" {
+		api.Ip = DEFAULT_IP
+	}
+	if api.Port == 0 {
+		api.Port = DEFAULT_PORT
+	}
+	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
 }
 
 func (api TaskSdkRuleApi) FindAllTaskSdkRules() (b bool,rules []protomsg.TaskSdkRule){
-	url := BASIC_URL + DATA_URL_PREFIX + "/task/findAllTaskSdkRules"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAllTaskSdkRules"
 	client := NewClient()
 	body, err := client.DoGetRequest(url, nil, nil)
 	if err != nil {
@@ -20,7 +34,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	bytes, _ := json.Marshal(res.Data)
@@ -32,7 +46,7 @@
 }
 
 func (api TaskSdkRuleApi) GetRulesByTaskSdk(taskId string,sdkId string) (bool,interface{}){
-	url := BASIC_URL + DATA_URL_PREFIX + "/task/getRulesByTaskSdk"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/getRulesByTaskSdk"
 	client := NewClient()
 	paramQ := make(map[string]string,0)
 	paramQ["taskId"] = taskId
@@ -44,14 +58,14 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,err
 	}
 	return res.Success,res.Data
 }
 
 func (api TaskSdkRuleApi) DeleteTaskSdkRule(taskId string,sdkId string) bool{
-	url := BASIC_URL + DATA_URL_PREFIX + "/task/deleteTaskSdkRule"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/deleteTaskSdkRule"
 	client := NewClient()
 	paramBody := map[string]interface{}{
 		"taskId": taskId,
@@ -64,7 +78,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
@@ -72,7 +86,7 @@
 }
 
 func (api TaskSdkRuleApi) SaveTaskSdkRule(paramBody map[string]interface{}) (bool,interface{}) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/task/saveTaskSdkRule"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/saveTaskSdkRule"
 	client := NewClient()
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
 	if err != nil {
@@ -81,7 +95,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 

--
Gitblit v1.8.0