version1.build mysql

尘绝 · 尘绝 · commit 0a98468377c8 · 2024-11-22T19:00:14.000+08:00
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -143,6 +143,25 @@ services:
     #           count: all  # 或者您想要的数量，例如 1
     #           capabilities: [gpu]
 
+
+  mysql:
+    image: mysql:8.0.23
+    container_name: mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: 'root'
+      MYSQL_DATABASE: 'muagent'
+      MYSQL_USER: 'muagent'
+      MYSQL_PASSWORD: 'muagent'
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./examples/mysql/db:/var/lib/mysql
+      - ./examples/mysql/mysql.cnf:/etc/mysql/conf.d/mysql.cnf
+      - ./examples/mysql/init:/docker-entrypoint-initdb.d
+    restart: on-failure
+    networks:
+      - ekg-net
+
   runtime:
     build:
       context: ./runtime
@@ -158,6 +177,8 @@ services:
       - ekg-net
     volumes:
       - ./runtime:/home/user/runtime
+    depends_on:
+      - mysql
     command: ["bash", "-c", "cd /home/user/runtime && mvn package && java -jar /home/user/runtime/bootstrap/muagent-runtime.jar"]
 
   ekgservice:
diff --git a/examples/mysql/init/init.sql b/examples/mysql/init/init.sql
diff --git a/examples/mysql/mysql.cnf b/examples/mysql/mysql.cnf
@@ -0,0 +1,9 @@
+[mysqld]
+character-set-server=utf8mb4
+collation-server=utf8mb4_unicode_ci
+   
+[client]
+default-character-set=utf8mb4
+   
+[mysql]
+default-character-set=utf8mb4
diff --git a/runtime/bootstrap/src/main/java/com/alipay/muagent/bootstrap/BootstrapApplication.java b/runtime/bootstrap/src/main/java/com/alipay/muagent/bootstrap/BootstrapApplication.java
@@ -1,6 +1,7 @@
 package com.alipay.muagent.bootstrap;
 
 import com.alipay.muagent.util.LoggerUtil;
+import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -10,6 +11,7 @@
 
 @SpringBootApplication
 @ComponentScan(basePackages = {"com.alipay.muagent"})
+@MapperScan("com.alipay.muagent.service.mybatisplus.mapper")
 public class BootstrapApplication {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(BootstrapApplication.class);
diff --git a/runtime/bootstrap/src/main/resources/config/application.properties b/runtime/bootstrap/src/main/resources/config/application.properties
@@ -2,3 +2,11 @@ spring.application.name=runtime
 
 logging.path=./logs
 
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.url=jdbc:mysql://mysql:3306/muagent?allowPublicKeyRetrieval=true&characterEncoding=utf-8&&useSSL=false&serverTimezone=UTC
+spring.datasource.username=root
+spring.datasource.password=root
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+mybatis-plus.mapper-locations=classpath:mapper/*.xml
+mybatis-plus.type-aliases-package=com.alipay.muagent.model
diff --git a/runtime/bootstrap/src/main/resources/tools/system.select_tool.json b/runtime/bootstrap/src/main/resources/tools/system.select_tool.json
@@ -1,5 +1,5 @@
 {
-  "id": 2,
+  "id": "system.select_tool",
   "gmtCreate": "2024-07-17T07:20:35.000+00:00",
   "gmtModified": "2024-07-17T07:20:35.000+00:00",
   "toolKey": "system.select_tool",
diff --git a/runtime/bootstrap/src/main/resources/tools/undercover.dispatch_keyword.json b/runtime/bootstrap/src/main/resources/tools/undercover.dispatch_keyword.json
@@ -1,5 +1,5 @@
 {
-  "id": 2,
+  "id": "undercover.dispatch_keyword",
   "gmtCreate": "2024-07-17T07:20:35.000+00:00",
   "gmtModified": "2024-07-17T07:20:35.000+00:00",
   "toolKey": "undercover.dispatch_keyword",
diff --git a/runtime/bootstrap/src/main/resources/tools/undercover.dispatch_position.json b/runtime/bootstrap/src/main/resources/tools/undercover.dispatch_position.json
@@ -1,5 +1,5 @@
 {
-  "id": 2,
+  "id": "undercover.dispatch_position",
   "gmtCreate": "2024-07-17T07:20:35.000+00:00",
   "gmtModified": "2024-07-17T07:20:35.000+00:00",
   "toolKey": "undercover.dispatch_position",
diff --git a/runtime/bootstrap/src/main/resources/tools/undercover.judge.json b/runtime/bootstrap/src/main/resources/tools/undercover.judge.json
@@ -1,5 +1,5 @@
 {
-  "id": 2,
+  "id": "undercover.judge",
   "gmtCreate": "2024-07-17T07:20:35.000+00:00",
   "gmtModified": "2024-07-17T07:20:35.000+00:00",
   "toolKey": "undercover.judge",
diff --git a/runtime/model/pom.xml b/runtime/model/pom.xml
@@ -33,6 +33,13 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+
+        <!-- MyBatis Plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/runtime/model/src/main/java/com/alipay/muagent/model/tool/meta/Tool.java b/runtime/model/src/main/java/com/alipay/muagent/model/tool/meta/Tool.java
@@ -16,7 +16,7 @@
 @Data
 public class Tool {
 
-    private Long id;
+    private String id;
 
     /**
      * 创建时间
diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -79,7 +79,29 @@
 				<artifactId>disruptor</artifactId>
 				<version>3.4.4</version>
 			</dependency>
-
+			<!-- MyBatis Plus -->
+			<dependency>
+				<groupId>com.baomidou</groupId>
+				<artifactId>mybatis-plus-boot-starter</artifactId>
+				<version>3.5.5</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.mybatis</groupId>
+						<artifactId>mybatis-spring</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.mybatis</groupId>
+				<artifactId>mybatis-spring</artifactId>
+				<version>3.0.3</version>
+			</dependency>
+			<!-- MySQL Connector -->
+			<dependency>
+				<groupId>mysql</groupId>
+				<artifactId>mysql-connector-java</artifactId>
+				<version>8.0.23</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/runtime/service/pom.xml b/runtime/service/pom.xml
@@ -43,6 +43,22 @@
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
         </dependency>
+
+        <!-- MyBatis Plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <!-- MySQL Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/dto/Converter.java b/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/dto/Converter.java
@@ -0,0 +1,41 @@
+package com.alipay.muagent.service.mybatisplus.dto;
+
+import java.util.function.Function;
+
+public class Converter<T, U> {
+
+    private final Function<T, U> fromDto;
+    private final Function<U, T> fromEntity;
+
+    /**
+     * @param fromDto entity function
+     * @param fromEntity domain function
+     */
+    public Converter(final Function<T, U> fromDto, final Function<U, T> fromEntity) {
+        this.fromDto = fromDto;
+        this.fromEntity = fromEntity;
+    }
+
+    /**
+     * @param dto DTO entity
+     * @return T -> U
+     */
+    public final U convertFromDto(final T dto) {
+        if (dto == null) {
+           throw new RuntimeException("dto is null");
+        }
+        return fromDto.apply(dto);
+    }
+
+    /**
+     * @param entity domain entity
+     * @return U -> T
+     */
+    public final T convertFromEntity(final U entity) {
+        if (entity == null) {
+            throw new RuntimeException("entity is null");
+        }
+        return fromEntity.apply(entity);
+    }
+
+}
diff --git a/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/dto/ToolConverter.java b/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/dto/ToolConverter.java
@@ -0,0 +1,66 @@
+/**
+ * Alipay.com Inc.
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package com.alipay.muagent.service.mybatisplus.dto;
+
+import com.alipay.muagent.model.tool.meta.Tool;
+import com.alipay.muagent.util.GsonUtils;
+
+/**
+ * @author chenjue.wwp
+ * @version $Id: ToolConverter.java, v 0.1 2024-11-22 14:43  Exp $$
+ */
+public class ToolConverter extends Converter<ToolDO, Tool> {
+
+    /**
+     * Constructor.
+     */
+    public ToolConverter() {
+        super(toolDO -> {
+            ToolJson toolJson = GsonUtils.fromString(ToolJson.class, toolDO.getToolJson());
+            Tool tool = new Tool();
+            tool.setId(toolDO.getId());
+            tool.setGmtCreate(toolDO.getGmtCreate());
+            tool.setGmtModified(toolDO.getGmtModified());
+            tool.setToolKey(toolDO.getToolKey());
+            tool.setDescription(toolDO.getDescription());
+            tool.setToolName(toolDO.getToolName());
+            tool.setOperatorCreate(toolDO.getOperatorCreate());
+            tool.setGmtModified(toolDO.getGmtModified());
+            tool.setVersion(toolDO.getVersion());
+            tool.setOwner(toolDO.getOwner());
+            if (toolJson != null) {
+                tool.setToolDefinition(toolJson.getToolDefinition());
+                tool.setRequestGroovy(toolJson.getRequestGroovy());
+                tool.setResponseGroovy(toolJson.getResponseGroovy());
+                tool.setManifestSchema(toolJson.getManifestSchema());
+                tool.setToolProtocol(toolJson.getToolProtocol());
+                tool.setApiSchema(toolJson.getApiSchema());
+            }
+            return tool;
+        }, tool -> {
+            ToolDO toolDO = new ToolDO();
+            toolDO.setId(tool.getId());
+            toolDO.setGmtCreate(tool.getGmtCreate());
+            toolDO.setGmtModified(tool.getGmtModified());
+            toolDO.setToolKey(tool.getToolKey());
+            toolDO.setDescription(tool.getDescription());
+            toolDO.setToolName(tool.getToolName());
+            toolDO.setToolName(tool.getToolName());
+            toolDO.setOperatorCreate(tool.getOperatorCreate());
+            toolDO.setGmtModified(tool.getGmtModified());
+            toolDO.setVersion(tool.getVersion());
+            toolDO.setOwner(tool.getOwner());
+            ToolJson toolJson = new ToolJson();
+            toolJson.setToolDefinition(tool.getToolDefinition());
+            toolJson.setRequestGroovy(tool.getRequestGroovy());
+            toolJson.setResponseGroovy(tool.getResponseGroovy());
+            toolJson.setManifestSchema(tool.getManifestSchema());
+            toolJson.setToolProtocol(tool.getToolProtocol());
+            toolJson.setApiSchema(tool.getApiSchema());
+            toolDO.setToolJson(GsonUtils.toString(toolJson));
+            return toolDO;
+        });
+    }
+}
diff --git a/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/dto/ToolDO.java b/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/dto/ToolDO.java
@@ -0,0 +1,69 @@
+/**
+ * Alipay.com Inc.
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package com.alipay.muagent.service.mybatisplus.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * @author chenjue.wwp
+ * @version $Id: ToolDO.java, v 0.1 2024-11-22 14:35  Exp $$
+ */
+@Data
+@TableName(value = "tool")
+public class ToolDO {
+    private String id;
+
+    /**
+     * 创建时间
+     */
+    private Date   gmtCreate;
+
+    /**
+     * 修改时间
+     */
+    private Date   gmtModified;
+
+    /**
+     * tool类型标识，用于区分不同类型的task
+     */
+    private String toolKey;
+
+    /**
+     * tool的描述
+     */
+    private String description;
+
+    /**
+     * tool的名称
+     */
+    private String toolName;
+
+    /**
+     * 创建人
+     */
+    private String operatorCreate;
+
+    /**
+     * 修改人
+     */
+    private String operatorModified;
+
+    /**
+     * Tool的版本
+     */
+    private String version;
+
+    /**
+     * Tool的owner
+     */
+    private String owner;
+
+    /**
+     * JSON格式存放
+     */
+    private String toolJson;
+}
diff --git a/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/dto/ToolJson.java b/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/dto/ToolJson.java
diff --git a/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/mapper/TooDOlMapper.java b/runtime/service/src/main/java/com/alipay/muagent/service/mybatisplus/mapper/TooDOlMapper.java
diff --git a/runtime/service/src/main/java/com/alipay/muagent/service/tool/loader/ToolLoader.java b/runtime/service/src/main/java/com/alipay/muagent/service/tool/loader/ToolLoader.java
diff --git a/runtime/service/src/main/java/com/alipay/muagent/service/tool/loader/impl/LocalToolLoader.java b/runtime/service/src/main/java/com/alipay/muagent/service/tool/loader/impl/LocalToolLoader.java
diff --git a/runtime/web/src/main/java/com/alipay/muagent/web/ToolController.java b/runtime/web/src/main/java/com/alipay/muagent/web/ToolController.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "id": 2,`
	`2`	`+ "id": "system.select_tool",`
`3`	`3`	`"gmtCreate": "2024-07-17T07:20:35.000+00:00",`
`4`	`4`	`"gmtModified": "2024-07-17T07:20:35.000+00:00",`
`5`	`5`	`"toolKey": "system.select_tool",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "id": 2,`
	`2`	`+ "id": "undercover.dispatch_keyword",`
`3`	`3`	`"gmtCreate": "2024-07-17T07:20:35.000+00:00",`
`4`	`4`	`"gmtModified": "2024-07-17T07:20:35.000+00:00",`
`5`	`5`	`"toolKey": "undercover.dispatch_keyword",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "id": 2,`
	`2`	`+ "id": "undercover.dispatch_position",`
`3`	`3`	`"gmtCreate": "2024-07-17T07:20:35.000+00:00",`
`4`	`4`	`"gmtModified": "2024-07-17T07:20:35.000+00:00",`
`5`	`5`	`"toolKey": "undercover.dispatch_position",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "id": 2,`
	`2`	`+ "id": "undercover.judge",`
`3`	`3`	`"gmtCreate": "2024-07-17T07:20:35.000+00:00",`
`4`	`4`	`"gmtModified": "2024-07-17T07:20:35.000+00:00",`
`5`	`5`	`"toolKey": "undercover.judge",`