Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution

auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java

@@ -4,6 +4,7 @@ import com.solution.common.core.controller.BaseController;
 import com.solution.common.core.domain.AjaxResult;
 import com.solution.rule.domain.FireRuleExecuteDTO;
 import com.solution.rule.domain.simplerulepojo.Task;
+import com.solution.rule.domain.ultimately.dto.FireRuleInputDTO;
 import com.solution.rule.service.FireRuleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -85,6 +86,14 @@ public class FireRuleController extends BaseController {
         return success(ruleService.getComponents(platformId));
     }
 
+
+   /* @PostMapping("/rule")
+    @ApiOperation("开始执行规则匹配")
+    public AjaxResult execute(@RequestBody Task task){
+        return success(ruleService.executeTask(task));
+    }*/
+
+
     /**
      * 开始执行规则匹配
      * @param task 敌方参数
@@ -92,7 +101,10 @@ public class FireRuleController extends BaseController {
      */
     @PostMapping("/rule")
     @ApiOperation("开始执行规则匹配")
-    public AjaxResult execute(@RequestBody Task task){
-        return success(ruleService.executeTask(task));
+        public AjaxResult rule(@RequestBody FireRuleInputDTO task){
+        return success(ruleService.rule(task));
     }
+
+
+
 }

auto-solution-admin/src/main/resources/application-docker.yml

@@ -0,0 +1,23 @@
+# Docker / docker-compose 环境：与 application.yml 的 druid 配置叠加使用
+# 启动：-Dspring.profiles.active=druid,docker
+spring:
+  devtools:
+    restart:
+      enabled: false
+  redis:
+    host: ${REDIS_HOST:redis}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PASSWORD:}
+    database: ${REDIS_DB:0}
+  datasource:
+    druid:
+      master:
+        url: jdbc:mysql://${MYSQL_HOST:mysql}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:autosolution_db}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
+        username: ${MYSQL_USER:root}
+        password: ${MYSQL_PASSWORD:root}
+
+server:
+  port: ${SERVER_PORT:8080}
+
+solution:
+  profile: ${SOLUTION_UPLOAD_PATH:/app/uploadPath}