From 657578c3ff3588abbc845a2f22e7919363931283 Mon Sep 17 00:00:00 2001
From: pengtao <pengtao@kingsome.cn>
Date: Tue, 15 Oct 2019 14:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=95=B0=E8=99=9A=E6=8B=9F=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E8=A1=A8=E5=AF=BC=E5=85=A5=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ops/ss_virtual_create.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/ops/ss_virtual_create.py b/ops/ss_virtual_create.py
index f775dba..fa6e9ff 100644
--- a/ops/ss_virtual_create.py
+++ b/ops/ss_virtual_create.py
@@ -4,7 +4,7 @@ import requests
 import sys
 from urllib.parse import unquote, quote, urlencode
 import pdb
-
+import subprocess
 
 def my_quote(data):
     if isinstance(data, dict):
@@ -15,11 +15,11 @@ def my_quote(data):
 
 class SS_Virtual_command:
     def __init__(self):
-        self.ss_virtual_url = "https://10.10.3.17:8992/v1/ta/meta/prop/virtual/dict/create"
+        self.ss_virtual_url = "http://10.10.3.14:8993/v1/ta/meta/prop/virtual/dict/create"
         self.method = "post"
 
 
-    def upload(self, filename):
+    def upload_gameid(self, filename):
 
         projectId = int(19)
         createParam = {"commonHeader": {"projectId": 19},
@@ -28,12 +28,23 @@ class SS_Virtual_command:
                 {"property": {"columnName": "gameid_china", "columnDesc": "china映射", "selectType": "string"}}]}
         loginName = "root"
         password = "kingsome2016"
-        pdb.set_trace()
         body = {"projectId": projectId, "createParam": createParam, "loginName": loginName, "password": password}
         quote_body = my_quote(body)
 
         cmd = f"curl --header 'Accept: application/json' --form 'file=@{filename}' {self.ss_virtual_url}?{quote_body}"
         print(cmd)
+        cmdref = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        output, error_info = cmdref.communicate()
+        if cmdref.returncode != 0:
+            if isinstance(error_info, list) or isinstance(error_info, tuple):
+                error_info = error_info[0]
+            msg = "RUN %s ERROR,error info:  %s" % (cmd, error_info)
+            print(f"{msg},error info={error_info}")
+            return False
+        else:
+            print("Run Success")
+            return True
+
         # r = requests.post(url=self.ss_virtual_url, header="Accept: application/json", files=filename, data=quote_body)
         # if r.status_code == requests.codes.ok:
         #     print(f"upload success,return={r.content}")
@@ -49,7 +60,7 @@ def main():
 
     filename = sys.argv[1]
     ss = SS_Virtual_command()
-    ss.upload(filename)
+    ss.upload_gameid(filename)
 
 
 if __name__ == "__main__":