commit:同步2.1版本

This commit is contained in:
Jerry
2021-12-16 21:51:40 +08:00
parent c76388f593
commit 7af7fe5dc2
553 changed files with 8366 additions and 4151 deletions

View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>framework</artifactId>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<artifactId>common-core</artifactId>
<version>1.0.0</version>
</dependency>

View File

@@ -1,9 +1,9 @@
package com.flow.demo.apidoc.tools;
package com.orangeforms.apidoc.tools;
import com.alibaba.fastjson.JSON;
import com.flow.demo.apidoc.tools.codeparser.ApiCodeConfig;
import com.flow.demo.apidoc.tools.codeparser.ApiCodeParser;
import com.flow.demo.apidoc.tools.export.ApiPostmanExporter;
import com.orangeforms.apidoc.tools.codeparser.ApiCodeConfig;
import com.orangeforms.apidoc.tools.codeparser.ApiCodeParser;
import com.orangeforms.apidoc.tools.export.ApiPostmanExporter;
import freemarker.template.TemplateException;
import org.springframework.util.StreamUtils;

View File

@@ -1,9 +1,9 @@
package com.flow.demo.apidoc.tools;
package com.orangeforms.apidoc.tools;
import com.alibaba.fastjson.JSON;
import com.flow.demo.apidoc.tools.codeparser.ApiCodeConfig;
import com.flow.demo.apidoc.tools.codeparser.ApiCodeParser;
import com.flow.demo.apidoc.tools.export.ApiDocExporter;
import com.orangeforms.apidoc.tools.codeparser.ApiCodeConfig;
import com.orangeforms.apidoc.tools.codeparser.ApiCodeParser;
import com.orangeforms.apidoc.tools.export.ApiDocExporter;
import freemarker.template.TemplateException;
import org.springframework.util.StreamUtils;

View File

@@ -1,10 +1,10 @@
package com.flow.demo.apidoc.tools.codeparser;
package com.orangeforms.apidoc.tools.codeparser;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
import com.flow.demo.common.core.object.Tuple2;
import com.flow.demo.apidoc.tools.exception.ApiCodeConfigParseException;
import com.orangeforms.common.core.object.Tuple2;
import com.orangeforms.apidoc.tools.exception.ApiCodeConfigParseException;
import com.thoughtworks.qdox.JavaProjectBuilder;
import com.thoughtworks.qdox.model.*;
import com.thoughtworks.qdox.model.impl.DefaultJavaParameterizedType;
@@ -63,7 +63,7 @@ public class ApiCodeParser {
*/
private ApiProject apiProject;
/**
* 项目中所有的解析后Java文件key是Java对象的全名com.flow.demo.xxxx.Student
* 项目中所有的解析后Java文件key是Java对象的全名com.orangeforms.xxxx.Student
*/
private final Map<String, JavaClass> projectJavaClassMap = new HashMap<>(128);
/**

View File

@@ -1,7 +1,7 @@
package com.flow.demo.apidoc.tools.export;
package com.orangeforms.apidoc.tools.export;
import com.flow.demo.apidoc.tools.codeparser.ApiCodeParser;
import com.flow.demo.apidoc.tools.util.FreeMarkerUtils;
import com.orangeforms.apidoc.tools.codeparser.ApiCodeParser;
import com.orangeforms.apidoc.tools.util.FreeMarkerUtils;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
import freemarker.template.TemplateExceptionHandler;

View File

@@ -1,7 +1,7 @@
package com.flow.demo.apidoc.tools.export;
package com.orangeforms.apidoc.tools.export;
import com.flow.demo.apidoc.tools.codeparser.ApiCodeParser;
import com.flow.demo.apidoc.tools.util.FreeMarkerUtils;
import com.orangeforms.apidoc.tools.codeparser.ApiCodeParser;
import com.orangeforms.apidoc.tools.util.FreeMarkerUtils;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
import freemarker.template.TemplateExceptionHandler;

View File

@@ -1,6 +1,6 @@
{
"projectName": "橙单在线表单",
"basePackage": "com.flow.demo",
"basePackage": "com.orangeforms",
"projectRootPath": "这里请使用当前工程的根目录e:/xxx/OrangeDemo 或者 /Users/xxx/OrangeDemo",
"microService": "false",
"serviceList": [
@@ -11,11 +11,11 @@
"port": "8082",
"controllerInfoList": [
{
"path": "/src/main/java/com/flow/demo/webadmin/app/controller",
"path": "/src/main/java/com/orangeforms/webadmin/app/controller",
"groupName": "app"
},
{
"path": "/src/main/java/com/flow/demo/webadmin/upms/controller",
"path": "/src/main/java/com/orangeforms/webadmin/upms/controller",
"groupName": "upms"
}
]