fix: js and supervisor_log_path

liquanzhou · Apr 27, 2020 · 7de7dd7 · 7de7dd7
1 parent 02e47d2
commit 7de7dd7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/app/config.py b/app/config.py
@@ -51,7 +51,7 @@
 # 运维钉钉通知地址
 sreRobot = 'https://oapi.dingtalk.com/robot/send?access_token=8a662b74fdce5c905b'
 # 业务线钉钉通知
-businessRobot = 'https://oapi.dingtalk.com/robot/send?access_token=cd4ebe40'
+groupRobot = 'https://oapi.dingtalk.com/robot/send?access_token=cd4ebe40'
 # 发钉钉通知的组 组名
 basicGlist = ['op-ad', 'op-ab', 'ff-aa']
 

diff --git a/app/main/forms.py b/app/main/forms.py
@@ -96,6 +96,7 @@ def deployConfig(project, host, ones, ones1):
             variable = {
                 '$USER$':                exec_user,
                 '$HOST_PATH$':           remote_host_path,
+                '$supervisor_log_path$': supervisor_log_path,
                 '$environment$':         ones.environment,
                 '$project$':             ones.project,
                 '$ip$':                  host,

diff --git a/app/main/views.py b/app/main/views.py
@@ -977,10 +977,10 @@ def update_project():
         checkhttp   = request.form.get('checkhttp',   'null').strip()
         httpurl     = request.form.get('httpurl',     'null').strip()
         httpcode    = request.form.get('checkport',   'null').strip()
-        make        = request.form.get('checkport',   'null').strip()
-        supervisor  = request.form.get('checkport',   'null').strip()
-        config      = request.form.get('checkport',   'null').strip()
-        remarks     = request.form.get('checkport',   'null').strip()
+        make        = request.form.get('make',        'null').strip()
+        supervisor  = request.form.get('supervisor',  'null').strip()
+        config      = request.form.get('config',      'null').strip()
+        remarks     = request.form.get('remarks',     'null').strip()
         if project == 'null' or group == 'null' or environment == 'null' or p == 'null' or branch == 'null' or codetype == 'null' or git == 'null':
             raise Exception('ERROR: parameter error')
         project1 = environment + '_' + p

diff --git a/app/static/ops.js b/app/static/ops.js
@@ -141,31 +141,31 @@ $("body").on('click', '#update_project', function(){
             alert('project null');
             return false;
         }
-        if(!add_type){
-            alert('type null');
+        if(!add_codetype){
+            alert('codetype null');
             return false;
         }
         if(!add_git){
             alert('git addr null');
             return false;
         }
         var param = {
-            project: add_project,
-            group: add_group,
-            environment: add_environment,
-            p: add_p,
-            codetype: add_codetype,
-            port: add_port,
-            git: add_git,
-            branch: add_branch,
-            checkport: checkport,
-            checkhttp: checkhttp,
-            httpurl: httpurl,
-            httpcode: httpcode,
-            make: make,
-            supervisor: supervisor,
-            config: config,
-            remarks: remarks
+            project     : add_project,
+            group       : add_group,
+            environment : add_environment,
+            p           : add_p,
+            codetype    : add_codetype,
+            port        : add_port,
+            git         : add_git,
+            branch      : add_branch,
+            checkport   : add_checkport,
+            checkhttp   : add_checkhttp,
+            httpurl     : add_httpurl,
+            httpcode    : add_httpcode,
+            make        : add_make,
+            supervisor  : add_supervisor,
+            config      : add_config,
+            remarks     : add_remarks
         }
 
         $.post('/update_project', param, function(data){