diff --git a/Tools/cos/Flush.py b/Tools/cos/Flush.py new file mode 100644 index 000000000..0b25a632f --- /dev/null +++ b/Tools/cos/Flush.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +import json +import sys +from tencentcloud.common import credential +from tencentcloud.common.profile.client_profile import ClientProfile +from tencentcloud.common.profile.http_profile import HttpProfile +from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException +from tencentcloud.cdn.v20180606 import cdn_client, models + + +if sys.argv.__len__() == 2: + try: + path = sys.argv[1] + cred = credential.Credential("AKIDRJxLRFFzwcmiNlLzqPggdplPlrpVec2A", "zh8JDqJZYLq42j9NL2RYOyGI9kDOIGxN") + httpProfile = HttpProfile() + httpProfile.endpoint = "cdn.tencentcloudapi.com" + + clientProfile = ClientProfile() + clientProfile.httpProfile = httpProfile + client = cdn_client.CdnClient(cred, "", clientProfile) + + req = models.PurgePathCacheRequest() + params = { + "Paths": [ path ], + "FlushType": "flush" + } + req.from_json_string(json.dumps(params)) + + resp = client.PurgePathCache(req) + print(resp.to_json_string()) + + except TencentCloudSDKException as err: + print(err) +else: + print("params error!") diff --git a/Tools/cos/Readme.md b/Tools/cos/Readme.md deleted file mode 100644 index 7044a82f8..000000000 --- a/Tools/cos/Readme.md +++ /dev/null @@ -1,4 +0,0 @@ -依赖:python 2.7 - -安装 腾讯云 cosclient -pip install cos-python-sdk-v5 \ No newline at end of file diff --git a/Tools/cos/UpLoad.py b/Tools/cos/UpLoad.py index 2430508e5..69624530b 100644 --- a/Tools/cos/UpLoad.py +++ b/Tools/cos/UpLoad.py @@ -98,7 +98,6 @@ class Cos_Upload(): if __name__ == '__main__': if sys.argv.__len__() == 4: - print(sys.argv[1]) t = Cos_Upload(sys.argv[1], sys.argv[2], sys.argv[3]) t.up() else: diff --git a/Tools/cos/_Readme.md b/Tools/cos/_Readme.md new file mode 100644 index 000000000..c941941e5 --- /dev/null +++ b/Tools/cos/_Readme.md @@ -0,0 +1,7 @@ +依赖:python 2.7 + +安装 腾讯云 cosclient +pip install cos-python-sdk-v5 + +安装 tencentcloud-sdk-python +pip install tencentcloud-sdk-python \ No newline at end of file diff --git a/Tools/local12/Flush.py b/Tools/local12/Flush.py new file mode 100644 index 000000000..1b9c7b28d --- /dev/null +++ b/Tools/local12/Flush.py @@ -0,0 +1 @@ +print("Local12 NO Flush!!") diff --git a/Tools/local12/Upload.py b/Tools/local12/Upload.py index d31fc1e4a..92633e049 100644 --- a/Tools/local12/Upload.py +++ b/Tools/local12/Upload.py @@ -27,18 +27,18 @@ class Local12_Upload(): self.fileList = [] self.ab_dir = abDir - self.setting_dir = settingDir + self.setting_dir = self.ab_dir + "/" + settingDir self.change_version = changeVersion self.change_file = self.setting_dir + "/__HotFixLog/" + changeVersion + ".log" self.loadSetting() + self.user = "root" + self.pwd = "root.ljsd.COM@" def loadSetting(self): settingContent = open(self.setting_dir +"/"+ Local12_Upload.settingFile, "rb") settingJson = json.load(settingContent) self.linux_sub_dir = settingJson["dir"] self.platform = settingJson["platform"] - self.user = settingJson["user"] - self.pwd = settingJson["password"] def get_all_file(self): print(self.change_file) @@ -63,14 +63,18 @@ class Local12_Upload(): pool = ProcessPoolExecutor(4) for file in filelist: self.upload_file_to_local12(self.ab_dir + "/" + self.platform + "/", file) - # pool.submit(self.upload_file_to_local12, file) self.upload_file_to_local12(self.setting_dir +"/", Local12_Upload.configFile) self.upload_file_to_local12(self.setting_dir +"/", Local12_Upload.versionFile) - # pool.submit(self.upload_file_to_local12, self.setting_dir +"/"+ Local12_Upload.configFile) - # pool.submit(self.upload_file_to_local12, self.setting_dir +"/"+ Local12_Upload.versionFile) -z = Local12_Upload("D:/HotFix/Root/mht_china/local", "D:/HotFix/Root/mht_china/local/cdn_v2", 'version_1') -z.up() +if __name__ == '__main__': + if sys.argv.__len__() == 4: + t = Local12_Upload(sys.argv[1], sys.argv[2], sys.argv[3]) + t.up() + else: + print("params error!") + +# z = Local12_Upload("D:/HotFix/Root/mht_china/local", "D:/HotFix/Root/mht_china/local/cdn_v2", 'version_1') +# z.up() diff --git a/Tools/local12/_Readme.md b/Tools/local12/_Readme.md new file mode 100644 index 000000000..01c2bb463 --- /dev/null +++ b/Tools/local12/_Readme.md @@ -0,0 +1 @@ +依赖于 pscp.exe 向linux拷贝本地文件 \ No newline at end of file diff --git a/Tools/oss/example.py b/Tools/oss/example.py index 9d425c418..f6dd57de5 100644 --- a/Tools/oss/example.py +++ b/Tools/oss/example.py @@ -1,4 +1,5 @@ -# Auther: Wang Qi +# -*- coding: utf-8 -*- +# # Auther: Wang Qi # !/usr/bin/env python # encoding: utf-8 import os @@ -10,8 +11,8 @@ import requests import subprocess import urllib3 import logging - import time - import random +import time +import random import argparse from threading import Thread, current_thread from concurrent.futures import ProcessPoolExecutor @@ -26,13 +27,13 @@ class jlrg(): fail_list = [] logging.basicConfig(level=logging.INFO, stream=sys.stdout) - secret_id = 'AKIDRJxLRFFzwcmiNlLzqPggdplPlrpVec2A' # 滻Ϊû secretId - secret_key = 'zh8JDqJZYLq42j9NL2RYOyGI9kDOIGxN' # 滻Ϊû secretKey - region = 'ap-guangzhou' # 滻Ϊû Region - token = None # ʹʱԿҪ TokenĬΪգɲ - scheme = 'https' # ָʹ http/https Э COSĬΪ httpsɲ + secret_id = 'AKIDRJxLRFFzwcmiNlLzqPggdplPlrpVec2A' # �滻Ϊ�û��� secretId + secret_key = 'zh8JDqJZYLq42j9NL2RYOyGI9kDOIGxN' # �滻Ϊ�û��� secretKey + region = 'ap-guangzhou' # �滻Ϊ�û��� Region + token = None # ʹ����ʱ��Կ��Ҫ���� Token��Ĭ��Ϊ�գ��ɲ��� + scheme = 'https' # ָ��ʹ�� http/https Э�������� COS��Ĭ��Ϊ https���ɲ��� config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key, Token=token, Scheme=scheme) - # 2. ȡͻ˶ + # 2. ��ȡ�ͻ��˶��� client = CosS3Client(config) def __init__(self): @@ -97,7 +98,7 @@ class jlrg(): -https://dcdn.aliyuncs.com/?Action=RefreshDcdnObjectCaches&ObjectPath=download.gamenew-h5.com/Japan/SW/&ObjectType=Directory&Version=2018-01-15&Timestamp=2021-05-08T03:32:45Z&SignatureNonce=15215528852396&AccessKeyId=LTAIE4jRXhLBvVLL&SignatureMethod=HMAC-SHA1 +#https://dcdn.aliyuncs.com/?Action=RefreshDcdnObjectCaches&ObjectPath=download.gamenew-h5.com/Japan/SW/&ObjectType=Directory&Version=2018-01-15&Timestamp=2021-05-08T03:32:45Z&SignatureNonce=15215528852396&AccessKeyId=LTAIE4jRXhLBvVLL&SignatureMethod=HMAC-SHA1 if __name__ == '__main__':