浏览代码

添加 OSS 部署接口,增加了 SVN 的 post-commit hook

reghao 6 年之前
父节点
当前提交
a4e2848aaf
共有 33 个文件被更改,包括 127 次插入160 次删除
  1. 6 6
      common/src/main/java/cn/reghao/autodop/common/machine/Cpu.java
  2. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/Disk.java
  3. 5 5
      common/src/main/java/cn/reghao/autodop/common/machine/Memory.java
  4. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/Network.java
  5. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/ProcessState.java
  6. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/SysInfo.java
  7. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/pojo/CpuInfo.java
  8. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/pojo/CpuUsage.java
  9. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/pojo/DiskStats.java
  10. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/pojo/DiskUsage.java
  11. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/pojo/MemInfo.java
  12. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/pojo/NetState.java
  13. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/pojo/ProcessInfo.java
  14. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/utils/AbstractCalculator.java
  15. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/utils/BeanConversion.java
  16. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/utils/ByteConvert.java
  17. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/utils/ByteType.java
  18. 3 3
      common/src/main/java/cn/reghao/autodop/common/machine/utils/CpuCalculator.java
  19. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/utils/IpAddressConversion.java
  20. 3 3
      common/src/main/java/cn/reghao/autodop/common/machine/utils/MemCalculator.java
  21. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/vo/CpuStat.java
  22. 1 1
      common/src/main/java/cn/reghao/autodop/common/machine/vo/MemUsage.java
  23. 9 6
      dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/BuildController.java
  24. 33 0
      dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/OssService.java
  25. 1 1
      dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/AppDeploy.java
  26. 6 5
      dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/AppIntegrate.java
  27. 4 4
      dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/packer/ZipPack.java
  28. 7 4
      dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/packer/ZipRemotePack.java
  29. 0 42
      dmaster/src/main/java/cn/reghao/autodop/dmaster/controller/IndexService.java
  30. 0 63
      dmaster/src/main/java/cn/reghao/autodop/dmaster/controller/TestController.java
  31. 1 0
      dmaster/src/main/java/cn/reghao/autodop/dmaster/orchestrate/pojo/tools/AppPacker.java
  32. 1 0
      dmaster/src/main/java/cn/reghao/autodop/dmaster/orchestrate/service/OrchestrateService.java
  33. 30 0
      scripts/post-commit

+ 6 - 6
common/src/main/java/cn/reghao/autodop/common/monitor/Cpu.java → common/src/main/java/cn/reghao/autodop/common/machine/Cpu.java

@@ -1,10 +1,10 @@
-package cn.reghao.autodop.common.monitor;
+package cn.reghao.autodop.common.machine;
 
-import cn.reghao.autodop.common.monitor.pojo.CpuInfo;
-import cn.reghao.autodop.common.monitor.pojo.CpuUsage;
-import cn.reghao.autodop.common.monitor.utils.AbstractCalculator;
-import cn.reghao.autodop.common.monitor.utils.BeanConversion;
-import cn.reghao.autodop.common.monitor.utils.CpuCalculator;
+import cn.reghao.autodop.common.machine.pojo.CpuInfo;
+import cn.reghao.autodop.common.machine.pojo.CpuUsage;
+import cn.reghao.autodop.common.machine.utils.AbstractCalculator;
+import cn.reghao.autodop.common.machine.utils.BeanConversion;
+import cn.reghao.autodop.common.machine.utils.CpuCalculator;
 import cn.reghao.autodop.common.utils.text.TextFile;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/Disk.java → common/src/main/java/cn/reghao/autodop/common/machine/Disk.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor;
+package cn.reghao.autodop.common.machine;
 
 import cn.reghao.autodop.common.utils.text.TextFile;
 import lombok.extern.slf4j.Slf4j;

+ 5 - 5
common/src/main/java/cn/reghao/autodop/common/monitor/Memory.java → common/src/main/java/cn/reghao/autodop/common/machine/Memory.java

