zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

This commit is contained in:
caoqianming 2023-08-07 16:00:14 +08:00
parent 959e3e3d8d d26a7d5805
commit c43474dace
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/settings.py
View File

@ -41,7 +41,6 @@ def update_dict(dict1, dict2):
if key == 'apk_file': # apk_file拷贝到固定位置 if key == 'apk_file': # apk_file拷贝到固定位置
from shutil import copyfile from shutil import copyfile
copyfile(BASE_DIR + value, BASE_DIR + '/media/zc_ehs.apk') copyfile(BASE_DIR + value, BASE_DIR + '/media/zc_ehs.apk')
else:
if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict): if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict):
update_dict(dict1[key], value) update_dict(dict1[key], value)
else: else: