generated from root/miduo_client
Merge branch 'master' of http://60.1.1.230/jl/JL_HotFix
commit
b8c0a818cd
|
|
@ -0,0 +1,16 @@
|
|||
热更文件版本:dev_bt_and_7151b74419a963862729da7950aea4f1457cf32f_2023_03_22_14_37_58
|
||||
热更文件的工程对应的提交信息:
|
||||
commit 7151b74419a963862729da7950aea4f1457cf32f
|
||||
Merge: 349ea56895 c5c237493b
|
||||
Author: zhangshanxue <zhangshanxue911@gmail.com>
|
||||
Date: Tue Mar 21 10:20:17 2023 +0800
|
||||
|
||||
Merge branch 'china/dev_bt' into dev_bt_and
|
||||
|
||||
# Conflicts:
|
||||
# Assets/ManagedResources/Atlas/CarbonNewAtlas/ArtFont/f_fuben_fubenming_08.png.meta
|
||||
热更大小:10.24013805389404296875
|
||||
热更文件:
|
||||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,3 @@
|
|||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
热更文件版本:you_gu_cdn_xiao7_and_2023_03_22_14_45_36
|
||||
热更版本号:1.1.47
|
||||
热更大小:10.24013805389404296875
|
||||
热更文件:
|
||||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
CDN TYPE: cos_yougu
|
||||
TOOLS DIR: E:/JL/JL_HotFix/Tools/cos_yougu
|
||||
UPLOAD COMMAND: python UpLoad.py E:/JL/JL_HotFix/Root/you_gu cdn_xiao7_and you_gu_cdn_xiao7_and_2023_03_22_14_45_36 0 >>E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and//__HotFixLog/you_gu_cdn_xiao7_and_2023_03_22_14_45_36_UpLoad.log
|
||||
Flush COMMAND: python Flush.py http://c-tcx.648sy.com/xiao7/ >>E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and//__HotFixLog/you_gu_cdn_xiao7_and_2023_03_22_14_45_36_UpLoad.log
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/files.unity3d
|
||||
xiao7/Android/files.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/files.unity3d ,headers=:{}
|
||||
"57c667ec15db852f58fa6fa28e95fcaf"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/lzma/luabytes.unity3d
|
||||
xiao7/Android/lzma/luabytes.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/lzma/luabytes.unity3d ,headers=:{}
|
||||
"18c5d28b981b4da3b30345715abce0b3"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/files.unity3d
|
||||
xiao7/Android/files.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/files.unity3d ,headers=:{}
|
||||
"57c667ec15db852f58fa6fa28e95fcaf"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/config.txt
|
||||
xiao7/Android/config.txt
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/config.txt ,headers=:{}
|
||||
"223477d893dc0b3de5edc60fbb61b9ec"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/version.txt
|
||||
xiao7/Android/version.txt
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/version.txt ,headers=:{}
|
||||
"9e4f84a882484110f9b6a464ba7e163b"
|
||||
http://smi.51sfsy.com/mrj/cdnrefresh?nonce=1532319693&token=881d1b9844fb78c165dad28752d67eb8&dirs=http://c-tcx.648sy.com/xiao7/
|
||||
200
|
||||
|
|
@ -1 +1 @@
|
|||
{"subChannel":"2000","buglyId":"261348dcd3","channel":"YGXQ","resUrl":"http://c-tcx.648sy.com/xiao7/","packageVersion":"0.1","version":"1.1.46","serverUrl":"http://43.140.222.153:8080/"}
|
||||
{"subChannel":"2000","buglyId":"261348dcd3","channel":"YGXQ","resUrl":"http://c-tcx.648sy.com/xiao7/","packageVersion":"0.1","version":"1.1.47","serverUrl":"http://43.140.222.153:8080/"}
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,3 @@
|
|||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
热更文件版本:you_gu_cdn_yougu_and_2023_03_22_14_44_47
|
||||
热更版本号:1.1.49
|
||||
热更大小:10.24013805389404296875
|
||||
热更文件:
|
||||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
CDN TYPE: cos_yougu
|
||||
TOOLS DIR: E:/JL/JL_HotFix/Tools/cos_yougu
|
||||
UPLOAD COMMAND: python UpLoad.py E:/JL/JL_HotFix/Root/you_gu cdn_yougu_and you_gu_cdn_yougu_and_2023_03_22_14_44_47 0 >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and//__HotFixLog/you_gu_cdn_yougu_and_2023_03_22_14_44_47_UpLoad.log
|
||||
Flush COMMAND: python Flush.py http://c-tcx.648sy.com/yougu/ >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and//__HotFixLog/you_gu_cdn_yougu_and_2023_03_22_14_44_47_UpLoad.log
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/Android/files.unity3d
|
||||
yougu/Android/files.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/files.unity3d ,headers=:{}
|
||||
"57c667ec15db852f58fa6fa28e95fcaf"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/Android/lzma/luabytes.unity3d
|
||||
yougu/Android/lzma/luabytes.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/lzma/luabytes.unity3d ,headers=:{}
|
||||
"18c5d28b981b4da3b30345715abce0b3"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/Android/files.unity3d
|
||||
yougu/Android/files.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/files.unity3d ,headers=:{}
|
||||
"57c667ec15db852f58fa6fa28e95fcaf"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/config.txt
|
||||
yougu/Android/config.txt
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/config.txt ,headers=:{}
|
||||
"223477d893dc0b3de5edc60fbb61b9ec"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/version.txt
|
||||
yougu/Android/version.txt
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/version.txt ,headers=:{}
|
||||
"449028c96235d5ccb13831ddcda19ca1"
|
||||
http://smi.51sfsy.com/mrj/cdnrefresh?nonce=1532319693&token=881d1b9844fb78c165dad28752d67eb8&dirs=http://c-tcx.648sy.com/yougu/
|
||||
200
|
||||
|
|
@ -1 +1 @@
|
|||
{"subChannel":"2000","buglyId":"261348dcd3","channel":"YOUGU","resUrl":"http://c-tcx.648sy.com/yougu/","packageVersion":"0.1","version":"1.1.48","serverUrl":"http://43.140.213.135:8080/"}
|
||||
{"subChannel":"2000","buglyId":"261348dcd3","channel":"YOUGU","resUrl":"http://c-tcx.648sy.com/yougu/","packageVersion":"0.1","version":"1.1.49","serverUrl":"http://43.140.213.135:8080/"}
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,3 @@
|
|||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
热更文件版本:you_gu_cdn_yougu_andTest_2023_03_22_14_38_21
|
||||
热更版本号:1.1.49
|
||||
热更大小:10.24013805389404296875
|
||||
热更文件:
|
||||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
CDN TYPE: cos_haofan_ios
|
||||
TOOLS DIR: E:/JL/JL_HotFix/Tools/cos_haofan_ios
|
||||
UPLOAD COMMAND: python UpLoad.py E:/JL/JL_HotFix/Root/you_gu cdn_yougu_andTest you_gu_cdn_yougu_andTest_2023_03_22_14_38_21 0 >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest//__HotFixLog/you_gu_cdn_yougu_andTest_2023_03_22_14_38_21_UpLoad.log
|
||||
Flush COMMAND: python Flush.py http://c-tcx.648sy.com/youguTest/ >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest//__HotFixLog/you_gu_cdn_yougu_andTest_2023_03_22_14_38_21_UpLoad.log
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/Android/files.unity3d
|
||||
youguTest/Android/files.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/files.unity3d ,headers=:{}
|
||||
ERROR:qcloud_cos.cos_client:url:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/files.unity3d, retry_time:0 exception:HTTPSConnectionPool(host='648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com', port=443): Max retries exceeded with url: /youguTest/Android/files.unity3d (Caused by NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x03B9A170>: Failed to establish a new connection: [Errno 11002] getaddrinfo failed',))
|
||||
Traceback (most recent call last):
|
||||
File "C:\Python27\lib\site-packages\qcloud_cos\cos_client.py", line 267, in send_request
|
||||
res = self._session.put(url, timeout=timeout, proxies=self._conf._proxies, **kwargs)
|
||||
File "C:\Python27\lib\site-packages\requests\sessions.py", line 602, in put
|
||||
return self.request('PUT', url, data=data, **kwargs)
|
||||
File "C:\Python27\lib\site-packages\requests\sessions.py", line 542, in request
|
||||
resp = self.send(prep, **send_kwargs)
|
||||
File "C:\Python27\lib\site-packages\requests\sessions.py", line 655, in send
|
||||
r = adapter.send(request, **kwargs)
|
||||
File "C:\Python27\lib\site-packages\requests\adapters.py", line 516, in send
|
||||
raise ConnectionError(e, request=request)
|
||||
ConnectionError: HTTPSConnectionPool(host='648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com', port=443): Max retries exceeded with url: /youguTest/Android/files.unity3d (Caused by NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x03B9A170>: Failed to establish a new connection: [Errno 11002] getaddrinfo failed',))
|
||||
ERROR:qcloud_cos.cos_client:url:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/files.unity3d, retry_time:1 exception:HTTPSConnectionPool(host='648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com', port=443): Max retries exceeded with url: /youguTest/Android/files.unity3d (Caused by NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x03B9A7B0>: Failed to establish a new connection: [Errno 11002] getaddrinfo failed',))
|
||||
Traceback (most recent call last):
|
||||
File "C:\Python27\lib\site-packages\qcloud_cos\cos_client.py", line 267, in send_request
|
||||
res = self._session.put(url, timeout=timeout, proxies=self._conf._proxies, **kwargs)
|
||||
File "C:\Python27\lib\site-packages\requests\sessions.py", line 602, in put
|
||||
return self.request('PUT', url, data=data, **kwargs)
|
||||
File "C:\Python27\lib\site-packages\requests\sessions.py", line 542, in request
|
||||
resp = self.send(prep, **send_kwargs)
|
||||
File "C:\Python27\lib\site-packages\requests\sessions.py", line 655, in send
|
||||
r = adapter.send(request, **kwargs)
|
||||
File "C:\Python27\lib\site-packages\requests\adapters.py", line 516, in send
|
||||
raise ConnectionError(e, request=request)
|
||||
ConnectionError: HTTPSConnectionPool(host='648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com', port=443): Max retries exceeded with url: /youguTest/Android/files.unity3d (Caused by NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x03B9A7B0>: Failed to establish a new connection: [Errno 11002] getaddrinfo failed',))
|
||||
http://smi.51sfsy.com/mrj/cdnrefresh?nonce=1532319693&token=881d1b9844fb78c165dad28752d67eb8&dirs=http://c-tcx.648sy.com/youguTest/
|
||||
200
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
热更文件版本:you_gu_cdn_yougu_andTest_2023_03_22_14_41_26
|
||||
热更版本号:1.1.49
|
||||
热更大小:10.24013805389404296875
|
||||
热更文件:
|
||||
files.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
files.unity3d
|
||||
CDN TYPE: cos_haofan_ios
|
||||
TOOLS DIR: E:/JL/JL_HotFix/Tools/cos_haofan_ios
|
||||
UPLOAD COMMAND: python UpLoad.py E:/JL/JL_HotFix/Root/you_gu cdn_yougu_andTest you_gu_cdn_yougu_andTest_2023_03_22_14_41_26 0 >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest//__HotFixLog/you_gu_cdn_yougu_andTest_2023_03_22_14_41_26_UpLoad.log
|
||||
Flush COMMAND: python Flush.py http://c-tcx.648sy.com/youguTest/ >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest//__HotFixLog/you_gu_cdn_yougu_andTest_2023_03_22_14_41_26_UpLoad.log
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/Android/files.unity3d
|
||||
youguTest/Android/files.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/files.unity3d ,headers=:{}
|
||||
"57c667ec15db852f58fa6fa28e95fcaf"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/Android/lzma/luabytes.unity3d
|
||||
youguTest/Android/lzma/luabytes.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/lzma/luabytes.unity3d ,headers=:{}
|
||||
"18c5d28b981b4da3b30345715abce0b3"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/Android/files.unity3d
|
||||
youguTest/Android/files.unity3d
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/files.unity3d ,headers=:{}
|
||||
"57c667ec15db852f58fa6fa28e95fcaf"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/config.txt
|
||||
youguTest/Android/config.txt
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/config.txt ,headers=:{}
|
||||
"223477d893dc0b3de5edc60fbb61b9ec"
|
||||
E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/version.txt
|
||||
youguTest/Android/version.txt
|
||||
INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/version.txt ,headers=:{}
|
||||
"1768cf0a2976649f1e015253aafe256c"
|
||||
http://smi.51sfsy.com/mrj/cdnrefresh?nonce=1532319693&token=881d1b9844fb78c165dad28752d67eb8&dirs=http://c-tcx.648sy.com/youguTest/
|
||||
200
|
||||
|
|
@ -1 +1 @@
|
|||
{"subChannel":"2000","buglyId":"261348dcd3","channel":"YOUGU","resUrl":"http://c-tcx.648sy.com/youguTest/","packageVersion":"0.1","version":"1.1.48","serverUrl":"http://82.157.34.193:8080/"}
|
||||
{"subChannel":"2000","buglyId":"261348dcd3","channel":"YOUGU","resUrl":"http://c-tcx.648sy.com/youguTest/","packageVersion":"0.1","version":"1.1.49","serverUrl":"http://82.157.34.193:8080/"}
|
||||
Loading…
Reference in New Issue