Commit 8743fd96 by sikang

bug fix

parent 7c165f11
...@@ -340,8 +340,10 @@ class Function: ...@@ -340,8 +340,10 @@ class Function:
config['root'], "%s/cache/api_mapping" % target) config['root'], "%s/cache/api_mapping" % target)
except: except:
print("out: no api_mapping or img") print("out: no api_mapping or img")
new_config = self.load_properties("../../gradle.properties")
new_config = config.copy()
new_config.update(self.load_properties("../../gradle.properties"))
os.system("cd %s\ngit reset --hard origin/%s" % (config['root'],config['git_branch'])) os.system("cd %s\ngit reset --hard origin/%s" % (config['root'],config['git_branch']))
# 还原 # 还原
...@@ -358,7 +360,6 @@ class Function: ...@@ -358,7 +360,6 @@ class Function:
except: except:
print("in: no api_mapping or img") print("in: no api_mapping or img")
new_config['properties'] = config['properties']
self.update_gateway(new_config) self.update_gateway(new_config)
lines = { lines = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment