增加接口

win-admin/src/main/java/com/win/web/controller/base/CommandController.java

@@ -16,10 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.DigestUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
@@ -134,7 +131,7 @@ public class CommandController {
      */
     @PostMapping("/apiSecret")
     @Log(title = "命令行对接qad", businessType = BusinessType.INSERT, isManager = false)
-    public AjaxResult apiSecret(HttpServletRequest request, @RequestBody String body) throws IOException {
+    public AjaxResult apiSecret(HttpServletRequest request, @RequestParam String body) throws IOException {
         System.out.println("接收到的body：" + body);
         String interfaceName = request.getHeader("interface");
         System.out.println("接收到的interface：" + interfaceName);

win-system/src/main/java/com/win/system/service/LinuxAccessService.java

@@ -92,7 +92,7 @@ public class LinuxAccessService extends ServiceImpl<LinuxAccessMapper, LinuxAcce
         if(result.indexOf("\"SUCCESS\"") > 0) {
             //移动执行结果文件
             shellUtil.execute(session, "mv " + linuxAccess.getOutPath() + traceid + ".run.out.json " + linuxAccess.getSuccessPath() + traceid  + ".run.out.json");
-            return AjaxResult.success(traceid);
+            return AjaxResult.success(result);
         }
         shellUtil.execute(session, "mv " + linuxAccess.getOutPath() + traceid + ".run.out.json " + linuxAccess.getErrorPath() + traceid  + ".run.out.json");
         return AjaxResult.error(HttpStatus.EXECUTE_FAIL, result);