|
|
@@ -14,14 +14,7 @@ class DataCenerHook(BaseHandler):
|
|
|
class QcWebHook(BaseHandler):
|
|
|
|
|
|
def post(self):
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
val = os.popen('cd /root/QcWebServer && git pull')
|
|
|
- val2 = os.popen('cd /root/dev/QcWebServer && git pull')
|
|
|
- DingTalkUtils.send('QcWebServer代码更新[master]：\n '+val.read()+'\n[dev]:\n'+val2.read())
|
|
|
-
|
|
|
- self.write('ok')
|
|
|
-=======
|
|
|
- val= os.popen('cd /root/QcWebServer && git pull')
|
|
|
- self.write('ok')
|
|
|
DingTalkUtils.send('QcWebServer代码更新：\n '+val.read())
|
|
|
->>>>>>> parent of 60c4831 (1)
|
|
|
+ self.write('ok')
|
