Merge remote-tracking branch 'origin/dev-czh' into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/NewModelFromGitController.java

@@ -26,9 +26,6 @@ public class NewModelFromGitController {
     @Resource
     private ModelsService modelsService;
 
-    @Resource
-    private DVCUtils dvcUtils;
-
     @PostMapping("/addModel")
     @ApiOperation("添加模型")
     public AjaxResult addModelAndVersion(@RequestBody ModelsVo modelsVo) throws Exception {
@@ -119,15 +116,4 @@ public class NewModelFromGitController {
         return AjaxResult.success();
     }
 
-//    @GetMapping("/test")
-//    public AjaxResult test() {
-//        try {
-//            dvcUtils.gitPush("E:\\test\\admin\\model\\1451938\\object-model", "fanshuai", "h1n2x3j4y5@");
-//        } catch (IOException e) {
-//            throw new RuntimeException(e);
-//        } catch (GitAPIException e) {
-//            throw new RuntimeException(e);
-//        }
-//        return AjaxResult.success();
-//    }
 }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/YamlUtils.java

@@ -19,6 +19,7 @@ public class YamlUtils {
     public static void generateYamlFile(Map<String, Object> data, String path, String fileName) {
         DumperOptions options = new DumperOptions();
         options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        options.setDefaultScalarStyle(DumperOptions.ScalarStyle.PLAIN);
         options.setPrettyFlow(true);
         Yaml yaml = new Yaml(options);
         File directory = new File(path);