@@ -1,10 +1,10 @@
-package cn.reghao.autodop.common.monitor;
+package cn.reghao.autodop.common.machine;
 
 import cn.reghao.autodop.common.utils.text.TextFile;
-import cn.reghao.autodop.common.monitor.utils.BeanConversion;
-import cn.reghao.autodop.common.monitor.utils.MemCalculator;
-import cn.reghao.autodop.common.monitor.pojo.MemInfo;
-import cn.reghao.autodop.common.monitor.utils.AbstractCalculator;
+import cn.reghao.autodop.common.machine.utils.BeanConversion;
+import cn.reghao.autodop.common.machine.utils.MemCalculator;
+import cn.reghao.autodop.common.machine.pojo.MemInfo;
+import cn.reghao.autodop.common.machine.utils.AbstractCalculator;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/Network.java → common/src/main/java/cn/reghao/autodop/common/machine/Network.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor;
+package cn.reghao.autodop.common.machine;
 
 import cn.reghao.autodop.common.utils.text.TextFile;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/ProcessState.java → common/src/main/java/cn/reghao/autodop/common/machine/ProcessState.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor;
+package cn.reghao.autodop.common.machine;
 
 import lombok.extern.slf4j.Slf4j;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/SysInfo.java → common/src/main/java/cn/reghao/autodop/common/machine/SysInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor;
+package cn.reghao.autodop.common.machine;
 
 import lombok.extern.slf4j.Slf4j;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/pojo/CpuInfo.java → common/src/main/java/cn/reghao/autodop/common/machine/pojo/CpuInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.pojo;
+package cn.reghao.autodop.common.machine.pojo;
 
 import lombok.Data;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/pojo/CpuUsage.java → common/src/main/java/cn/reghao/autodop/common/machine/pojo/CpuUsage.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.pojo;
+package cn.reghao.autodop.common.machine.pojo;
 
 import lombok.Data;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/pojo/DiskStats.java → common/src/main/java/cn/reghao/autodop/common/machine/pojo/DiskStats.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.pojo;
+package cn.reghao.autodop.common.machine.pojo;
 
 /**
  * /proc/diskstats 文件内容

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/pojo/DiskUsage.java → common/src/main/java/cn/reghao/autodop/common/machine/pojo/DiskUsage.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.pojo;
+package cn.reghao.autodop.common.machine.pojo;
 
 import lombok.Data;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/pojo/MemInfo.java → common/src/main/java/cn/reghao/autodop/common/machine/pojo/MemInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.pojo;
+package cn.reghao.autodop.common.machine.pojo;
 
 import lombok.Data;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/pojo/NetState.java → common/src/main/java/cn/reghao/autodop/common/machine/pojo/NetState.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.pojo;
+package cn.reghao.autodop.common.machine.pojo;
 
 import lombok.Data;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/pojo/ProcessInfo.java → common/src/main/java/cn/reghao/autodop/common/machine/pojo/ProcessInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.pojo;
+package cn.reghao.autodop.common.machine.pojo;
 
 import lombok.Data;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/utils/AbstractCalculator.java → common/src/main/java/cn/reghao/autodop/common/machine/utils/AbstractCalculator.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.utils;
+package cn.reghao.autodop.common.machine.utils;
 
 import com.google.gson.Gson;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/utils/BeanConversion.java → common/src/main/java/cn/reghao/autodop/common/machine/utils/BeanConversion.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.utils;
+package cn.reghao.autodop.common.machine.utils;
 
 import java.lang.reflect.Field;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/utils/ByteConvert.java → common/src/main/java/cn/reghao/autodop/common/machine/utils/ByteConvert.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.utils;
+package cn.reghao.autodop.common.machine.utils;
 
 import lombok.extern.slf4j.Slf4j;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/utils/ByteType.java → common/src/main/java/cn/reghao/autodop/common/machine/utils/ByteType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.utils;
+package cn.reghao.autodop.common.machine.utils;
 
 /**
  * @author reghao

+ 3 - 3
common/src/main/java/cn/reghao/autodop/common/monitor/utils/CpuCalculator.java → common/src/main/java/cn/reghao/autodop/common/machine/utils/CpuCalculator.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.common.monitor.utils;
+package cn.reghao.autodop.common.machine.utils;
 
-import cn.reghao.autodop.common.monitor.vo.CpuStat;
-import cn.reghao.autodop.common.monitor.pojo.CpuUsage;
+import cn.reghao.autodop.common.machine.vo.CpuStat;
+import cn.reghao.autodop.common.machine.pojo.CpuUsage;
 
 /**
  * @author reghao

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/utils/IpAddressConversion.java → common/src/main/java/cn/reghao/autodop/common/machine/utils/IpAddressConversion.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.utils;
+package cn.reghao.autodop.common.machine.utils;
 
 /**
  * @author reghao

+ 3 - 3
common/src/main/java/cn/reghao/autodop/common/monitor/utils/MemCalculator.java → common/src/main/java/cn/reghao/autodop/common/machine/utils/MemCalculator.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.common.monitor.utils;
+package cn.reghao.autodop.common.machine.utils;
 
-import cn.reghao.autodop.common.monitor.pojo.MemInfo;
-import cn.reghao.autodop.common.monitor.vo.MemUsage;
+import cn.reghao.autodop.common.machine.pojo.MemInfo;
+import cn.reghao.autodop.common.machine.vo.MemUsage;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/vo/CpuStat.java → common/src/main/java/cn/reghao/autodop/common/machine/vo/CpuStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.vo;
+package cn.reghao.autodop.common.machine.vo;
 
 import lombok.Data;
 

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/monitor/vo/MemUsage.java → common/src/main/java/cn/reghao/autodop/common/machine/vo/MemUsage.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.monitor.vo;
+package cn.reghao.autodop.common.machine.vo;
 
 import lombok.Data;
 

+ 9 - 6
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/BuildController.java

@@ -2,6 +2,7 @@ package cn.reghao.autodop.dmaster.app.controller;
 
 import cn.reghao.autodop.common.config.BuildDeployResult;
 import cn.reghao.autodop.dmaster.app.service.AppManager;
+import cn.reghao.autodop.dmaster.app.service.OssService;
 import cn.reghao.autodop.dmaster.app.service.build.AppDeploy;
 import cn.reghao.autodop.dmaster.result.WebResult;
 import cn.reghao.autodop.dmaster.app.service.build.BuildDispatcher;
@@ -11,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import org.tmatesoft.svn.core.SVNException;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -28,10 +30,12 @@ import java.util.Set;
 public class BuildController {
     private BuildDispatcher buildDispatcher;
     private AppManager appManager;
+    private OssService ossService;
 
-    public BuildController(BuildDispatcher buildDispatcher, AppManager appManager) {
+    public BuildController(BuildDispatcher buildDispatcher, AppManager appManager, OssService ossService) {
         this.buildDispatcher = buildDispatcher;
         this.appManager = appManager;
+        this.ossService = ossService;
     }
 
     @ApiOperation(value = "构建应用")
@@ -112,11 +116,10 @@ public class BuildController {
             @ApiImplicitParam(name="appId", value="一个或多个应用(多个应用间使用 , 分隔)",
                     paramType="path", dataType = "String")
     )
-    @PostMapping("/deploy/oss")
-    public String deployOss(@RequestParam("appId") String appId,
-                            @RequestParam("ossPath") String ossPath) throws Exception {
-        // TODO 上传静态资源到 OSS
-        return null;
+    @PostMapping("/deploy/oss/{appId}")
+    public String deployOss(@PathVariable("appId") String appId) throws SVNException {
+        ossService.upload(appId);
+        return new WebResult<String>().jsonResult("ok");
     }
 
     /**

+ 33 - 0
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/OssService.java

@@ -0,0 +1,33 @@
+package cn.reghao.autodop.dmaster.app.service;
+
+import cn.reghao.autodop.common.utils.FileUtil;
+import cn.reghao.autodop.dmaster.app.service.build.tools.vc.SvnImpl;
+import cn.reghao.autodop.dmaster.orchestrate.pojo.SysConfig;
+import cn.reghao.autodop.dmaster.utils.OssUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.tmatesoft.svn.core.SVNException;
+
+import java.io.File;
+
+/**
+ * @author reghao
+ * @date 2020-03-17 13:58:03
+ */
+@Slf4j
+@Service
+public class OssService {
+    private OssUtil ossUtil;
+
+    public OssService(OssUtil ossUtil) {
+        this.ossUtil = ossUtil;
+    }
+
+    public void upload(String dirname) throws SVNException {
+        SvnImpl svn = new SvnImpl("gjs", "gjs1234");
+        String remote = "svn://192.168.0.214/azy/CodeRepositories/IQuizoo.C2Game/trunk/Codes/" + dirname;
+        String local = SysConfig.localRepos + "/c2game/" + dirname;
+        svn.update(remote, local);
+        ossUtil.backupAndUpload(dirname, local);
+    }
+}

+ 1 - 1
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/AppDeploy.java

@@ -55,7 +55,7 @@ public class AppDeploy {
             }
         } else if ("zip-remote".equalsIgnoreCase(packerType)) {
             // TODO zip-remote 使用 zip 打包,并将应用包上传到远程服务器,appRootPath 是一个 HTTP 链接
-            appPath = appPacker.getAppRootPath() + app.getIdentifier() + "_" + version;
+            appPath = appPacker.getAppRootPath() + "/" + app.getIdentifier() + "_" + version;
         }
 
         List<BuildDeployResult> results = Deployer.deploy(app, appPath, isRun);

+ 6 - 5
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/AppIntegrate.java

@@ -1,10 +1,8 @@
 package cn.reghao.autodop.dmaster.app.service.build;
 
 import cn.reghao.autodop.dmaster.app.service.build.tools.compiler.*;
-import cn.reghao.autodop.dmaster.app.service.build.tools.packer.DnktMgrZipPack;
-import cn.reghao.autodop.dmaster.app.service.build.tools.packer.DockerPack;
-import cn.reghao.autodop.dmaster.app.service.build.tools.packer.PackApp;
-import cn.reghao.autodop.dmaster.app.service.build.tools.packer.ZipPack;
+import cn.reghao.autodop.dmaster.app.service.build.tools.packer.*;
+import cn.reghao.autodop.dmaster.orchestrate.pojo.SysConfig;
 import cn.reghao.autodop.dmaster.orchestrate.pojo.build.AppBuild;
 import cn.reghao.autodop.dmaster.orchestrate.pojo.tools.AppPacker;
 import cn.reghao.autodop.dmaster.orchestrate.pojo.tools.CodeCompiler;
@@ -19,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Slf4j
 public class AppIntegrate {
+    private final String packDir = SysConfig.packDir;
     private AppOrchestration app;
     private PreCompile preCompile;
     private CompileCode compileCode;
@@ -61,7 +60,9 @@ public class AppIntegrate {
         } else if ("maven".equals(packer.getPackerType())) {
 
         } else if ("zip".equals(packer.getPackerType())) {
-            packApp = new ZipPack(packer);
+            packApp = new ZipPack(packDir);
+        } else if ("zip-remote".equals(packer.getPackerType())) {
+            packApp = new ZipRemotePack(packDir);
         }
 
         // TODO 特定于 dnkt-mgr 项目的处理

+ 4 - 4
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/packer/ZipPack.java

@@ -13,16 +13,16 @@ import java.io.File;
 @Slf4j
 public class ZipPack implements PackApp {
     private final String SUFFIX = ".zip";
-    private AppPacker appPacker;
+    private String packDir;
 
-    public ZipPack(AppPacker appPacker) {
-        this.appPacker = appPacker;
+    public ZipPack(String packDir) {
+        this.packDir = packDir;
     }
 
     @Override
     public void pack(String appId, String version, String appEntryDir) throws Exception {
         String tag = appId + "_" + version + SUFFIX;
-        String dst = appPacker.getAppRootPath() + "/" + tag;
+        String dst = packDir + "/" + tag;
         if (new File(dst).exists()) {
             return;
         }

+ 7 - 4
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/packer/ZipRemotePack.java

@@ -1,7 +1,9 @@
 package cn.reghao.autodop.dmaster.app.service.build.tools.packer;
 
 import cn.reghao.autodop.common.utils.compression.ZipUtil;
+import cn.reghao.autodop.dmaster.orchestrate.pojo.SysConfig;
 import cn.reghao.autodop.dmaster.orchestrate.pojo.tools.AppPacker;
+import cn.reghao.autodop.dmaster.utils.OssUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
@@ -13,20 +15,21 @@ import java.io.File;
 @Slf4j
 public class ZipRemotePack implements PackApp {
     private final String SUFFIX = ".zip";
-    private AppPacker appPacker;
+    private String packDir;
 
-    public ZipRemotePack(AppPacker appPacker) {
-        this.appPacker = appPacker;
+    public ZipRemotePack(String packDir) {
+        this.packDir = packDir;
     }
 
     @Override
     public void pack(String appId, String version, String appEntryDir) throws Exception {
         String tag = appId + "_" + version + SUFFIX;
-        String dst = appPacker.getAppRootPath() + "/" + tag;
+        String dst = packDir + "/" + tag;
         if (new File(dst).exists()) {
             return;
         }
         ZipUtil.zip(new File(appEntryDir), dst);
+
         // TODO 将应用包上传到远程服务器
     }
 }

+ 0 - 42
dmaster/src/main/java/cn/reghao/autodop/dmaster/controller/IndexService.java

@@ -1,42 +0,0 @@
-package cn.reghao.autodop.dmaster.controller;
-
-import cn.reghao.autodop.dmaster.config.OssProperties;
-import cn.reghao.autodop.dmaster.utils.OssUtil;
-import cn.reghao.autodop.common.utils.compression.ZipUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author reghao
- * @date 2019-08-27 00:17:55
- */
-@Deprecated
-@Slf4j
-@Service
-public class IndexService {
-    private OssProperties ossProperties;
-    private OssUtil oss;
-
-    public IndexService(OssProperties ossProperties) {
-        this.ossProperties = ossProperties;
-        oss = new OssUtil(ossProperties);
-    }
-
-    public boolean uploadToOss(String ossPath, String filePath) throws IOException {
-        File file = new File(filePath);
-        if (!file.exists()) {
-            return false;
-        }
-
-        String dir = "/tmp";
-        if (filePath.endsWith(".zip")) {
-            ZipUtil.unzip(filePath, dir);
-        }
-
-        oss.backupAndUpload(ossPath, dir + "/" + ossPath);
-        return true;
-    }
-}

+ 0 - 63
dmaster/src/main/java/cn/reghao/autodop/dmaster/controller/TestController.java

@@ -1,63 +0,0 @@
-package cn.reghao.autodop.dmaster.controller;
-
-import cn.reghao.autodop.dmaster.utils.SpringBootUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * @author reghao
- * @date 2019-08-26 23:57:41
- */
-@Deprecated
-@Slf4j
-@Api(tags = "其他")
-@RestController
-@RequestMapping("/api/app")
-public class TestController {
-    private IndexService indexService;
-
-    public TestController(IndexService indexService) {
-        this.indexService = indexService;
-    }
-
-    /**
-     * 上传文件到 OSS
-     *
-     * @param
-     * @return
-     * @date 2019-08-27 上午12:58
-     */
-    @ApiOperation(value = "上传文件到 OSS")
-    @ApiImplicitParams(
-            @ApiImplicitParam(name="oss_path", value="OSS 中的路径", paramType="query", dataType = "String")
-    )
-    @PostMapping("/oss/upload")
-    public String ossUpload(@RequestParam("oss_path") String ossPath, @RequestParam("file") MultipartFile file) throws Exception {
-        String filename = file.getOriginalFilename();
-        String filePath = SpringBootUtil.saveFile(file, "/tmp");
-        if (filePath != null) {
-            boolean res = indexService.uploadToOss(ossPath, filePath);
-            if (res) {
-                return filename + " 上传成功";
-            }
-        }
-        return filename + " 上传失败,请重试";
-    }
-
-    @ApiOperation(value = "更新并重启 CI 应用")
-    @ApiImplicitParams(
-            @ApiImplicitParam(name="file", value="CI 应用", paramType="path", dataType = "String")
-    )
-    @PostMapping("/update")
-    public String restart(@RequestParam("file") MultipartFile file) {
-        String savedPath = "/home/reghao/tmp/deployer/uploads";
-        String filePath = SpringBootUtil.saveFile(file, savedPath);
-
-        return filePath;
-    }
-}

+ 1 - 0
dmaster/src/main/java/cn/reghao/autodop/dmaster/orchestrate/pojo/tools/AppPacker.java

@@ -17,6 +17,7 @@ public class AppPacker extends BaseEntity {
     @Column(nullable = false, unique = true)
     private String packerName;
 
+    // 获取已打包应用的路径
     @Column(nullable = false)
     private String appRootPath;
 

+ 1 - 0
dmaster/src/main/java/cn/reghao/autodop/dmaster/orchestrate/service/OrchestrateService.java

@@ -293,6 +293,7 @@ public class OrchestrateService {
     public void modify(int type, String json) throws Exception {
         switch (type) {
             case 1:
+                // TODO 修改 projEntity 中与 proj 不同的地方
                 ProjOrchestration proj = (ProjOrchestration) JsonUtil.jsonToObject(json, ProjOrchestration.class);
                 ProjOrchestration projEntity = projOrchestrationRepository.findByIdentifier(proj.getIdentifier());
                 projEntity.setDescription(proj.getDescription());

+ 30 - 0
scripts/post-commit

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+REPOS="$1"
+REV="$2"
+
+LOGFILE=/tmp/post-commit-${REV}.log
+CHANGED=$(svnlook changed -r $REV $REPOS)
+echo "${CHANGED}" > ${LOGFILE}
+
+declare -A FE_MAP BE_MAP
+FE_MAP=([20200205/IQuizoo_FrontEnd]="dnkt-mgr" [trunk/ant-design-pro]="jigou-mgr" [trunk/IQuizoo_Teaching_FE_New]="dnkt" [trunk/IQuizoo_Teaching_FE_Institution]="dnkt-jigou")
+BE_MAP=([20200203/IdentityService]="identity" [20200203/APIGateway]="gateway" [20200203/UserService]="user" [20200203/ContentService]="content" [20200203/ExternalServices]="content-external" [20200203/FileService]="file" [20200203/TimingTasks]="timing-tasks" [20200203/DataCenter]="data-center" [20200203/SystemConfigService]="systemconfig")
+
+for KEY in $(echo ${!FE_MAP[*]})
+do
+	grep ${KEY} ${LOGFILE} > /dev/null
+	if [ `echo $?` -eq 0 ]; then
+	  echo ${FE_MAP[${KEY}]} >> ${LOGFILE}
+		#curl -X POST http://192.168.0.50:4000/api/app/build/${FE_MAP[${KEY}]} &
+	fi
+done
+
+for KEY in $(echo ${!BE_MAP[*]})
+do
+	grep ${KEY} ${LOGFILE} > /dev/null
+	if [ `echo $?` -eq 0 ]; then
+	  echo ${BE_MAP[${KEY}]} >> ${LOGFILE}
+		#curl -X POST http://192.168.0.50:4000/api/app/build/${BE_MAP[${KEY}]} &
+	fi
+done