aws_upload suod

720yun_fd_manage/gis_service/src/main/java/com/gis/service/TestService.java

@@ -21,5 +21,5 @@ public interface TestService  {
 
     Result awsUpload(MultipartFile file);
 
-    Result sh();
+    Result sh(Integer i);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/TestServiceImpl.java

@@ -189,9 +189,12 @@ public class TestServiceImpl implements TestService {
     }
 
     @Override
-    public Result sh() {
-//        String cmd = "bash /opt/ossutil/fyun-upload.sh test-4dkankan /mnt/720yun_fd_manage_data/fd720_n5ArPVAwm 720yun_fd_manage/fd720_n5ArPVAwm aws folder";
+    public Result sh(Integer i) {
         String cmd = "bash /mnt/720yun_fd_manage_data/baseData/aws_upload.sh test-4dkankan /mnt/720yun_fd_manage_data/fd720_n5ArPVAwm 720yun_fd_manage/fd720_n5ArPVAwm";
+        if (i==1){
+            cmd = "sudo bash /mnt/720yun_fd_manage_data/baseData/aws_upload_1.sh test-4dkankan /mnt/720yun_fd_manage_data/fd720_n5ArPVAwm 720yun_fd_manage/fd720_n5ArPVAwm";
+        }
+
         log.info("cmd : {}", cmd);
         CmdUtils.callShell_1(cmd);
         return Result.success();

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/TestController.java

@@ -257,9 +257,9 @@ public class TestController extends BaseController {
 
 
     @ApiOperation(value = "testShell-测试脚本")
-    @GetMapping("/testShell")
-    public Result shell()  {
-        return testService.sh();
+    @GetMapping("/testShell/{i}")
+    public Result shell(Integer i)  {
+        return testService.sh(i);
     }