From b68d2ee5f6a4b321c4da9d7d5c16f8dfbd55c947 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Mon, 20 Jul 2020 11:22:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(python3=E4=B8=AD=E6=B2=A1=E6=9C=89long?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=95=B4=E5=BD=A2=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?int=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=BD=93?=
 =?UTF-8?q?=E5=81=9Along=E7=B1=BB=E5=9E=8B=E4=BD=BF=E7=94=A8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_bfapi/policy_object/Log.robot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/02-Keyword/tsg_bfapi/policy_object/Log.robot b/02-Keyword/tsg_bfapi/policy_object/Log.robot
index 1c77c69..4b64634 100644
--- a/02-Keyword/tsg_bfapi/policy_object/Log.robot
+++ b/02-Keyword/tsg_bfapi/policy_object/Log.robot
@@ -130,8 +130,8 @@ toDigitList
     [Arguments]    ${values}    ${type}
     ${list}    Create List
     FOR    ${var}    IN    @{values}
-        ${var}    Run Keyword If    "${type}"=="int"    Evaluate    int('${var}')
-        ...    ELSE    Evaluate    long('${var}')
+        #wx-fix python3中没有long类型，整形只有int类型，可以当做long类型使用
+        ${var}    Evaluate    int('${var}')
         Append To List    ${list}    ${var}
     END
     [Return]    ${list}

From 75ac77362a2f4ca142221167f7dace81a28a5fb8 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Mon, 20 Jul 2020 11:41:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Log.robot=E4=B8=AD=E5=87=A0=E4=B8=AA?=
 =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6=E5=8F=82=E6=95=B0=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_bfapi/policy_object/Log.robot | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/02-Keyword/tsg_bfapi/policy_object/Log.robot b/02-Keyword/tsg_bfapi/policy_object/Log.robot
index 4b64634..2bb259c 100644
--- a/02-Keyword/tsg_bfapi/policy_object/Log.robot
+++ b/02-Keyword/tsg_bfapi/policy_object/Log.robot
@@ -8,6 +8,9 @@ Resource          ../../../02-Keyword/tsg_bfapi/policy_file_interface/Functional
 Resource          ../Common.robot
 *** Variables ***
 ${logUrl}            /log
+${arraySplitor}    ,
+${itemSplitor}    |
+${valueSplitor}    ^
 *** Keywords ***
 GetLogSchema
     [Documentation]
@@ -86,9 +89,9 @@ QueryLogs
     ...    处理 order by
     [Arguments]    ${orderBy}
     ${orderByList}    Create List
-    @{orderByArr}    Split String    ${orderBy}    ,
+    @{orderByArr}    Split String    ${orderBy}    ${arraySplitor}
     FOR    ${order}    IN    @{orderByArr}
-        @{orderByArr}    Split String    ${order}    |
+        @{orderByArr}    Split String    ${order}    ${itemSplitor}
         ${dict}    Create Dictionary    field=${orderByArr}[0]    asc=${orderByArr}[1]
         Append To List    ${orderByList}    ${dict}
     END
@@ -98,9 +101,9 @@ QueryLogs
     ...    处理fields
     [Arguments]    ${fields}
     ${fieldsList}    Create List
-    @{fieldsArr}    Split String    ${fields}    ,
+    @{fieldsArr}    Split String    ${fields}    ${arraySplitor}
     FOR    ${field}    IN    @{fieldsArr}
-        @{fieldArr}    Split String    ${field}    |
+        @{fieldArr}    Split String    ${field}    ${itemSplitor}
         ${dict}    Create Dictionary    name=${fieldArr}[0]    type=${fieldArr}[1]
         ${len}    Get Length    ${fieldArr}
         # batch时有lang字段
@@ -113,10 +116,10 @@ QueryLogs
     ...    处理conditions
     [Arguments]    ${conditions}
     ${conditionsList}    Create List
-    @{conditionsArr}    Split String    ${conditions}    ,
+    @{conditionsArr}    Split String    ${conditions}    ${arraySplitor}
     FOR    ${condition}    IN    @{conditionsArr}
-        @{conditionArr}    Split String    ${condition}    |
-        @{value}    Split String    ${conditionArr}[3]    ^
+        @{conditionArr}    Split String    ${condition}    ${itemSplitor}
+        @{value}    Split String    ${conditionArr}[3]    ${valueSplitor}
         ${type}    Set Variable    ${conditionArr}[1]
         ${value}    Run Keyword If    "${type}"=="int" or "${type}"=="long"    toDigitList   ${value}     ${type}
         ...    ELSE    Set Variable   ${value}