github_mirrors/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2025-01-24 01:50:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

curl wget

Browse Source
This commit is contained in:
qiaofeng1227 2023-07-28 17:27:46 +08:00
parent 28e40c5ccb
commit 7a8d345242
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appmanage/Dockerfile
View File

@ -12,7 +12,7 @@ COPY requirements.txt main.py database.sqlite ./
RUN apt update RUN apt update
# Install supervisords # Install supervisords
RUN apt install -y supervisor RUN apt install -y supervisors
COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY config/cmd.sh /cmd.sh COPY config/cmd.sh /cmd.sh
RUN chmod +x /etc/supervisor/conf.d/supervisord.conf /cmd.sh RUN chmod +x /etc/supervisor/conf.d/supervisord.conf /cmd.sh

6
appmanage/api/service/manage.py
View File

@ -78,7 +78,7 @@ def AppAutoUpdate(auto_update):
def AppStoreCore(): def AppStoreCore():
version_cmd = "curl " + const.ARTIFACT_URL + "/plugin/appstore/appstore.json" version_cmd = "wget -O appstore.json " + const.ARTIFACT_URL + "/plugin/appstore/appstore.json && cat appstore.json"
latest = shell_execute.execute_command_output_all(version_cmd)['result'] latest = shell_execute.execute_command_output_all(version_cmd)['result']
most_version = json.loads(latest)['Requires at most'] most_version = json.loads(latest)['Requires at most']
least_version = json.loads(latest)['Requires at least'] least_version = json.loads(latest)['Requires at least']
@ -86,7 +86,7 @@ def AppStoreCore():
now_version = json.loads(now)['VERSION'] now_version = json.loads(now)['VERSION']
version_str = "now_version:" + now_version + " least_version:" + least_version + " most_version:" + most_version version_str = "now_version:" + now_version + " least_version:" + least_version + " most_version:" + most_version
myLogger.info_logger(version_str) myLogger.info_logger(version_str)
if float(now_version) >= float(least_version) and float(now_version) <= float(most_version): if now_version >= least_version and now_version <= most_version:
return "0" return "0"
elif now_version < least_version: elif now_version < least_version:
return "-1" return "-1"
@ -111,7 +111,7 @@ def AppStoreUpdate():
except: except:
local_version = "0.0.0" local_version = "0.0.0"
version_cmd = "curl " + const.ARTIFACT_URL + "/plugin/appstore/appstore.json" version_cmd = "wget -O appstore.json " + const.ARTIFACT_URL + "/plugin/appstore/appstore.json && cat appstore.json"
latest = shell_execute.execute_command_output_all(version_cmd)['result'] latest = shell_execute.execute_command_output_all(version_cmd)['result']
version = json.loads(latest)['Version'] version = json.loads(latest)['Version']
if local_version < version: if local_version < version: