root 2 år sedan
förälder
incheckning
bd87d9bc36

+ 2 - 1
api-common/src/main/java/api/common/util/PythonUtil.java

@@ -22,6 +22,7 @@ public class PythonUtil {
     public static String R = "R";
     public static String W = "W";
     public static String E = "E";
+    public static String E0401 = "E0401";
     public static String F = "F";
     public static String PASS = "Your code has been rated at 10.00/10";
 
@@ -32,7 +33,7 @@ public class PythonUtil {
     @SneakyThrows
     public static String pylint(String pythonCode, String... disables) {
         //1 把代码保存成本地文件
-        String filePath = "/tmp/" + UUID.randomUUID().toString().replace("-", "") + ".py";
+        String filePath = "/home/ubuntu/test/" + UUID.randomUUID().toString().replace("-", "") + ".py";
         FileUtil.writeStringToLocalFile(pythonCode, filePath);
         //2 执行命令检查格式
         StringBuilder command = new StringBuilder("pylint --disable=");

+ 1 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/configuration/docker/DockerConfiguration.java

@@ -12,6 +12,7 @@ import java.util.List;
 @Data
 public class DockerConfiguration {
     private String registry;
+    private String registryVolume;
     private Integer maxAlgorithmImage;
     private Integer minAlgorithmImage;
     private List<DockerNodeTO> nodeList;

+ 3 - 3
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScoringRulesController.java

@@ -85,7 +85,7 @@ public class ScoringRulesController {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则名称 ruleName 已存在,请重新命名。");
         }
         //2 校验 python 语法错误
-        String pylint = PythonUtil.pylint(scoringRulesPO.getRuleDetails(), PythonUtil.C, PythonUtil.R, PythonUtil.W);
+        String pylint = PythonUtil.pylint(scoringRulesPO.getRuleDetails(), PythonUtil.C, PythonUtil.R, PythonUtil.W, PythonUtil.E0401);
         if (!pylint.contains(PythonUtil.PASS)) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "代码格式错误,请检查。");
         }
@@ -105,14 +105,14 @@ public class ScoringRulesController {
     @ResponseBody
     public ResponseBodyVO<String> fxScoringRules(@RequestBody ScoringRulesParam params) {
         if (ObjectUtil.isNull(params.getRulesId())) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 RulesId 不能为空,请检查","");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 RulesId 不能为空,请检查", "");
         }
         ScoringRulesPO po = scoringRulesService.queryScoringRules(params);
         params.setShare("1");
         params.setRuleName(po.getRuleName());
         List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesByRuleName(params);
         if (list != null && list.size() > 0) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则名称ruleName已存在,请重新命名","");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则名称ruleName已存在,请重新命名", "");
         }
         po.setShare("1");
         scoringRulesService.saveScoringRules(po);