修改多文件编译字段修改

ykxie
1 parent 6e5f7a7d
Showing 2 changed files with 48 additions and 52 deletions
src/index.html
src/js/gb.js
@@ -20,7 +20,7 @@
  
     <script>
         // var gxb_api = "https://restful1.gaoxiaobang.com";
-        var gxb_api = "http://192.168.80.140:8080"
+        var gxb_api = "http://192.168.80.223:8080"
  
     </script>
  
@@ -751,13 +751,14 @@ $(function() {
  
             // 播放录制代码过程
             $('.audio-play').unbind('click').click(function() {
-                alert(1)
+                // alert(1)
                 var resultData = {
-                    output: '',
-                    stderr: '',
-                    cmpinfo: '',
-                    result: 1
-                }
+                    status: 200,
+                    compilerInfo: '',
+                    content: '',
+                    error: '',
+                    code: ''
+                };
                 GBCodePlayBack.resetCodeMirrorValue();
                 compileResult(resultData);
                 var data = $(this).attr('data');
@@ -1145,7 +1146,7 @@ $(function() {
  
                 $.ajax({
                     type: "post",
-                    url: "http://192.168.80.140:8080/gxb-web/programmingMulti/api",
+                    url: gxb_api + "/gxb-web/programmingMulti/api",
                     data: JSON.stringify(postData),
                     dataType: "json",
                     contentType: "application/json",
@@ -1661,11 +1662,12 @@ $(function() {
                 GBCodePlayBack.codeTimes = 1;   // 
  
                 var resultData = {
-                    output: record.output || '',
-                    stderr: record.stderr || '',
-                    cmpinfo: record.cmpinfo || '',
-                    result: record.result
-                }
+                    status: record.status || 200,
+                    compilerInfo: record.compilerInfo || '',
+                    content: record.content || '',
+                    error: record.error || '',
+                    code: record.code || ''
+                };
  
                 if (resultData.cmpinfo || resultData.result == 1) {
                     compileResult(resultData);
@@ -1797,6 +1799,7 @@ $(function() {
     }
  
     $('.record-before').hide();
+
     // 动态获取目录结构
     $.ajax({
         type: "GET",
@@ -1804,7 +1807,7 @@ $(function() {
         dataType: "json",
         contentType: "application/json",
         success: function(res) {
-            console.info("Ajax tree.json success");
+            console.info();
             treeData = res.tree;
  
             treeObj = $.fn.zTree.init($("#folder"), ZTREE.config, treeData);
@@ -1830,10 +1833,11 @@ $(function() {
         $("#countdown").show();
  
         var resultData = {
-            output: '',
-            stderr: '',
-            cmpinfo: '',
-            result: 1
+            status: 200,
+            compilerInfo: '',
+            content: '',
+            error: '',
+            code: ''
         };
         runResult()
  
@@ -2095,44 +2099,35 @@ $(function() {
         $('#upload').removeClass('recording-finish').addClass('upload-teach').attr("disabled", true);
         GBCodePlayBack.htmleditor.setValue('');
         var resultData = {
-            output: '',
-            stderr: '',
-            cmpinfo: '',
-            result: 1
+            status: 200,
+            content: '',
+            error: '',
+            code: ''
         };
         compileResult(resultData);
     }
  
     // 编译结果
     function compileResult(data) {
-        if (data.result) {
-
-            $('#cmpinfo').html('<p class="text-warning">' + data.cmpinfo.replace(/\n/g, "<br />") + "</p>");
-            $('#stderr').html('<p class="text-danger">' + data.stderr.replace(/\n/g, "<br />") + "</p>");
-            $('#output').html('<p class="text-success">' + data.output.replace(/\n/g, "<br />") + "</p>");
-
-            if (data.cmpinfo.length) {
-                $('#cmprun-tabs a[href="#cmpinfo"]').tab('show');
-            } else if (data.stderr.length) {
-                $('#cmprun-tabs a[href="#stderr"]').tab('show');
-            } else if (data.output.length) {
+        if (data.status == 200) {
+            if (data.code == 0) {
+                $('#output').html('<p class="text-success">' + data.content.replace(/\n/g, "<br />") + "</p>");
+                $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 编译成功 </p>');
                 $('#cmprun-tabs a[href="#output"]').tab('show');
+            } else if (data.code == 1) {
+                if (data.error.length) {
+                    $('#cmpinfo').html('<p class="text-warning">' + data.error.replace(/\n/g, "<br />") + "</p>");
+                }else if (data.compilerInfo.length){
+                    $('#cmpinfo').html('<p class="text-warning">' + data.compilerInfo.replace(/\n/g, "<br />") + "</p>");
+                }else{
+                    $('#cmpinfo').html('<p class="alert alert-danger"><i class="glyphicon glyphicon-exclamation-sign"></i> 编译超时，请重新编译 </p>');
+                }
+                $('#cmprun-tabs a[href="#cmpinfo"]').tab('show');
+            }else{
+                $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 等待编译 </p>');
             }
-
-            if (!data.cmpinfo.length) {
-                $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 编译已成功</p>');
-            }
-
-            if (!data.stderr.length) {
-                $('#stderr').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 无输出错误</p>');
-            }
-
-            if (!data.output.length) {
-                $('#output').prepend('<p class="alert alert-warning"><i class="glyphicon glyphicon-exclamation-sign"></i> 代码编译错误或者运行相关功能受限制</p>');
-            }
-
-        } else {
-            $('#cmpinfo').html('<p class="alert alert-danger"><i class="glyphicon glyphicon-exclamation-sign"></i> 云端编译超时，请稍后重新尝试</p>');
+        }else{
+            $('#cmpinfo').html('<p class="alert alert-danger"><i class="glyphicon glyphicon-exclamation-sign"></i> 请求失败 </p>');
             $('#cmprun-tabs a[href="#cmpinfo"]').tab('show');
         }
     }
@@ -2324,10 +2319,11 @@ $(function() {
         }else{
             GBCodePlayBack.htmlplayereditor.setValue('')
             var resultData = {
-                output: '',
-                stderr: '',
-                cmpinfo: '',
-                result: 1
+                status: 200,
+                compilerInfo: '',
+                content: '',
+                error: '',
+                code: ''
             };
             compileResult(resultData);
         }