ryry-cli 6.3__tar.gz → 6.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ryry_cli-6.3/ryry_cli.egg-info → ryry_cli-6.6}/PKG-INFO +1 -1
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/constant.py +2 -2
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/ryry_server_socket.py +3 -3
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/ryry_webapi.py +12 -3
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/store.py +1 -1
- {ryry_cli-6.3 → ryry_cli-6.6/ryry_cli.egg-info}/PKG-INFO +1 -1
- {ryry_cli-6.3 → ryry_cli-6.6}/setup.py +1 -1
- {ryry_cli-6.3 → ryry_cli-6.6}/LICENSE +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/README.md +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/__init__.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/daemon_base.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/daemon_manager.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/main.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/proxy_manager.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/ryry_service.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/ryry_widget.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/script_template/__init__.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/script_template/daemon.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/script_template/main.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/script_template/run.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/server_func.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/shared_memory.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/task.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/taskUtils.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/upload.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry/utils.py +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry_cli.egg-info/SOURCES.txt +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry_cli.egg-info/dependency_links.txt +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry_cli.egg-info/entry_points.txt +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry_cli.egg-info/requires.txt +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/ryry_cli.egg-info/top_level.txt +0 -0
- {ryry_cli-6.3 → ryry_cli-6.6}/setup.cfg +0 -0
|
@@ -239,15 +239,15 @@ class RyryShortConnectThread(Thread):
|
|
|
239
239
|
time.sleep(1)
|
|
240
240
|
continue
|
|
241
241
|
|
|
242
|
-
widget_list =
|
|
242
|
+
widget_list = {}
|
|
243
243
|
map = store.widgetMap()
|
|
244
244
|
for it in map:
|
|
245
245
|
if isinstance(map[it], (dict)):
|
|
246
246
|
if map[it]["isBlock"] == False and self.executor.widgetHasPower(it):
|
|
247
|
-
widget_list
|
|
247
|
+
widget_list[it] = map[it]["version"]
|
|
248
248
|
else:
|
|
249
249
|
if self.executor.widgetHasPower(it):
|
|
250
|
-
widget_list
|
|
250
|
+
widget_list[it] = map[it]["version"]
|
|
251
251
|
datas = ryry_webapi.GetTask(widget_list)
|
|
252
252
|
for it in datas:
|
|
253
253
|
self.executor.appendTask(it, self.taskCallback)
|
|
@@ -9,12 +9,12 @@ from urllib.parse import urlparse, urlunparse
|
|
|
9
9
|
|
|
10
10
|
from ryry import store, utils, taskUtils, constant, task
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
g_user_token, g_author = store.get_token_and_authorization()
|
|
13
13
|
def _domain_post(func, params, files={}, timeout=10, domain="api.dalipen.com"):
|
|
14
14
|
headers = {
|
|
15
15
|
'Connection': 'close',
|
|
16
|
-
'Usertoken':
|
|
17
|
-
'Authorization': f"Bearer {
|
|
16
|
+
'Usertoken': g_user_token,
|
|
17
|
+
'Authorization': f"Bearer {g_author}"
|
|
18
18
|
}
|
|
19
19
|
url = f"https://{domain}/{func}"
|
|
20
20
|
try:
|
|
@@ -44,8 +44,17 @@ def _aigc_post(func, params, files={}, timeout=10):
|
|
|
44
44
|
return status, msg, data
|
|
45
45
|
return _domain_post(func, params, files, timeout, "aigc.zjtemplate.com")
|
|
46
46
|
|
|
47
|
+
def checkLicense():
|
|
48
|
+
req = { }
|
|
49
|
+
r1, r2, r3 = _aigc_post("aigc/task/checkLicense", req)
|
|
50
|
+
if r1 != 0:
|
|
51
|
+
raise Exception(f"check license fail!, reason={r2}")
|
|
52
|
+
return r3
|
|
53
|
+
|
|
47
54
|
def set_authorization(author):
|
|
48
55
|
store.save_authorization(author)
|
|
56
|
+
global g_user_token, g_author
|
|
57
|
+
g_user_token, g_author = store.get_token_and_authorization()
|
|
49
58
|
if checkLicense():
|
|
50
59
|
print("✅ license check success")
|
|
51
60
|
else:
|
|
@@ -155,7 +155,7 @@ def extend():
|
|
|
155
155
|
_genExtend()
|
|
156
156
|
elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
|
|
157
157
|
_genExtend()
|
|
158
|
-
elif read_data["extend"].get("app", "") == "ryry-cli 6.
|
|
158
|
+
elif read_data["extend"].get("app", "") == "ryry-cli 6.6":
|
|
159
159
|
_genExtend()
|
|
160
160
|
else:
|
|
161
161
|
_genExtend()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|