optional = n.getAnnotationByName("RestController");
+ if (optional.isPresent()) {
+ type = "controller";
+ }
+
+ optional = n.getAnnotationByName("Table");
+ if (optional.isPresent()) {
+ type = "entity";
+ }
+
+ return type;
+ }
+
+ //读取resource下某个文件的文本内容(class)
+ public String readResourceFileContent(String fileName) {
+ try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(fileName);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
+ return reader.lines().collect(Collectors.joining(System.lineSeparator()));
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
+}
diff --git a/jcommon/ai/neo4j/src/main/java/run/mone/neo4j/MoneMethodCodeParser.java b/jcommon/ai/neo4j/src/main/java/run/mone/neo4j/MoneMethodCodeParser.java
new file mode 100644
index 000000000..05833ffde
--- /dev/null
+++ b/jcommon/ai/neo4j/src/main/java/run/mone/neo4j/MoneMethodCodeParser.java
@@ -0,0 +1,299 @@
+package run.mone.neo4j;
+
+import com.github.javaparser.JavaParser;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.ImportDeclaration;
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
+import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.ast.body.MethodDeclaration;
+import com.github.javaparser.ast.comments.Comment;
+import com.github.javaparser.ast.comments.JavadocComment;
+import com.github.javaparser.ast.expr.FieldAccessExpr;
+import com.github.javaparser.ast.expr.MethodCallExpr;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.neo4j.driver.*;
+
+import java.io.File;
+import java.util.*;
+
+/**
+ * @author goodjava@qq.com
+ *
+ * 建立方法调用之间的关系(call),且只建立业务调用的关系
+ */
+@Slf4j
+public class MoneMethodCodeParser {
+
+ private String NEO4J_URI = "bolt://localhost:7687";
+
+ private String NEO4J_USER = "neo4j";
+
+ private String password = "";
+
+ public MoneMethodCodeParser setPassword(String password) {
+ this.password = password;
+ return this;
+ }
+
+
+ public void writeJavaFilesToNeo4j(String directoryPath) {
+ if (new File(directoryPath).isFile()) {
+ writeToNeo4j(directoryPath);
+ return;
+ }
+
+ getJavaFilesInDirectory(directoryPath).forEach(it -> {
+ log.info("parse it:{}", it);
+ writeToNeo4j(it);
+ });
+ }
+
+ //给一个文件夹,获取里边是.java文件的列表,注意你需要递归获取(class)
+ public static List getJavaFilesInDirectory(String directoryPath) {
+ List javaFiles = new ArrayList<>();
+ File directory = new File(directoryPath);
+
+ if (directory.exists() && directory.isDirectory()) {
+ File[] files = directory.listFiles();
+ if (files != null) {
+ for (File file : files) {
+ if (file.isDirectory()) {
+ javaFiles.addAll(getJavaFilesInDirectory(file.getAbsolutePath()));
+ } else if (file.getName().endsWith(".java")) {
+ javaFiles.add(file.getAbsolutePath());
+ }
+ }
+ }
+ }
+ return javaFiles;
+ }
+
+
+ @SneakyThrows
+ private void writeToNeo4j(String filePath) {
+ //写入到neo4j中
+ // 替换成你的 Java 文件路径
+ String projectName = "MyProject";
+
+ try (Driver driver = GraphDatabase.driver(NEO4J_URI, AuthTokens.basic(NEO4J_USER, password));
+ Session session = driver.session()) {
+ // 解析 Java 文件
+ CompilationUnit cu = new JavaParser().parse(new File(filePath)).getResult().get();
+
+ // 遍历类、接口、方法等
+ cu.accept(new MoneMethodCodeParser.Visitor(session, projectName, filePath), null);
+ }
+ }
+
+
+ private static class Visitor extends com.github.javaparser.ast.visitor.VoidVisitorAdapter {
+
+ private final Session session;
+
+ public Visitor(Session session, String projectName, String filePath) {
+ this.session = session;
+ }
+
+
+ @Override
+ public void visit(ClassOrInterfaceDeclaration n, Void arg) {
+ super.visit(n, arg);
+ }
+
+
+ private String getFullMethodName(MethodDeclaration method) {
+ String packageName = method.findCompilationUnit()
+ .flatMap(cu -> cu.getPackageDeclaration())
+ .map(pd -> pd.getNameAsString())
+ .orElse("");
+ String className = method.findAncestor(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration.class)
+ .map(c -> c.getNameAsString())
+ .orElse("");
+ String methodName = method.getNameAsString();
+ return packageName + "." + className + "." + methodName;
+ }
+
+ /**
+ * 获取方法调用的完整路径，包括包名、类名和方法名
+ *
+ * @param methodCall 方法调用表达式
+ * @return 方法调用的完整路径
+ */
+ public String getFullMethodPath(MethodCallExpr methodCall) {
+ StringBuilder fullPath = new StringBuilder();
+
+ // 获取包名
+ Optional cu = methodCall.findCompilationUnit();
+ if (cu.isPresent()) {
+ cu.get().getPackageDeclaration().ifPresent(pkg ->
+ fullPath.append(pkg.getNameAsString()).append(".")
+ );
+ }
+
+ // 获取类名
+ String className = methodCall.findAncestor(ClassOrInterfaceDeclaration.class)
+ .map(ClassOrInterfaceDeclaration::getNameAsString)
+ .orElse("");
+
+ // 获取方法调用的对象
+ String objectName = methodCall.getScope()
+ .map(scope -> scope.toString())
+ .orElse("");
+
+
+ //静态调用
+ if (methodCall.getScope().isPresent() && methodCall.getScope().get() instanceof FieldAccessExpr) {
+ return objectName + "." + methodCall.getNameAsString();
+ }
+
+ //lombok 的log
+ if (isLogCall(methodCall)) {
+ return objectName + "." + methodCall.getNameAsString();
+ }
+
+ // 如果对象名不为空，尝试找到它的类型
+ if (!objectName.isEmpty()) {
+ Optional field = methodCall.findAncestor(ClassOrInterfaceDeclaration.class)
+ .flatMap(classDecl -> classDecl.getFieldByName(objectName));
+
+ if (field.isPresent()) {
+ ClassOrInterfaceType type = field.get().getVariable(0).getType().asClassOrInterfaceType();
+ String v = resolveTypePath(type);
+ return v + "." + methodCall.getNameAsString();
+ }
+ }
+
+
+ // 构建完整路径
+ fullPath.append(className).append(".");
+ fullPath.append(methodCall.getNameAsString());
+
+ return fullPath.toString();
+ }
+
+ public static String resolveTypePath(ClassOrInterfaceType type) {
+ String typeName = type.getNameAsString();
+
+ Optional cu = type.findAncestor(CompilationUnit.class);
+ if (cu.isPresent()) {
+ // 尝试从导入声明中查找匹配
+ Optional importedPath = findMatchingImport(cu.get(), typeName);
+ if (importedPath.isPresent()) {
+ return importedPath.get();
+ }
+
+ // 如果没有找到匹配的导入，检查是否在同一包中
+ Optional currentPackage = getCurrentPackage(cu.get());
+ if (currentPackage.isPresent()) {
+ return currentPackage.get() + "." + typeName;
+ }
+ }
+
+ // 如果无法解析，返回原始类型名称
+ return typeName;
+ }
+
+ private static Optional findMatchingImport(CompilationUnit cu, String typeName) {
+ return cu.getImports().stream()
+ .filter(importDecl -> !importDecl.isAsterisk() && importDecl.getNameAsString().endsWith("." + typeName))
+ .map(ImportDeclaration::getNameAsString)
+ .findFirst();
+ }
+
+ private static Optional getCurrentPackage(CompilationUnit cu) {
+ return cu.getPackageDeclaration().map(pd -> pd.getNameAsString());
+ }
+
+ /**
+ * 判断方法调用是否为日志调用
+ *
+ * @param n 方法调用表达式
+ * @return 如果方法调用是日志调用则返回true，否则返回false
+ */
+ private boolean isLogCall(MethodCallExpr n) {
+ if (!n.getScope().isPresent()) {
+ return false;
+ }
+ String scope = n.getScope().get().toString();
+ String method = n.getNameAsString();
+ return scope.equals("log") &&
+ (method.equals("trace") || method.equals("debug") || method.equals("info") ||
+ method.equals("warn") || method.equals("error"));
+ }
+
+
+ @Override
+ public void visit(MethodDeclaration n, Void arg) {
+ super.visit(n, arg);
+ if (n.findAncestor(ClassOrInterfaceDeclaration.class).isEmpty()) {
+ return;
+ }
+ // 处理方法调用
+ processMethodCalls(n);
+
+ }
+
+
+ // 处理方法调用
+ private void processMethodCalls(MethodDeclaration n) {
+ n.findAll(MethodCallExpr.class).forEach(methodCall -> {
+ Map callParams = new HashMap<>();
+ callParams.put("callerName", getFullMethodName(n));
+ callParams.put("calleeName", getFullMethodPath(methodCall));
+
+ // 检查 callerName 和 calleeName 是否都存在
+ Result result = session.run("MATCH (caller:Method {name: $callerName}), (callee:Method {name: $calleeName}) " +
+ "RETURN caller, callee", callParams);
+
+ //只有两个业务method,才有必要创建这个边
+ if (result.hasNext()) {
+ // 创建 CALLS 关系
+ session.run("MATCH (caller:Method {name: $callerName}) " +
+ "MATCH (callee:Method {name: $calleeName}) " +
+ "MERGE (caller)-[:CALLS]->(callee)",
+ callParams);
+ }
+ });
+ }
+
+
+ // 处理注释
+ private void processComments(MethodDeclaration n) {
+ for (Comment comment : n.getAllContainedComments()) {
+ createCommentNode(comment, n);
+ }
+
+ Optional optional = n.getJavadocComment();
+ if (optional.isPresent()) {
+ createCommentNode(optional.get(), n);
+ }
+
+ Optional commentOptional = n.getComment();
+ if (commentOptional.isPresent()) {
+ createCommentNode(commentOptional.get(), n);
+ }
+ }
+
+ private void createCommentNode(Comment comment, MethodDeclaration n) {
+ Map commentParams = new HashMap<>();
+ commentParams.put("text", comment.getContent());
+ commentParams.put("text_vector", new float[]{}); // 替换为实际的文本向量
+
+ session.run("MERGE (comment:Comment {text: $text, text_vector: $text_vector})", commentParams);
+
+ // 创建 DOCUMENTS 关系 (Comment -[:DOCUMENTS]-> Method)
+ Map documentsParams = new HashMap<>();
+ documentsParams.put("commentText", comment.getContent());
+ documentsParams.put("methodName", getFullMethodName(n));
+ documentsParams.put("methodSignature", n.getSignature().asString());
+ session.run("MATCH (comment:Comment {text: $commentText}) " +
+ "MATCH (m:Method {name: $methodName, signature: $methodSignature}) " +
+ "MERGE (comment)-[:DOCUMENTS]->(m)",
+ documentsParams);
+ }
+
+ }
+
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/MoneCodeParserTest.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/MoneCodeParserTest.java
new file mode 100644
index 000000000..d2b6f63c2
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/MoneCodeParserTest.java
@@ -0,0 +1,96 @@
+package run.mone.neo4j.test;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.Gson;
+import org.junit.Test;
+import run.mone.neo4j.BotCall;
+import run.mone.neo4j.MoneCodeParser;
+import run.mone.neo4j.MoneMethodCodeParser;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/16 09:42
+ */
+public class MoneCodeParserTest {
+
+
+
+ @Test
+ public void testWriteCatServiceToNeo4j() {
+// new MoneCodeParser().writeJavaFilesToNeo4j("/Users/zhangzhiyong/IdeaProjects/ai/m78/m78-service/src/main/java/run/mone/m78/service");
+// MoneCodeParser.writeJavaFilesToNeo4j("/Users/zhangzhiyong/IdeaProjects/ai/m78/m78-service/src/main/java/run/mone/m78/service/database");
+// MoneCodeParser.writeJavaFilesToNeo4j("/Users/zhangzhiyong/IdeaProjects/ai/m78/m78-service/src/main/java/run/mone/m78/service/database/SqlParseUtil.java");
+// new MoneCodeParser().writeJavaFilesToNeo4j("/Users/zhangzhiyong/IdeaProjects/goodjava/mone/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/A.java");
+ new MoneCodeParser().setPassword(System.getenv("password")).writeJavaFilesToNeo4j("/Users/zhangzhiyong/IdeaProjects/goodjava/mone/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m");
+// new MoneCodeParser().setPassword(System.getenv("password")).writeJavaFilesToNeo4j("/Users/zhangzhiyong/IdeaProjects/goodjava/mone/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/CatService.java");
+// new MoneCodeParser().setPassword(System.getenv("password")).writeJavaFilesToNeo4j("/Users/zhangzhiyong/IdeaProjects/goodjava/mone/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/PersonService.java");
+ }
+
+
+ @Test
+ public void testParserMethod() {
+ new MoneMethodCodeParser().setPassword(System.getenv("password")).writeJavaFilesToNeo4j("/Users/zhangzhiyong/IdeaProjects/goodjava/mone/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m");
+ }
+
+ @Test
+ public void test1() {
+ new MoneCodeParser().queryEntityClasses();
+ }
+
+
+
+
+ @Test
+ public void testFindClassesWithAnnotation() {
+ MoneCodeParser moneCodeParser = new MoneCodeParser().setPassword(System.getenv("password"));
+ List> actual = moneCodeParser.findClassesWithAnnotation(moneCodeParser.getSession(), "Table");
+ System.out.println(actual);
+
+// String xuqiu = "获取狗的主人";
+ String xuqiu = "管理宠物鸟";
+ String res = BotCall.call(moneCodeParser.readResourceFileContent("entity.md") + xuqiu, new Gson().toJson(actual));
+ System.out.println(res);
+ }
+
+
+
+ @Test
+ public void testFindClassesWithAnnotation2() {
+ MoneCodeParser moneCodeParser = new MoneCodeParser().setPassword(System.getenv("password"));
+ List> actual = moneCodeParser.findClassesWithAnnotation(moneCodeParser.getSession(), "RestController");
+ System.out.println(actual);
+
+ String xuqiu = "获取狗的主人";
+// String xuqiu = "管理宠物鸟";
+ String res = BotCall.call(moneCodeParser.readResourceFileContent("service.md") + xuqiu, new Gson().toJson(actual));
+ System.out.println(res);
+ }
+
+
+ @Test
+ public void testJson() {
+ Map m = ImmutableMap.of("input", "a+b=?");
+ System.out.println(new Gson().toJson(m));
+ }
+
+
+ @Test
+ public void testReadResourceFileContent() {
+ String fileName = "entity.md";
+ // Assuming the test resource file is already placed in the resources directory
+ String actualContent = new MoneCodeParser().readResourceFileContent(fileName);
+
+ assertNotNull(actualContent);
+ }
+
+
+
+
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Resource.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Resource.java
new file mode 100644
index 000000000..2366ed8d8
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Resource.java
@@ -0,0 +1,8 @@
+package run.mone.neo4j.test.anno;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/19 18:20
+ */
+public @interface Resource {
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/RestController.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/RestController.java
new file mode 100644
index 000000000..770f21261
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/RestController.java
@@ -0,0 +1,8 @@
+package run.mone.neo4j.test.anno;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/19 16:51
+ */
+public @interface RestController {
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Service.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Service.java
new file mode 100644
index 000000000..b76563edf
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Service.java
@@ -0,0 +1,8 @@
+package run.mone.neo4j.test.anno;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/21 16:06
+ */
+public @interface Service {
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Table.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Table.java
new file mode 100644
index 000000000..e009de88d
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Table.java
@@ -0,0 +1,8 @@
+package run.mone.neo4j.test.anno;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/19 16:50
+ */
+public @interface Table {
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Test.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Test.java
new file mode 100644
index 000000000..a28757ccb
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/anno/Test.java
@@ -0,0 +1,8 @@
+package run.mone.neo4j.test.anno;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/21 16:06
+ */
+public @interface Test {
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Cat.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Cat.java
new file mode 100644
index 000000000..5e3c87714
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Cat.java
@@ -0,0 +1,21 @@
+package run.mone.neo4j.test.m;
+
+import run.mone.neo4j.test.anno.Table;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/19 17:03
+ */
+@Table
+public class Cat {
+
+ private int id;
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Dog.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Dog.java
new file mode 100644
index 000000000..4b5dc12c3
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Dog.java
@@ -0,0 +1,14 @@
+package run.mone.neo4j.test.m;
+
+import run.mone.neo4j.test.anno.Table;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/19 17:03
+ */
+@Table
+public class Dog {
+
+ private int id;
+
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Person.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Person.java
new file mode 100644
index 000000000..1c67046be
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/Person.java
@@ -0,0 +1,11 @@
+package run.mone.neo4j.test.m;
+
+import run.mone.neo4j.test.anno.Table;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/19 16:51
+ */
+@Table
+public class Person {
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/PersonService.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/PersonService.java
new file mode 100644
index 000000000..3201894ad
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/PersonService.java
@@ -0,0 +1,53 @@
+package run.mone.neo4j.test.m;
+
+import lombok.extern.slf4j.Slf4j;
+import run.mone.neo4j.test.anno.Resource;
+import run.mone.neo4j.test.anno.Service;
+import run.mone.neo4j.test.m.cat.CatService;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/16 10:16
+ */
+@Service
+@Slf4j
+public class PersonService {
+
+
+ @Resource
+ private CatService catService;
+
+
+ //获取猫的数量
+ public int getCatCount() {
+ log.info("info");
+ System.out.println("abc");
+ return catService.getCatCount();
+ }
+
+
+ /**
+ * 计算两数之和
+ *
+ * @param a 第一个整数
+ * @param b 第二个整数
+ * @return 两数之和
+ */
+ //计算两数和
+ public static int sum(int a, int b) {
+ return (a + b);
+ }
+
+ /**
+ * 计算两个数的差值
+ *
+ * @param num1 第一个数
+ * @param num2 第二个数
+ * @return 两数之差
+ */
+ //计算两个数的差值
+ public static int subtract(int num1, int num2) {
+ return num1 - num2;
+ }
+
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/PersonServiceTest.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/PersonServiceTest.java
new file mode 100644
index 000000000..a1ebd24a3
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/PersonServiceTest.java
@@ -0,0 +1,22 @@
+package run.mone.neo4j.test.m;
+
+import run.mone.neo4j.test.anno.Resource;
+import run.mone.neo4j.test.anno.Service;
+import run.mone.neo4j.test.anno.Test;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/26 18:23
+ */
+@Service
+public class PersonServiceTest {
+
+ @Resource
+ private PersonService personService;
+
+ @Test
+ public void test1() {
+ int res = personService.getCatCount();
+ System.out.println(res);
+ }
+}
diff --git a/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/cat/CatService.java b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/cat/CatService.java
new file mode 100644
index 000000000..492be9300
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/java/run/mone/neo4j/test/m/cat/CatService.java
@@ -0,0 +1,27 @@
+package run.mone.neo4j.test.m.cat;
+
+import lombok.extern.slf4j.Slf4j;
+import run.mone.neo4j.test.anno.Service;
+
+import java.util.HashMap;
+
+/**
+ * @author goodjava@qq.com
+ * @date 2024/8/19 18:21
+ */
+@Service
+@Slf4j
+public class CatService {
+
+ private HashMap data = new HashMap<>();
+
+
+ //获取小猫的数量
+ public int getCatCount() {
+ log.info("abc");
+ System.out.println("123");
+ return data.size();
+ }
+
+
+}
diff --git a/jcommon/ai/neo4j/src/test/resources/entity.md b/jcommon/ai/neo4j/src/test/resources/entity.md
new file mode 100644
index 000000000..0b8529b60
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/resources/entity.md
@@ -0,0 +1,15 @@
+我有这些表映射类,你帮我分析.我给你一个新功能,你看看能不能满足.
+不满足的原因:
+1.缺少相应的字段
+2.就没有这个类
+
+如果不满足,你需要按如下规定返回:
+1.缺少字段 satisfies:false reason:missing_fields code:返回缺少字段的代码 (example: private String name;)
+2.缺少某个类 satisfies:false reason:missing_class code:返回缺少的类的代码
+
+一些规则:
+1.缺少字段的时候,尽量不要添加类字段,尽量引用那个类的id即可.
+2.如果缺少类,你要帮我尽量补全这个类中缺少的字段.
+3.生成的字段或者类尽量添加合适的中文注释
+
+需求:
\ No newline at end of file
diff --git a/jcommon/ai/neo4j/src/test/resources/service.md b/jcommon/ai/neo4j/src/test/resources/service.md
new file mode 100644
index 000000000..0670fbd6e
--- /dev/null
+++ b/jcommon/ai/neo4j/src/test/resources/service.md
@@ -0,0 +1,16 @@
+我有这些表映射类和service类的信息,然后我给你一个新功能,你分析下看看能不能满足.
+
+不满足的原因:
+1.缺少相应的方法
+2.缺少某个service类
+
+如果不满足,你需要按如下规定返回:
+1.缺少字段 satisfies:false reason:missing_methods code:返回缺少方法的代码 (example: private String name;)
+2.缺少某个service类 satisfies:false reason:missing_class code:返回缺少的类的代码
+
+一些规则:
+1.缺少method的时候,生成的方法只需要给方法定义即可.
+2.如果缺少类,你要帮我生成这个类,类中的方法也只需要生成接口定义.
+3.生成的方法或者类尽量添加合适的中文注释
+
+需求:
\ No newline at end of file
diff --git a/jcommon/ai/pom.xml b/jcommon/ai/pom.xml
index 41a73b29f..748017515 100644
--- a/jcommon/ai/pom.xml
+++ b/jcommon/ai/pom.xml
@@ -18,6 +18,7 @@
aws
minimax
bytedance
+ gpt
diff --git a/jcommon/codegen/pom.xml b/jcommon/codegen/pom.xml
index cfc3d4421..01f03b86c 100644
--- a/jcommon/codegen/pom.xml
+++ b/jcommon/codegen/pom.xml
@@ -2,77 +2,87 @@
- 4.0.0
-
- run.mone
- jcommon
+ 4.0.0
+
+ run.mone
+ jcommon
+ 1.6.0-jdk21-SNAPSHOT
+
+ codegen
1.6.0-jdk21-SNAPSHOT
-
- codegen
- 1.6.0-jdk21-SNAPSHOT
-
-
- commons-io
- commons-io
- 2.6
- compile
-
-
- run.mone
- codegen-temlates
- 1.0-SNAPSHOT
- compile
-
-
- com.ibeetl
- beetl
- 2.7.14
-
-
- com.mybatis-flex
- mybatis-flex-codegen
- 1.7.8
-
-
- org.springframework
- spring-jdbc
- 5.3.29
- true
-
-
- com.zaxxer
- HikariCP
- 4.0.3
- true
-
-
- org.apache.commons
- commons-lang3
- 3.8.1
- compile
-
-
- run.mone
- infra-result
- 1.6.0-jdk21-SNAPSHOT
-
-
- thrift
- org.apache.thrift
-
-
-
-
- org.mybatis.generator
- mybatis-generator-core
- 1.4.0
-
-
- mysql
- mysql-connector-java
- 8.0.26
-
+
+
+ commons-io
+ commons-io
+ 2.6
+ compile
+
+
+ run.mone
+ codegen-temlates
+ 1.0-SNAPSHOT
+ compile
+
+
+ com.ibeetl
+ beetl
+ 3.15.4.RELEASE
+ true
+
+
+ com.mybatis-flex
+ mybatis-flex-codegen
+ 1.7.8
+
+
+ org.springframework
+ spring-jdbc
+ 5.3.29
+ true
+
+
+ com.zaxxer
+ HikariCP
+ 4.0.3
+ true
+
+
+ org.apache.commons
+ commons-lang3
+ 3.8.1
+ compile
+
+
+ run.mone
+ infra-result
+ 1.6.0-jdk21-SNAPSHOT
+
+
+ thrift
+ org.apache.thrift
+
+
+
+
+ org.mybatis.generator
+ mybatis-generator-core
+ 1.4.0
+
+
+ mysql
+ mysql-connector-java
+ 8.0.26
+
-
-
+
+ org.mockito
+ mockito-core
+ 3.9.0
+
+
+ org.mockito
+ mockito-inline
+ 3.9.0
+
+
diff --git a/jcommon/codegen/src/main/java/com/xiaomi/youpin/codegen/M78DoceanMongoGen.java b/jcommon/codegen/src/main/java/com/xiaomi/youpin/codegen/M78DoceanMongoGen.java
new file mode 100644
index 000000000..11b9efc27
--- /dev/null
+++ b/jcommon/codegen/src/main/java/com/xiaomi/youpin/codegen/M78DoceanMongoGen.java
@@ -0,0 +1,95 @@
+package com.xiaomi.youpin.codegen;
+
+import com.xiaomi.youpin.codegen.bo.Dependency;
+import com.xiaomi.youpin.codegen.common.FileUtils;
+import com.xiaomi.youpin.codegen.generator.FileGenerator;
+import com.xiaomi.youpin.infra.rpc.Result;
+import com.xiaomi.youpin.infra.rpc.errors.GeneralCodes;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+public class M78DoceanMongoGen {
+ // private static final String DEFAULT_MODEL = "mi-function";
+ private final String tmpPath = "m78-docean-mongo";
+ // private static final String handlerDir = "handler";
+// private static final String srcPath = "/src/main/java/";
+// private static final String testPath = "/src/test/java/";
+
+ public Result generateAndZip(String projectPath, String projectName, String groupId, String packageName, String author, String versionId, HashMap> dep) {
+ String packagePath = packageName.replaceAll("\\.", "/");
+ String camelName = this.adapterProjectNameToCamelName(projectName);
+ Map m = new HashMap<>();
+ m.put("group", groupId);
+ m.put("artifactId", projectName);
+ m.put("version", versionId);
+ m.put("author", author);
+ m.put("camelName", camelName);
+ m.put("package", packageName);
+ try {
+// FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-common", "src", "test", "java"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-server", "src", "main", "java", packagePath, "bootstrap"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-server", "src", "test", "java"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-service", "src", "test", "java"));
+// FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-service", "src", "main", "resources"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-api", "src", "main", "java", packagePath, "api", "bo"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-api", "src", "main", "java", packagePath, "api", "vo"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-server", "src", "main", "java", packagePath, "controller"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-common", "src", "main", "java", packagePath, "common"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-server", "src", "main", "resources", "config"));
+ FileUtils.createDirectories(FileUtils.join(projectPath, projectName, projectName + "-service", "src", "main", "java", packagePath, "service"));
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-service", "src", "main", "java", packagePath, "service", "MongoService.java"), FileUtils.join(tmpPath, "mongoservice.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-api", "src", "main", "java", packagePath, "api", "bo", "MongoBo.java"), FileUtils.join(tmpPath, "mongobo.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-api", "src", "main", "java", packagePath, "api", "bo", "Page.java"), FileUtils.join(tmpPath, "page.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-service", "pom.xml"), FileUtils.join(tmpPath, "service-pom.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-service", "src", "main", "java", packagePath, "service", "ServiceImpl1.java"), FileUtils.join(tmpPath, "serviceimpl1.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-server", "src", "main", "resources", "config", "staging.properties"), FileUtils.join(tmpPath, "staging.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-server", "src", "main", "resources", "config.properties"), FileUtils.join(tmpPath, "config.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-server", "src", "main", "resources", "logback.xml"), FileUtils.join(tmpPath, "logback.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join("pom.xml"), FileUtils.join(tmpPath, "pom.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-common", "src", "main", "java", packagePath, "common", "Result.java"), FileUtils.join(tmpPath, "result.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-server", "src", "main", "java", packagePath, "bootstrap", "Bootstrap.java"), FileUtils.join(tmpPath, "bootstrap.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-server", "src", "main", "java", packagePath, "controller", "MongodbController.java"), FileUtils.join(tmpPath, "mongodbcontroller.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-server", "pom.xml"), FileUtils.join(tmpPath, "server-pom.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-server", "src", "main", "resources", "config", "dev.properties"), FileUtils.join(tmpPath, "dev.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-server", "src", "main", "resources", "config", "online.properties"), FileUtils.join(tmpPath, "online.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-api", "pom.xml"), FileUtils.join(tmpPath, "api-pom.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-api", "src", "main", "java", packagePath, "api", "IService.java"), FileUtils.join(tmpPath, "iservice.tml")).generator(m);
+ new FileGenerator(projectPath, projectName, FileUtils.join(projectName + "-common", "pom.xml"), FileUtils.join(tmpPath, "common-pom.tml")).generator(m);
+
+ new FileGenerator(projectPath, projectName, FileUtils.join(".gitignore"), "springboot_gitignore.tml").generator(m);
+ FileUtils.compress(projectPath + File.separator + projectName, projectPath + File.separator + projectName + ".zip");
+ } catch (Exception e) {
+ log.error("SpringBootProGen failed ", e);
+ return Result.fail(GeneralCodes.InternalError, "InternalError");
+ }
+
+ return Result.success(projectPath + File.separator + projectName + ".zip");
+ }
+
+ private String adapterProjectNameToCamelName(String name) {
+ if (StringUtils.isEmpty(name)) {
+ return "";
+ }
+ try {
+ String[] strings = name.split("-");
+ if (strings.length > 1) {
+ String res = "";
+ for (int i = 0; i < strings.length; i++) {
+ if (!StringUtils.isEmpty(strings[i])) {
+ res = res + StringUtils.capitalize(strings[i]);
+ }
+ }
+ return res;
+ }
+ } catch (Exception e) {
+ return StringUtils.capitalize(name);
+ }
+ return StringUtils.capitalize(name);
+ }
+}
diff --git a/jcommon/codegen/src/main/java/com/xiaomi/youpin/codegen/common/FileUtils.java b/jcommon/codegen/src/main/java/com/xiaomi/youpin/codegen/common/FileUtils.java
index 14f96af33..97f2cd8e1 100644
--- a/jcommon/codegen/src/main/java/com/xiaomi/youpin/codegen/common/FileUtils.java
+++ b/jcommon/codegen/src/main/java/com/xiaomi/youpin/codegen/common/FileUtils.java
@@ -39,6 +39,10 @@
*/
public class FileUtils {
+ public static String join(String... ps) {
+ return String.join(File.separator, ps);
+ }
+
public static void createDirectories(String path) {
try {
Files.createDirectories(Paths.get(path));
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/CodeGenerator.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/CodeGenerator.java
index 57483329f..dc2ddbb8b 100644
--- a/jcommon/codegen/src/main/java/run/mone/ai/codegen/CodeGenerator.java
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/CodeGenerator.java
@@ -24,7 +24,17 @@ public class CodeGenerator {
private static String serviceName = "s";
- private static String basePath = "/Users/wodiwudi/java/nr-car-account";
+ private static String testPackageName = "TP";
+
+ private static String testPath = "";
+
+ private static String mainClass = "";
+
+ private static String author = "";
+
+ private static String testType = "";
+
+ private static String basePath = "you base path";
private static boolean createPojo = false;
@@ -38,6 +48,8 @@ public class CodeGenerator {
private static boolean createController = false;
+ private static final String SPRING_BOOT_TEST_TYPE = "springboot";
+
/**
* 主方法
* 判断输入参数长度是否大于 0，调用方法处理参数并提取数据
@@ -53,6 +65,11 @@ public static void main(String[] args) {
className = map.get("pojoName");
testName = map.get("testName");
serviceName = map.get("serviceName");
+ testPackageName = map.get("testPackageName");
+ testPath = map.get("testPath");
+ mainClass = map.get("mainClass");
+ author = map.get("author");
+ testType = map.get("testType");
}
if (StringUtils.isEmpty(className)) {
return;
@@ -61,6 +78,11 @@ public static void main(String[] args) {
data.put("className", className);
data.put("author", "goodjava@qq.com");
data.put("serviceName", serviceName);
+ data.put("testPackageName", testPackageName);
+ data.put("testPath", testPath);
+ data.put("mainClass", mainClass);
+ data.put("testAuthor", author);
+ data.put("testType", testType);
Optional first = Arrays.stream(testName.split("\\.")).findFirst();
data.put("testName", first.get());
// 调用方法并获取结果
@@ -86,10 +108,14 @@ public static void main(String[] args) {
if (createTest) {
String cn = testName;
- System.out.println("create test:" + cn);
- String test = TemplateUtils.renderTemplateFromFile("tlp/test.java", data);
- TemplateUtils.writeStringToFile(test, basePath + "/your project/src/test/java/com/xiaomi/nr/car/account/constant/" + cn);
-
+ System.out.println("create test cn :" + cn + "path:" + testPath);
+ String test;
+ if (SPRING_BOOT_TEST_TYPE.equals(testType)) {
+ test = TemplateUtils.renderTemplateFromFile("tlp/testSpring.java", data);
+ } else {
+ test = TemplateUtils.renderTemplateFromFile("tlp/test.java", data);
+ }
+ TemplateUtils.writeStringToFile(test, testPath + cn);
}
if (createController) {
@@ -98,6 +124,48 @@ public static void main(String[] args) {
}
}
+ public static void createAllUnitTest(Map map) {
+ if (map.isEmpty()) {
+ return;
+ }
+ //方便ai调用的时候,设置表名
+ className = map.get("pojoName");
+ testName = map.get("testName");
+ serviceName = map.get("serviceName");
+ testPackageName = map.get("testPackageName");
+ testPath = map.get("testPath");
+ mainClass = map.get("mainClass");
+ author = map.get("author");
+ testType = map.get("testType");
+
+ if (StringUtils.isEmpty(className)) {
+ return;
+ }
+ Map data = new HashMap<>();
+ data.put("className", className);
+ data.put("author", "goodjava@qq.com");
+ data.put("serviceName", serviceName);
+ data.put("testPackageName", testPackageName);
+ data.put("testPath", testPath);
+ data.put("mainClass", mainClass);
+ data.put("testAuthor", author);
+ data.put("testType", testType);
+ Optional first = Arrays.stream(testName.split("\\.")).findFirst();
+ data.put("testName", first.get());
+
+ if (createTest) {
+ String cn = testName;
+ System.out.println("create test cn :" + cn + "path:" + testPath);
+ String test;
+ if (SPRING_BOOT_TEST_TYPE.equals(testType)) {
+ test = TemplateUtils.renderTemplateFromFileV2("tlp/testSpring.java", data);
+ } else {
+ test = TemplateUtils.renderTemplateFromFileV2("tlp/test.java", data);
+ }
+ TemplateUtils.writeStringToFile(test, testPath + cn);
+ }
+ }
+
private static Map parseArgsAndExtractData(String[] args) {
String jsonStr = args[0];
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/FeatureGenerator.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/FeatureGenerator.java
index e9ae8222d..b5f946410 100644
--- a/jcommon/codegen/src/main/java/run/mone/ai/codegen/FeatureGenerator.java
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/FeatureGenerator.java
@@ -1,15 +1,19 @@
package run.mone.ai.codegen;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import com.mybatisflex.codegen.Generator;
import com.mybatisflex.codegen.config.GlobalConfig;
import com.zaxxer.hikari.HikariDataSource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.jdbc.core.JdbcTemplate;
-import run.mone.ai.codegen.bo.FeatureGeneratType;
import run.mone.ai.codegen.bo.FeatureGenerateBo;
+import run.mone.ai.codegen.bo.FeatureGenerateType;
import run.mone.ai.codegen.util.TemplateUtils;
+import java.lang.reflect.Type;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -21,39 +25,141 @@
@Slf4j
public class FeatureGenerator {
- public static void generateWithTemplate(FeatureGenerateBo featureGenerateBo) {
+ public static void main(String[] args) {
+ Map map;
+ if (args.length > 0) {
+ map = parseArgsAndExtractData(args);
+ String type = getGenType(map);
+ if (type == null) {
+ return;
+ }
+ FeatureGenerateType generateType = FeatureGenerateType.getGenerateTypeByCode(Integer.parseInt(type));
+ FeatureGenerateBo featureGenerateBo = mapToGenBo(map);
+ switch (generateType) {
+ case CODE_WITH_GENERATOR:
+ case TABLE:
+ generateWithGenerator(featureGenerateBo);
+ break;
+ case CODE_WITH_TEMPLATE:
+ generateByTemplate(featureGenerateBo);
+ break;
+ default:
+ log.info("did not match any gen type, will do nothing...");
+ }
+ }
+ }
+
+ private static String getGenType(Map map) {
+ String type = map.get("type");
+ if (StringUtils.isBlank(type)) {
+ log.error("generate type is not specified!");
+ return null;
+ }
+ if (!StringUtils.isNumeric(type)) {
+ log.error("generate type is not valid, must be number! See @FeatureGenerateType.code");
+ return null;
+ }
+ return type;
+ }
+
+ private static FeatureGenerateBo mapToGenBo(Map map) {
+ FeatureGenerateBo.FeatureGenerateBoBuilder builder = FeatureGenerateBo.builder();
+ if (map.containsKey("tableName")) {
+ builder.tableName(map.get("tableName"));
+ }
+ if (map.containsKey("testName")) {
+ builder.sql(map.get("testName"));
+ }
+ if (map.containsKey("sql")) {
+ builder.sql(map.get("sql"));
+ }
+ if (map.containsKey("jdbcUrl")) {
+ builder.jdbcUrl(map.get("jdbcUrl"));
+ }
+ if (map.containsKey("userName")) {
+ builder.userName(map.get("userName"));
+ }
+ if (map.containsKey("password")) {
+ builder.password(map.get("password"));
+ }
+ if (map.containsKey("basePackage")) {
+ builder.basePackage(map.get("basePackage"));
+ }
+ if (map.containsKey("className")) {
+ builder.className(map.get("className"));
+ }
+ if (map.containsKey("auth")) {
+ builder.auth(map.get("auth"));
+ }
+ if (map.containsKey("basePath")) {
+ builder.basePath(map.get("basePath"));
+ }
+ if (map.containsKey("serverModulePath")) {
+ builder.serverModulePath(map.get("serverModulePath"));
+ }
+ if (map.containsKey("serviceModulePath")) {
+ builder.serviceModulePath(map.get("serviceModulePath"));
+ }
+ if (map.containsKey("apiModulePath")) {
+ builder.apiModulePath(map.get("apiModulePath"));
+ }
+ if (map.containsKey("createPojo")) {
+ builder.createPojo(Boolean.parseBoolean(map.get("createPojo")));
+ }
+ if (map.containsKey("createVo")) {
+ builder.createVo(Boolean.parseBoolean(map.get("createVo")));
+ }
+ if (map.containsKey("createTransfer")) {
+ builder.createTransfer(Boolean.parseBoolean(map.get("createTransfer")));
+ }
+ if (map.containsKey("createTest")) {
+ builder.createTest(Boolean.parseBoolean(map.get("createTest")));
+ }
+ if (map.containsKey("createController")) {
+ builder.createController(Boolean.parseBoolean(map.get("createController")));
+ }
+ return builder.build();
+ }
+
+ public static void generateWithGenerator(FeatureGenerateBo featureGenerateBo) {
// 类型检查
if (Objects.isNull(featureGenerateBo.getType())) {
log.warn("Empty generation type, will do noting!");
return;
}
- FeatureGeneratType featureGenType = featureGenerateBo.getType();
- if (FeatureGeneratType.CODE_WITH_TEMPLATE != featureGenType
- && FeatureGeneratType.TABLE != featureGenType) {
+
+ FeatureGenerateType featureGenType = featureGenerateBo.getType();
+ if (FeatureGenerateType.CODE_WITH_TEMPLATE != featureGenType
+ && FeatureGenerateType.TABLE != featureGenType) {
log.warn("generate type:{} is not match with current call", featureGenType);
return;
}
//配置数据源
- HikariDataSource dataSource = new HikariDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setJdbcUrl(featureGenerateBo.getJdbcUrl());
- dataSource.setUsername(featureGenerateBo.getUserName());
- dataSource.setPassword(featureGenerateBo.getPassword());
-
- //创建mapper相关代码
- if (FeatureGeneratType.CODE_WITH_TEMPLATE == featureGenType) {
- GlobalConfig globalConfig = createGlobalConfigUseStyle(featureGenerateBo);
- Generator generator = new Generator(dataSource, globalConfig);
- generator.generate();
- return;
- }
+ try (HikariDataSource dataSource = new HikariDataSource()) {
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setJdbcUrl(featureGenerateBo.getJdbcUrl());
+ dataSource.setUsername(featureGenerateBo.getUserName());
+ dataSource.setPassword(featureGenerateBo.getPassword());
+
+ //创建mapper相关代码
+
+ if (FeatureGenerateType.CODE_WITH_TEMPLATE == featureGenType) {
+ GlobalConfig globalConfig = createGlobalConfigUseStyle(featureGenerateBo);
+ Generator generator = new Generator(dataSource, globalConfig);
+ generator.generate();
+ return;
+ }
- //创建table
- if (FeatureGeneratType.TABLE == featureGenType) {
- JdbcTemplate jt = new JdbcTemplate(dataSource);
- jt.update(featureGenerateBo.getSql());
+ //创建table
+
+ if (FeatureGenerateType.TABLE == featureGenType) {
+ JdbcTemplate jt = new JdbcTemplate(dataSource);
+ jt.update(featureGenerateBo.getSql());
+ }
+ } catch (Exception e) {
+ log.error("generate with template error", e);
}
}
@@ -125,7 +231,7 @@ public static void generateByTemplate(FeatureGenerateBo featureGenerateBo) {
}
if (featureGenerateBo.isCreateTest()) {
- String cn = className + "ServiceTest.java";
+ String cn = featureGenerateBo.getTestName();
String test = TemplateUtils.renderTemplateFromFile("tlp/test.java", data);
TemplateUtils.writeStringToFile(test, basePath + "/" + featureGenerateBo.getServerModulePath() + "/src/test/java/run/mone/test/service/" + cn);
}
@@ -147,4 +253,21 @@ public static String replaceDotWithSlash(String input) {
}
return input.replace(".", "/");
}
+
+ private static Map parseArgsAndExtractData(String[] args) {
+ if (StringUtils.isBlank(args[0])) {
+ log.warn("no valid input params, will do nothing!");
+ }
+ String jsonStr = args[0];
+ Type typeOfT = new TypeToken>() {
+ }.getType();
+
+
+ jsonStr = new String(Base64.getDecoder().decode(jsonStr));
+ log.info("jsonStr:{}", jsonStr);
+
+ Map map = new Gson().fromJson(jsonStr, typeOfT);
+ log.info("map:{}", map);
+ return map;
+ }
}
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/MybatisGenerator.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/MybatisGenerator.java
index fdc0b99a5..a3d7cc954 100644
--- a/jcommon/codegen/src/main/java/run/mone/ai/codegen/MybatisGenerator.java
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/MybatisGenerator.java
@@ -15,6 +15,8 @@
import org.mybatis.generator.config.TableConfiguration;
import org.mybatis.generator.internal.DefaultShellCallback;
import run.mone.ai.codegen.bo.FeatureGenerateBo;
+import run.mone.ai.codegen.bo.MybatisGeneratorResult;
+import run.mone.ai.codegen.holder.MybatisGeneratorHolder;
import java.util.ArrayList;
import java.util.Base64;
@@ -31,19 +33,19 @@ public static void main(String[] args) {
//方便ai调用的时候,设置表名
if (args.length > 0) {
featureGenerateBo = parseArgsAndExtractData(args);
+ generateMyBatisFiles(featureGenerateBo);
}
- generateMyBatisFiles(featureGenerateBo);
}
// 使用mybatis-generator生成指定表对应的XML、Mapper和Entity类
- public static void generateMyBatisFiles(FeatureGenerateBo featureGenerateBo) {
+ public static MybatisGeneratorResult generateMyBatisFiles(FeatureGenerateBo featureGenerateBo) {
+ MybatisGeneratorResult result = new MybatisGeneratorResult();
if (Objects.isNull(featureGenerateBo.getTableName())) {
log.warn("Table name is empty, cannot generate MyBatis files!");
- return;
+ return result;
}
// 配置MyBatis Generator
List warnings = new ArrayList<>();
- boolean overwrite = true;
Configuration config = new Configuration();
Context context = new Context(ModelType.FLAT);
@@ -60,7 +62,7 @@ public static void generateMyBatisFiles(FeatureGenerateBo featureGenerateBo) {
// 配置Java模型生成器
JavaModelGeneratorConfiguration javaModelGeneratorConfiguration = new JavaModelGeneratorConfiguration();
- javaModelGeneratorConfiguration.setTargetPackage(featureGenerateBo.getMybatisDaoPath());
+ javaModelGeneratorConfiguration.setTargetPackage(featureGenerateBo.getMybatisEntityPath());
javaModelGeneratorConfiguration.setTargetProject(featureGenerateBo.getMybatisDaoModule() + "/src/main/java");
context.setJavaModelGeneratorConfiguration(javaModelGeneratorConfiguration);
@@ -100,13 +102,29 @@ public static void generateMyBatisFiles(FeatureGenerateBo featureGenerateBo) {
removeGetSetMethodsPlugin.setConfigurationType("run.mone.ai.codegen.plugin.RemoveGetSetMethodsPlugin");
context.addPluginConfiguration(removeGetSetMethodsPlugin);
+ if(!featureGenerateBo.isOverwrite()) {
+ // 使得xml文件不会被覆盖
+ PluginConfiguration unmergeXML = new PluginConfiguration();
+ unmergeXML.setConfigurationType("org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin");
+ context.addPluginConfiguration(unmergeXML);
+ }
+
+ // 存储这次生成的类名，以便返回
+ PluginConfiguration classNamePlugin = new PluginConfiguration();
+ classNamePlugin.setConfigurationType("run.mone.ai.codegen.plugin.ClassNamePlugin");
+ context.addPluginConfiguration(classNamePlugin);
+
config.addContext(context);
- DefaultShellCallback callback = new DefaultShellCallback(overwrite);
+ DefaultShellCallback callback = new DefaultShellCallback(featureGenerateBo.isOverwrite());
MyBatisGenerator myBatisGenerator;
try {
myBatisGenerator = new MyBatisGenerator(config, callback, warnings);
myBatisGenerator.generate(null);
+
+ // 获取返回结果
+ result.setEntity(MybatisGeneratorHolder.entity);
+ result.setMapper(MybatisGeneratorHolder.mapper);
} catch (Exception e) {
log.error("Error generating MyBatis files", e);
}
@@ -114,6 +132,7 @@ public static void generateMyBatisFiles(FeatureGenerateBo featureGenerateBo) {
if (!warnings.isEmpty()) {
warnings.forEach(log::warn);
}
+ return result;
}
private static FeatureGenerateBo parseArgsAndExtractData(String[] args) {
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/FeatureGenerateBo.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/FeatureGenerateBo.java
index e8c0fd450..b1f413fae 100644
--- a/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/FeatureGenerateBo.java
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/FeatureGenerateBo.java
@@ -4,8 +4,10 @@
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+
import lombok.ToString;
+
/**
* @author goodjava@qq.com, HawickMason@xiaomi.com
* @date 7/12/24 14:10
@@ -14,11 +16,10 @@
@AllArgsConstructor
@Data
@Builder
-@ToString
public class FeatureGenerateBo {
@Builder.Default
- private FeatureGeneratType type = FeatureGeneratType.CODE_WITH_GENERATOR;
+ private FeatureGenerateType type = FeatureGenerateType.CODE_WITH_GENERATOR;
@Builder.Default
private String tableName = "";
@@ -42,6 +43,8 @@ public class FeatureGenerateBo {
@Builder.Default
private String className = "Dummy";
+ private String testName = "T";
+
@Builder.Default
private String auth = "";
@@ -75,6 +78,7 @@ public class FeatureGenerateBo {
@Builder.Default
private boolean createController = false;
+
/**
* 目前使用module所在的绝对路径
*/
@@ -87,4 +91,10 @@ public class FeatureGenerateBo {
@Builder.Default
private String mybatisEntityPath = "";
+ /**
+ * mybatis 是否覆盖现有类，默认不覆盖，如果存在现有类则跳过
+ */
+ @Builder.Default
+ private boolean overwrite = false;
+
}
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/FeatureGenerateType.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/FeatureGenerateType.java
new file mode 100644
index 000000000..136328130
--- /dev/null
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/FeatureGenerateType.java
@@ -0,0 +1,42 @@
+package run.mone.ai.codegen.bo;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author goodjava@qq.com, HawickMason@xiaomi.com
+ * @date 7/12/24 14:15
+ */
+public enum FeatureGenerateType {
+
+ CODE_WITH_GENERATOR(1, "使用mybatis-flex-generator生成"),
+
+ CODE_WITH_TEMPLATE(2, "使用预制模板生成"),
+
+ TABLE(3, "创建表");
+
+ private final int code;
+
+ private final String desc;
+
+ private static final Map valMap = Arrays.stream(values()).collect(Collectors.toMap(FeatureGenerateType::getCode, Function.identity()));
+
+ FeatureGenerateType(int code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public static FeatureGenerateType getGenerateTypeByCode(int code) {
+ return valMap.getOrDefault(code, CODE_WITH_TEMPLATE);
+ }
+}
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/MybatisGeneratorResult.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/MybatisGeneratorResult.java
new file mode 100644
index 000000000..23fc05999
--- /dev/null
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/bo/MybatisGeneratorResult.java
@@ -0,0 +1,19 @@
+package run.mone.ai.codegen.bo;
+
+import lombok.Data;
+import lombok.ToString;
+
+
+@Data
+@ToString
+public class MybatisGeneratorResult {
+ /**
+ * 生成的Java Entity类列表
+ */
+ private String entity;
+
+ /**
+ * 生成的Java mapper类列表
+ */
+ private String mapper;
+}
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/holder/MybatisGeneratorHolder.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/holder/MybatisGeneratorHolder.java
new file mode 100644
index 000000000..87a4cf333
--- /dev/null
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/holder/MybatisGeneratorHolder.java
@@ -0,0 +1,10 @@
+package run.mone.ai.codegen.holder;
+
+import lombok.Data;
+
+public class MybatisGeneratorHolder {
+
+ public static String entity;
+ public static String mapper;
+
+}
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/plugin/ClassNamePlugin.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/plugin/ClassNamePlugin.java
new file mode 100644
index 000000000..2fe66b199
--- /dev/null
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/plugin/ClassNamePlugin.java
@@ -0,0 +1,44 @@
+package run.mone.ai.codegen.plugin;
+
+import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.PluginAdapter;
+import org.mybatis.generator.api.dom.java.TopLevelClass;
+import org.mybatis.generator.api.dom.java.Interface;
+import org.mybatis.generator.config.Context;
+import run.mone.ai.codegen.holder.MybatisGeneratorHolder;
+import org.mybatis.generator.api.JavaFormatter;
+
+import java.util.List;
+
+public class ClassNamePlugin extends PluginAdapter {
+
+ private JavaFormatter javaFormatter;
+
+ @Override
+ public void setContext(Context context) {
+ super.setContext(context);
+ this.javaFormatter = context.getJavaFormatter();
+ }
+
+ @Override
+ public boolean validate(List warnings) {
+ // 这里可以添加一些验证逻辑
+ return true;
+ }
+
+ @Override
+ public boolean modelBaseRecordClassGenerated(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
+ String formattedContent = javaFormatter.getFormattedContent(topLevelClass);
+ MybatisGeneratorHolder.entity = formattedContent;
+ return true;
+ }
+
+
+ @Override
+ public boolean clientGenerated(Interface interfaze, IntrospectedTable introspectedTable) {
+ String formattedContent = javaFormatter.getFormattedContent(interfaze);
+ MybatisGeneratorHolder.mapper = formattedContent;
+ return true;
+ }
+}
+
diff --git a/jcommon/codegen/src/main/java/run/mone/ai/codegen/util/TemplateUtils.java b/jcommon/codegen/src/main/java/run/mone/ai/codegen/util/TemplateUtils.java
index 4d2805cbe..1c3aaac36 100644
--- a/jcommon/codegen/src/main/java/run/mone/ai/codegen/util/TemplateUtils.java
+++ b/jcommon/codegen/src/main/java/run/mone/ai/codegen/util/TemplateUtils.java
@@ -14,6 +14,8 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
@@ -62,6 +64,39 @@ public static String renderTemplateFromFile(String templateFileName, Map m) {
+ try {
+ InputStream is = TemplateUtils.class.getClassLoader().getResourceAsStream(templateFileName);
+ if (is == null) {
+ throw new IOException("Resource not found: " + templateFileName);
+ }
+
+ // 使用Channels和ByteBuffer读取所有字节
+ ByteBuffer byteBuffer = ByteBuffer.allocate(1024);
+ int bytesRead;
+ while ((bytesRead = Channels.newChannel(is).read(byteBuffer)) != -1) {
+ if (byteBuffer.remaining() == 0) {
+ ByteBuffer newBuffer = ByteBuffer.allocate(byteBuffer.capacity() * 2);
+ byteBuffer.flip();
+ newBuffer.put(byteBuffer);
+ byteBuffer = newBuffer;
+ }
+ }
+ byteBuffer.flip();
+ byte[] bytes = new byte[byteBuffer.limit()];
+ byteBuffer.get(bytes);
+
+ // 将字节数组转换为字符串
+ String template = new String(bytes, StandardCharsets.UTF_8);
+
+ return renderTemplate(template, m);
+ } catch (IOException ex) {
+ log.error("Error reading template file", ex);
+ }
+ return "";
+ }
+
//把String写到指定文件中(class)
public static void writeStringToFile(String content, String filePath) {
try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
diff --git a/jcommon/codegen/src/main/resources/tlp/testSpring.java b/jcommon/codegen/src/main/resources/tlp/testSpring.java
new file mode 100644
index 000000000..3e639ed7d
--- /dev/null
+++ b/jcommon/codegen/src/main/resources/tlp/testSpring.java
@@ -0,0 +1,29 @@
+package ${testPackageName};
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import javax.annotation.Resource;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.*;
+
+/**
+ * @author ${testAuthor}
+ */
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(classes = ${mainClass}.class)
+public class ${testName} {
+
+
+@Resource
+private ${serviceName} ${strutil.toLowerCase(serviceName)}Service;
+
+
+}
\ No newline at end of file
diff --git a/jcommon/codegen/src/test/java/com/xiaomi/youpin/codegen/test/FeatureGeneratorTest.java b/jcommon/codegen/src/test/java/com/xiaomi/youpin/codegen/test/FeatureGeneratorTest.java
index 6acd2ef75..13614e766 100644
--- a/jcommon/codegen/src/test/java/com/xiaomi/youpin/codegen/test/FeatureGeneratorTest.java
+++ b/jcommon/codegen/src/test/java/com/xiaomi/youpin/codegen/test/FeatureGeneratorTest.java
@@ -5,6 +5,8 @@
import run.mone.ai.codegen.MybatisGenerator;
import run.mone.ai.codegen.bo.FeatureGeneratType;
import run.mone.ai.codegen.bo.FeatureGenerateBo;
+import run.mone.ai.codegen.bo.FeatureGenerateType;
+import run.mone.ai.codegen.bo.MybatisGeneratorResult;
public class FeatureGeneratorTest {
@@ -15,7 +17,7 @@ public class FeatureGeneratorTest {
@Test
public void testCreateTable() {
FeatureGenerateBo featureGenerateBo = new FeatureGenerateBo();
- featureGenerateBo.setType(FeatureGeneratType.TABLE);
+ featureGenerateBo.setType(FeatureGenerateType.TABLE);
featureGenerateBo.setJdbcUrl(dbUrl);
featureGenerateBo.setUserName(dbUser);
featureGenerateBo.setPassword(dbPwd);
@@ -26,24 +28,24 @@ public void testCreateTable() {
" PRIMARY KEY (`id`)\n" +
");";
featureGenerateBo.setSql(sql);
- FeatureGenerator.generateWithTemplate(featureGenerateBo);
+ FeatureGenerator.generateWithGenerator(featureGenerateBo);
}
@Test
public void testGenerateWithMybatis() {
FeatureGenerateBo featureGenerateBo = new FeatureGenerateBo();
- featureGenerateBo.setType(FeatureGeneratType.CODE_WITH_MYBATIS_GENERATOR);
featureGenerateBo.setJdbcUrl(dbUrl);
featureGenerateBo.setUserName(dbUser);
featureGenerateBo.setPassword(dbPwd);
featureGenerateBo.setTableName("user");
- featureGenerateBo.setMybatisDaoModule("/your/path/mone/jcommon/codegen");
+ featureGenerateBo.setMybatisDaoModule("/your path/mone/jcommon/codegen");
featureGenerateBo.setMybatisXMLPath("com.xiaomi.dao.mapper");
featureGenerateBo.setMybatisDaoPath("com.xiaomi.dao.mapper");
featureGenerateBo.setMybatisEntityPath("com.xiaomi.dao.entity");
- MybatisGenerator.generateMyBatisFiles(featureGenerateBo);
+ MybatisGeneratorResult mybatisGeneratorResult = MybatisGenerator.generateMyBatisFiles(featureGenerateBo);
+ System.out.println(mybatisGeneratorResult);
}
}
diff --git a/jcommon/codegen/src/test/java/com/xiaomi/youpin/codegen/test/GenTest.java b/jcommon/codegen/src/test/java/com/xiaomi/youpin/codegen/test/GenTest.java
index 281b2c8ee..8f34f10f4 100644
--- a/jcommon/codegen/src/test/java/com/xiaomi/youpin/codegen/test/GenTest.java
+++ b/jcommon/codegen/src/test/java/com/xiaomi/youpin/codegen/test/GenTest.java
@@ -16,19 +16,27 @@
package com.xiaomi.youpin.codegen.test;
+import com.google.common.collect.Lists;
import com.xiaomi.youpin.codegen.*;
import com.xiaomi.youpin.codegen.bo.ApiHeaderBo;
import com.xiaomi.youpin.codegen.bo.Dependency;
import com.xiaomi.youpin.infra.rpc.Result;
+import org.apache.commons.lang3.tuple.Pair;
import org.junit.Test;
+import run.mone.ai.codegen.util.TemplateUtils;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class GenTest {
+ @Resource
+ private TemplateUtils templateUtils;
+
@Test
public void testFilter() throws Exception {
FilterGen filterGen = new FilterGen();
@@ -38,8 +46,8 @@ public void testFilter() throws Exception {
@Test
public void testHttpRequestGen() throws Exception {
HttpRequestGen httpRequestGen = new HttpRequestGen();
- httpRequestGen.generateJavaReq("getUserInfo",2,13,"[{\"paramNotNull\":\"0\",\"paramType\":\"13\",\"paramName\":\"obj\",\"paramKey\":\"subObj\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[{\"paramNotNull\":\"0\",\"paramType\":\"0\",\"paramName\":\"sub_dzx\",\"paramKey\":\"subName\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]},{\"paramNotNull\":\"0\",\"paramType\":\"3\",\"paramName\":\"666\",\"paramKey\":\"subID\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]}]}]");
- httpRequestGen.generateJavaReq("getUserInfo",2,13,"[{\"paramNotNull\":\"0\",\"paramType\":\"13\",\"paramName\":\"obj\",\"paramKey\":\"subObj\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[{\"paramNotNull\":\"0\",\"paramType\":\"0\",\"paramName\":\"sub_dzx\",\"paramKey\":\"subName\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]},{\"paramNotNull\":\"0\",\"paramType\":\"3\",\"paramName\":\"666\",\"paramKey\":\"subID\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]}]},{\"paramNotNull\":\"0\",\"paramType\":\"0\",\"paramName\":\"dzx\",\"paramKey\":\"userName\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]}]");
+ httpRequestGen.generateJavaReq("getUserInfo", 2, 13, "[{\"paramNotNull\":\"0\",\"paramType\":\"13\",\"paramName\":\"obj\",\"paramKey\":\"subObj\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[{\"paramNotNull\":\"0\",\"paramType\":\"0\",\"paramName\":\"sub_dzx\",\"paramKey\":\"subName\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]},{\"paramNotNull\":\"0\",\"paramType\":\"3\",\"paramName\":\"666\",\"paramKey\":\"subID\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]}]}]");
+ httpRequestGen.generateJavaReq("getUserInfo", 2, 13, "[{\"paramNotNull\":\"0\",\"paramType\":\"13\",\"paramName\":\"obj\",\"paramKey\":\"subObj\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[{\"paramNotNull\":\"0\",\"paramType\":\"0\",\"paramName\":\"sub_dzx\",\"paramKey\":\"subName\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]},{\"paramNotNull\":\"0\",\"paramType\":\"3\",\"paramName\":\"666\",\"paramKey\":\"subID\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]}]},{\"paramNotNull\":\"0\",\"paramType\":\"0\",\"paramName\":\"dzx\",\"paramKey\":\"userName\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]}]");
List headers = new ArrayList<>();
ApiHeaderBo header1 = new ApiHeaderBo();
@@ -50,7 +58,7 @@ public void testHttpRequestGen() throws Exception {
header2.setHeaderValue("true");
headers.add(header1);
headers.add(header2);
- Result result = httpRequestGen.generateCurlReq(0,"/Api/getUserInfo",1,"[{\"paramNotNull\":\"0\",\"paramType\":\"13\",\"paramName\":\"obj\",\"paramKey\":\"subObj\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[{\"paramNotNull\":\"0\",\"paramType\":\"0\",\"paramName\":\"sub_dzx\",\"paramKey\":\"subName\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]},{\"paramNotNull\":\"0\",\"paramType\":\"3\",\"paramName\":\"666\",\"paramKey\":\"subID\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]}]}]",headers);
+ Result result = httpRequestGen.generateCurlReq(0, "/Api/getUserInfo", 1, "[{\"paramNotNull\":\"0\",\"paramType\":\"13\",\"paramName\":\"obj\",\"paramKey\":\"subObj\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[{\"paramNotNull\":\"0\",\"paramType\":\"0\",\"paramName\":\"sub_dzx\",\"paramKey\":\"subName\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]},{\"paramNotNull\":\"0\",\"paramType\":\"3\",\"paramName\":\"666\",\"paramKey\":\"subID\",\"paramValue\":\"\",\"paramLimit\":\"\",\"paramNote\":\"\",\"paramValueList\":[],\"default\":0,\"childList\":[]}]}]", headers);
System.out.print(result.getData());
}
@@ -137,9 +145,10 @@ public void testDDD() throws Exception {
new DDDProGen().generateAndZip("/tmp/work", "abcd", "com.xiaomi.youpin", "com.xiaomi.youpin.abcdefg", "dfz", "1.0.0", dep);
//new CNSalesCrmGen().generateAndZip("/home/work", "testt", "com.xiaomi.test", "com.xiaomi.test.testt", "dfz", "1.0.0", dep);
}
+
@Test
public void testFaas() throws Exception {
FaasGen gen = new FaasGen();
- gen.generateAndZip("/tmp/work", "project-faas", "com.xiaomi.youpin", "com.xiaomi.youpin.projectmimimi", "dfz", "1.0.0","modulex","functiony");
+ gen.generateAndZip("/tmp/work", "project-faas", "com.xiaomi.youpin", "com.xiaomi.youpin.projectmimimi", "dfz", "1.0.0", "modulex", "functiony");
}
}
diff --git a/jcommon/file/src/test/java/com/xiaomi/mone/file/LogFileTest.java b/jcommon/file/src/test/java/com/xiaomi/mone/file/LogFileTest.java
index 56b6bd782..e57859f58 100644
--- a/jcommon/file/src/test/java/com/xiaomi/mone/file/LogFileTest.java
+++ b/jcommon/file/src/test/java/com/xiaomi/mone/file/LogFileTest.java
@@ -85,7 +85,7 @@ public void testLogFileMonitor() {
monitor.reg("/home/work/log/test", it -> {
boolean matches = pattern.matcher(it).matches();
- log.info("file:{},matches:{}", it, matches);
+ log.info("file:{},matches:{}", it, true);
return true;
});
log.info("reg finish");
diff --git a/jcommon/gitlab/src/main/java/com/xiaomi/youpin/gitlab/Gitlab.java b/jcommon/gitlab/src/main/java/com/xiaomi/youpin/gitlab/Gitlab.java
index 718043bc2..418d060bd 100644
--- a/jcommon/gitlab/src/main/java/com/xiaomi/youpin/gitlab/Gitlab.java
+++ b/jcommon/gitlab/src/main/java/com/xiaomi/youpin/gitlab/Gitlab.java
@@ -516,7 +516,7 @@ private static boolean modifyFile(String changedBody, String filePathToReplace,
return true;
}
- private static boolean clone(String gitUrl, String branch, String username, String token, String gitPath) {
+ public static boolean clone(String gitUrl, String branch, String username, String token, String gitPath) {
clearIfPresent(gitPath);
CloneCommand cloneCommand = Git.cloneRepository().setURI(gitUrl)
.setCredentialsProvider(new UsernamePasswordCredentialsProvider(username, token))
diff --git a/jcommon/pom.xml b/jcommon/pom.xml
index 66ebff815..317b7d665 100644
--- a/jcommon/pom.xml
+++ b/jcommon/pom.xml
@@ -88,6 +88,7 @@
infra-common
docean-spring-starter
ai
+ ai/neo4j