优化

etl-rule-server/src/main/java/com/muyu/etl/rule/EtlRuleEngineApplication.java

@@ -13,5 +13,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class EtlRuleEngineApplication {
     public static void main(String[] args) {
         SpringApplication.run(EtlRuleEngineApplication.class, args);
+        System.out.println("ETL规则引擎启动成功!");
     }
 }

etl-rule-server/src/main/java/com/muyu/etl/rule/controller/RuleInfoController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author WangXin
@@ -41,7 +42,7 @@ public class RuleInfoController extends BaseController {
     /**
      * 查询规则维护列表
      */
-    @RequiresPermissions("engine:ruleInfo:list")
+//  @RequiresPermissions("engine:ruleInfo:list")
     @PostMapping("/list")
     @Operation(summary = "查询规则维护列表", description = "根据规则维护请求参数查询规则维护列表")
     public Result<TableDataInfo<EtlRuleListResp>> list(@RequestBody EtlRuleListReq ruleInfoReq) {
@@ -53,14 +54,14 @@ public class RuleInfoController extends BaseController {
                         .map(ruleInfo -> EtlRuleListResp.buildEtlRuleListResp(
                                 ruleInfo, ruleVersionService.selectRuleVersionListByRuleId(ruleInfo.getId())
                         ))
-                        .toList()
+                        .collect(Collectors.toList())
         );
     }
 
     /**
      * 导出规则维护列表
      */
-    @RequiresPermissions("engine:ruleInfo:export")
+//  @RequiresPermissions("engine:ruleInfo:export")
     @PostMapping("/export")
     @Operation(summary = "导出规则维护列表", description = "根据规则维护请求参数导出规则维护列表")
     public void export(HttpServletResponse response, @RequestBody EtlRuleListReq ruleInfoReq) {
@@ -72,7 +73,7 @@ public class RuleInfoController extends BaseController {
     /**
      * 获取规则维护详细信息
      */
-    @RequiresPermissions("engine:ruleInfo:query")
+//  @RequiresPermissions("engine:ruleInfo:query")
     @GetMapping(value = "/{id}")
     @Operation(summary = "获取规则维护详细信息", description = "根据规则维护id获取规则维护详细信息")
     public Result<EtlRuleListResp> getInfo(@PathVariable("id") Long id) {
@@ -85,7 +86,7 @@ public class RuleInfoController extends BaseController {
     /**
      * 新增规则维护
      */
-    @RequiresPermissions("engine:ruleInfo:add")
+//  @RequiresPermissions("engine:ruleInfo:add")
     @PostMapping
     @Operation(summary = "新增规则维护", description = "根据规则维护请求参数新增规则维护")
     public Result<Integer> add(
@@ -100,7 +101,7 @@ public class RuleInfoController extends BaseController {
     /**
      * 修改规则维护
      */
-    @RequiresPermissions("engine:ruleInfo:edit")
+//  @RequiresPermissions("engine:ruleInfo:edit")
     @PutMapping
     @Operation(summary = "修改规则维护", description = "根据规则维护Id修改规则维护")
     public Result<Integer> edit(
@@ -115,7 +116,7 @@ public class RuleInfoController extends BaseController {
     /**
      * 删除规则维护
      */
-    @RequiresPermissions("engine:ruleInfo:remove")
+//  @RequiresPermissions("engine:ruleInfo:remove")
     @DeleteMapping("/{ids}")
     @Operation(summary = "删除规则维护", description = "根据规则维护Id删除规则维护")
     public Result<Integer> remove(@PathVariable("ids") Long[] ids) {

etl-rule-server/src/main/java/com/muyu/etl/rule/controller/RuleVersionController.java

@@ -47,7 +47,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 查询规则版本列表
      */
-    @RequiresPermissions("engine:ruleVersion:list")
+//  @RequiresPermissions("engine:ruleVersion:list")
     @PostMapping("/list")
     @Operation(summary = "查询规则版本列表", description = "根据规则版本请求参数查询规则版本列表")
     public Result<TableDataInfo<RuleVersion>> list(@RequestBody RuleVersion ruleVersion) {
@@ -59,7 +59,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 导出规则版本列表
      */
-    @RequiresPermissions("engine:ruleVersion:export")
+//  @RequiresPermissions("engine:ruleVersion:export")
     @PostMapping("/export")
     @Operation(summary = "导出规则版本列表", description = "根据规则版本请求参数导出规则版本列表")
     public void export(HttpServletResponse response, @RequestBody RuleVersion ruleVersion) {
@@ -71,7 +71,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 获取规则版本详细信息
      */
-    @RequiresPermissions("engine:ruleVersion:query")
+//  @RequiresPermissions("engine:ruleVersion:query")
     @GetMapping(value = "/{id}")
     @Operation(summary = "获取规则版本详细信息", description = "根据规则版本id获取规则版本详细信息")
     public Result<List<RuleVersion>> getInfo(@PathVariable("id") Long id) {
@@ -81,7 +81,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 新增规则版本
      */
-    @RequiresPermissions("engine:ruleVersion:add")
+//  @RequiresPermissions("engine:ruleVersion:add")
     @PostMapping
     @Operation(summary = "新增规则版本", description = "根据规则版本请求参数新增规则版本")
     @Transactional(rollbackFor = Exception.class)
@@ -106,7 +106,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 修改规则版本
      */
-    @RequiresPermissions("engine:ruleVersion:edit")
+//  @RequiresPermissions("engine:ruleVersion:edit")
     @PutMapping
     @Operation(summary = "修改规则版本", description = "根据规则版本Id修改规则版本")
     public Result<Integer> edit(
@@ -121,7 +121,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 删除规则版本
      */
-    @RequiresPermissions("engine:ruleVersion:remove")
+//  @RequiresPermissions("engine:ruleVersion:remove")
     @DeleteMapping("/{ids}")
     @Operation(summary = "删除规则版本", description = "根据规则版本Id删除规则版本")
     public Result<Integer> remove(@PathVariable("ids") Long[] ids) {
@@ -135,7 +135,7 @@ public class RuleVersionController extends BaseController {
      * @param fileName 文件名称
      * @return 文件内容
      */
-    @RequiresPermissions("engine:ruleVersion:readFile")
+//  @RequiresPermissions("engine:ruleVersion:readFile")
     @PostMapping("/readFile/{fileName}")
     @Operation(summary = "根据文件名称读取文件内容", description = "根据文件名称读取文件内容")
     public Result<String> readFile(@PathVariable("fileName") String fileName) {
@@ -148,7 +148,7 @@ public class RuleVersionController extends BaseController {
      * @param writeFileReq 文件写入请求对象
      * @return 结果集
      */
-    @RequiresPermissions("engine:ruleVersion:writeFile")
+//  @RequiresPermissions("engine:ruleVersion:writeFile")
     @PostMapping("/writeFile")
     @Operation(summary = "根据文件名称写入文件内容", description = "根据文件名称写入文件内容")
     public Result<?> writeFile(@RequestBody WriteFileReq writeFileReq) {
@@ -159,7 +159,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 执行java文件
      */
-    @RequiresPermissions("engine:ruleVersion:execution")
+//  @RequiresPermissions("engine:ruleVersion:execution")
     @PostMapping("/execution")
     @Operation(summary = "执行java文件", description = "执行java文件")
     public Result<?> executionRuleVersion(@RequestBody ExecutionRuleVersionReq executionRuleVersionReq) {
@@ -169,7 +169,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 执行值java文件
      */
-    @RequiresPermissions("engine:ruleVersion:execution")
+//  @RequiresPermissions("engine:ruleVersion:execution")
     @PostMapping("/execution/{engineKey}")
     @Operation(summary = "执行值java文件", description = "执行值java文件")
     public Result<DataStructure> executionRuleVersion(@PathVariable("engineKey") String engineKey, @RequestBody DataStructure dataStructure) {
@@ -180,7 +180,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 执行行java文件
      */
-    @RequiresPermissions("engine:ruleVersion:execution")
+//  @RequiresPermissions("engine:ruleVersion:execution")
     @PostMapping("/lineFile/{engineKey}")
     @Operation(summary = "执行行java文件", description = "执行行java文件")
     public Result<DataStructure[][]> executionLineRuleVersion(@PathVariable("engineKey") String engineKey, @RequestBody DataStructure[][] dataStructureRow) {
@@ -191,7 +191,7 @@ public class RuleVersionController extends BaseController {
     /**
      * 执行组java文件
      */
-    @RequiresPermissions("engine:ruleVersion:execution")
+//  @RequiresPermissions("engine:ruleVersion:execution")
     @PostMapping("/groupFile/{engineKey}")
     @Operation(summary = "执行组java文件", description = "执行组java文件")
     public Result<DataStructure[][]> executionGroupRuleVersion(@PathVariable("engineKey") String engineKey, @RequestBody DataStructure[][] dataStructureRows) {

etl-rule-server/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 10.0.1.97:8848
   user-name: nacos
   password: nacos
-  namespace: wu_zu_cloud
+  namespace: cloud-2112
 
 # Spring
 spring:
@@ -24,19 +24,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: ${nacos.addr}
-        # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
       config:
         # 服务注册地址
         server-addr: ${nacos.addr}
-        # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式