删除 template/TOCO.md

支持达梦数据库

template/.gitignore

@@ -10,7 +10,8 @@ classes/
 
 ## idea
 *.iml
-.idea/**
+.idea/*
+!.idea/codeStyles/
 !.idea/dataSources.xml
 HELP.md
 

template/.toco/README

@@ -0,0 +1,8 @@
+目录用于存放rules，只支持.md文件。
+
+global: 目录用于存放所有agent通用rules
+toco: 目录用于存放Toco Agent专用rules，用于外层流程整体控制
+modeling:目录用于存放Modeling Agent专用rules，用于领域建模阶段
+plan: 目录用于存放Plan Agent专用rules，用于整体规划阶段
+design:目录用于存放Design Agent专用rules，用于TOCO设计元素设计
+coding:目录用于存放Coding Agent专用rules，用于编码阶段

template/.toco/coding/README

@@ -0,0 +1 @@
+目录用于存放Coding Agent专用rules，用于编码阶段，只支持.md文件

template/.toco/design/README

@@ -0,0 +1 @@
+目录用于存放Design Agent专用rules，用于TOCO设计元素设计，只支持.md文件

template/.toco/global/README

@@ -0,0 +1 @@
+目录用于存放所有agent通用rules，只支持.md文件

template/.toco/modeling/README

@@ -0,0 +1 @@
+目录用于存放Modeling Agent专用rules，用于领域建模阶段，只支持.md文件

template/.toco/plan/README

@@ -0,0 +1 @@
+目录用于存放Plan Agent专用rules，用于整体规划阶段，只支持.md文件

template/.toco/toco/README

@@ -0,0 +1 @@
+目录用于存放Toco Agent专用rules，用于外层流程整体控制，只支持.md文件

template/Dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.8.8 as builder
+FROM maven:3.8.8 AS builder
 WORKDIR source
 COPY ./ ./
 ARG JAR_FILE=entrance/web/target/*.jar

template/common/src/main/java/{{.packagePath}}/common/response/MyDateFormat.java

@@ -0,0 +1,48 @@
+package {{ .package }}.common.response;
+
+import java.text.*;
+import java.util.Calendar;
+import java.util.Date;
+
+public class MyDateFormat extends DateFormat {
+    private static final long serialVersionUID = -4580955831439573829L;
+    private static final String customDateFormat = "yyyy-MM-dd HH:mm:ss";
+    private DateFormat dateFormat;
+    private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    public MyDateFormat(DateFormat dateFormat) {
+        this.calendar = Calendar.getInstance();
+        this.dateFormat = dateFormat;
+    }
+
+    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+        return this.dateFormat.format(date, toAppendTo, fieldPosition);
+    }
+
+    public Date parse(String source, ParsePosition pos) {
+        Date date = null;
+        if (source.length() == "yyyy-MM-dd HH:mm:ss".length()) {
+            date = this.simpleDateFormat.parse(source, pos);
+        } else {
+            date = this.dateFormat.parse(source, pos);
+        }
+
+        return date;
+    }
+
+    public Date parse(String source) throws ParseException {
+        Date date = null;
+        if (source.length() == "yyyy-MM-dd HH:mm:ss".length()) {
+            date = this.simpleDateFormat.parse(source);
+        } else {
+            date = this.dateFormat.parse(source);
+        }
+
+        return date;
+    }
+
+    public Object clone() {
+        Object format = this.dateFormat.clone();
+        return new MyDateFormat((DateFormat)format);
+    }
+}

template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonExceptionResolver.java

@@ -1,5 +1,6 @@
 package {{ .package }}.common.response;
 
+import com.vs.common.util.rpc.pub.FailData;
 import com.vs.ox.common.exception.ErrorCode;
 import com.vs.ox.common.exception.IgnoredException;
 import com.vs.ox.common.utils.ObjectMapperFactory;
@@ -11,7 +12,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.http.server.ServletServerHttpResponse;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.AbstractHandlerExceptionResolver;
 

template/common/src/main/java/{{.packagePath}}/common/response/ResponseJsonMethodReturnValueHandler.java

@@ -1,5 +1,6 @@
 package {{ .package }}.common.response;
 
+import com.vs.common.util.rpc.pub.SuccessData;
 import com.vs.ox.common.utils.ObjectMapperFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.MethodParameter;

template/common/src/main/java/{{.packagePath}}/common/response/WebMvcConfiguration.java

@@ -1,12 +1,6 @@
 package {{ .package }}.common.response;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.vs.ox.starters.web.autoconfig.bind.JsonRequestParamHandlerMethodArgumentResolver;
-import com.vs.ox.starters.web.autoconfig.bind.MyDateFormat;
-import com.vs.ox.starters.web.autoconfig.interceptor.LoginCheckInterceptor;
-import com.vs.ox.starters.web.autoconfig.interceptor.LoginTokenInterceptor;
-import com.vs.ox.starters.web.autoconfig.resolver.ResponseJsonExceptionResolver;
-import com.vs.ox.starters.web.autoconfig.resolver.ResponseJsonMethodReturnValueHandler;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -17,10 +11,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.method.annotation.MapMethodProcessor;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
 import org.springframework.web.servlet.HandlerExceptionResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.ViewNameMethodReturnValueHandler;
@@ -33,7 +25,7 @@ import java.util.Iterator;
 import java.util.List;
 
 @Configuration
-@ComponentScan("{{ .package }}")
+@ComponentScan("com.vs.ox")
 public class
 WebMvcConfiguration extends WebMvcConfigurerAdapter implements ApplicationContextAware {
     RequestMappingHandlerAdapter requestMappingHandlerAdapter;
@@ -76,19 +68,6 @@ WebMvcConfiguration extends WebMvcConfigurerAdapter implements ApplicationContex
         returnValueHandlers.add(responseJsonMethodReturnValueHandler);
     }
 
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new LoginTokenInterceptor());
-        registry.addInterceptor(new LoginCheckInterceptor());
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(new JsonRequestParamHandlerMethodArgumentResolver());
-        super.addArgumentResolvers(argumentResolvers);
-    }
-
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         this.applicationContext = applicationContext;

template/entrance/web/pom.xml

@@ -20,21 +20,6 @@
       <artifactId>{{ .artifactId }}-entrance-mq</artifactId>
       <version>{{ .version }}</version>
     </dependency>
-    <dependency>
-      <groupId>com.vs</groupId>
-      <artifactId>vs-mock-web</artifactId>
-      <version>${vs.mock.spring}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.vs</groupId>
-      <artifactId>vs-debug-agent</artifactId>
-      <version>${vs.debug.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.vs</groupId>
-      <artifactId>vs-debug-plugin</artifactId>
-      <version>${vs.debug.version}</version>
-    </dependency>
   </dependencies>
 
   <build>

template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java

@@ -1,41 +1,21 @@
 package {{ .package }}.entrance.web;
 
-import com.vs.debug.stack.config.EnableVSReplayConfiguration;
 import com.vs.sqlmapper.spring.DataSourceConfig;
 import com.vs.sqlmapper.spring.scan.VSDaoBeanScan;
-import com.vs.mock.config.EnableVSMockConfiguration;
-import com.vs.sqlmapper.spring.express.EnableVSMockExpress;
 import com.vs.agent.TocoAgentInitializer;
 
-import com.vs.debug.stack.agent.LogStackContextInvokeRecorder;
+import org.mybatis.spring.annotation.MapperScan;
-import com.vs.debug.stack.agent.MethodVisitorHandlerFilter;
-import com.vs.debug.stack.agent.StackContextInvokeRecorder;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 
 @SpringBootApplication(scanBasePackages = {"{{.groupId}}", "com.vs"})
 @VSDaoBeanScan(basePackages = {"com.vs","{{.groupId}}"})
 @Import(DataSourceConfig.class)
-@EnableVSReplayConfiguration
+@MapperScan("{{.groupId}}.**.persist.mapper.mybatis")
-@EnableVSMockConfiguration
-@EnableVSMockExpress
 public class AppApplication{
 
-//    @Bean(name = "stackContextInvokeRecorder")
-//    public StackContextInvokeRecorder createStackContextInvokeRecorder() throws Exception {
-//        return new LogStackContextInvokeRecorder(); // 可以根据需求扩展实现
-//    }
-
-    @Bean
-    public MethodVisitorHandlerFilter createMethodVisitorHandlerFilter() {
-        StackContextInvokeRecorder stackContextInvokeRecorder = new LogStackContextInvokeRecorder();
-        return new MethodVisitorHandlerFilter(stackContextInvokeRecorder);
-    }
-
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(AppApplication.class);
         application.addInitializers(new TocoAgentInitializer());

template/entrance/web/src/main/resources/application-local.properties

@@ -13,11 +13,13 @@ mock.enabled=true
 spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB
 {{- else if eq .dbType "postgresql" }}
 spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified
-{{- else if eq .dbType "oracle" }}
+{{- else if eq .dbType "mysql" }}
-spring.datasource.url=jdbc:{{ .dbType }}://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+{{- else if eq .dbType "dm"}}
+spring.datasource.url=jdbc:dm://${ .dbHost }/${ .dbPort }/SYSDBA?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 {{- end }}
-spring.datasource.username={{ .dbUsername }}
+spring.datasource.username=${DB_USER:hande_test_user}
-spring.datasource.password={{ .dbPassword }}
+spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5}
 spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
 
 # Druid Data Source Config
@@ -31,10 +33,14 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 {{- else if eq .dbType "oracle" }}
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
 hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-hibernate.show_sql=true
 vs.sqlmapper.dialect=oracle
-vs.sqlmapper.showSql=true
+{{- else if eq .dbType "dm" }}
+spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver
+hibernate.dialect=org.hibernate.dialect.DmDialect
+vs.sqlmapper.dialect=dm
 {{- end }}
+hibernate.show_sql=true
+vs.sqlmapper.showSql=true
 spring.datasource.tomcat.max-age=3600000
 spring.jpa.open-in-view=false
 spring.redis.host=${REDIS_HOST:redis.byteawake.com}
@@ -46,7 +52,7 @@ spring.flyway.outOfOrder=true
 spring.flyway.baselineOnMigrate=true
 spring.upload.file.path=/data/upload
 spring.exception.isHtmlRequired=false
-spring.main.lazy-initialization=true
+#spring.main.lazy-initialization=true
 application.name=libawall
 mybatis.configuration.map-underscore-to-camel-case=true
 spring.url.aaa=http://localhost:8080

template/entrance/web/src/main/resources/application-online.properties

@@ -12,11 +12,13 @@ base.package={{.groupId}}
 spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB
 {{- else if eq .dbType "postgresql" }}
 spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified
-{{- else if eq .dbType "oracle" }}
+{{- else if eq .dbType "mysql" }}
-spring.datasource.url=jdbc:{{ .dbType }}://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+{{- else if eq .dbType "dm"}}
+spring.datasource.url=jdbc:dm://${ .dbHost }/${ .dbPort }/SYSDBA?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 {{- end }}
-spring.datasource.username={{ .dbUsername }}
+spring.datasource.username=${DB_USER:hande_test_user}
-spring.datasource.password={{ .dbPassword }}
+spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5}
 spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
 
 # Druid Data Source Config
@@ -30,10 +32,14 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 {{- else if eq .dbType "oracle" }}
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
 hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-hibernate.show_sql=true
 vs.sqlmapper.dialect=oracle
-vs.sqlmapper.showSql=true
+{{- else if eq .dbType "dm" }}
+spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver
+hibernate.dialect=org.hibernate.dialect.DmDialect
+vs.sqlmapper.dialect=dm
 {{- end }}
+hibernate.show_sql=true
+vs.sqlmapper.showSql=true
 spring.datasource.tomcat.max-age=3600000
 spring.jpa.open-in-view=false
 spring.redis.host=${REDIS_HOST:redis.byteawake.com}

template/entrance/web/src/main/resources/application-remote.properties

@@ -12,11 +12,13 @@ base.package={{.groupId}}
 spring.datasource.url=jdbc:oracle:thin:@//{{ .dbHost }}:{{ .dbPort }}/ORCLCDB
 {{- else if eq .dbType "postgresql" }}
 spring.datasource.url=jdbc:postgresql://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&stringtype=unspecified
-{{- else if eq .dbType "oracle" }}
+{{- else if eq .dbType "mysql" }}
-spring.datasource.url=jdbc:{{ .dbType }}://{{ .dbHost }}:{{ .dbPort }}/{{ .dbDatabase }}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+{{- else if eq .dbType "dm"}}
+spring.datasource.url=jdbc:dm://${ .dbHost }/${ .dbPort }/SYSDBA?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 {{- end }}
-spring.datasource.username={{ .dbUsername }}
+spring.datasource.username=${DB_USER:hande_test_user}
-spring.datasource.password={{ .dbPassword }}
+spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5}
 spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
 
 # Druid Data Source Config
@@ -30,10 +32,14 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 {{- else if eq .dbType "oracle" }}
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
 hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-hibernate.show_sql=true
 vs.sqlmapper.dialect=oracle
-vs.sqlmapper.showSql=true
+{{- else if eq .dbType "dm" }}
+spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver
+hibernate.dialect=org.hibernate.dialect.DmDialect
+vs.sqlmapper.dialect=dm
 {{- end }}
+vs.sqlmapper.showSql=true
+hibernate.show_sql=true
 
 spring.datasource.tomcat.max-age=3600000
 spring.jpa.open-in-view=false

template/entrance/web/src/main/resources/application.properties

@@ -4,7 +4,7 @@ spring.main.allow-bean-definition-overriding=true
 project_id=${projectId}
 project_name=handeTest
 check=true
-
 spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
-
+#注销掉es的自动装配
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration
 com.toco.agent.attach=true

template/pom.xml

@@ -80,6 +80,10 @@
         <ox.sprintboot.web.starter.version>1.0-SNAPSHOT</ox.sprintboot.web.starter.version>
         <ox.basidc.common>1.0-SNAPSHOT</ox.basidc.common>
         <vs.sqlmapper.spring>1.0.0-SNAPSHOT</vs.sqlmapper.spring>
+        {{- if eq .dbType "dm" }}
+        <dm.driver.version>18</dm.driver.version>
+        <db.hiernate.dialect.version>8.1.3.140</db.hiernate.dialect.version>
+        {{- end }}
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -372,6 +376,18 @@
                 <artifactId>hibernate-core</artifactId>
                 <version>${hibernate.version}</version>
             </dependency>  
+            {{- if eq .dbType "dm" }}
+            <dependency>
+                <groupId>dm</groupId>
+                <artifactId>DmJdbcDriver</artifactId>
+                <version>${dm.driver.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.dameng</groupId>
+                <artifactId>DmDialect-for-hibernate5.6</artifactId>
+                <version>${db.hiernate.dialect.version}</version>
+            </dependency>
+            {{- end }}
          </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -385,18 +401,31 @@
             <version>1.0.0-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>3.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
             <version>2.17.0</version>
         </dependency>
-
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.5.7</version>
         </dependency>
-
+         {{- if eq .dbType "dm" }}
+        <dependency>
+            <groupId>dm</groupId>
+            <artifactId>DmJdbcDriver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmDialect-for-hibernate5.6</artifactId>
+        </dependency>
+        {{- end }}
     </dependencies>
     <build>
         <plugins>
@@ -439,6 +468,23 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
+                <configuration>
+                    <java>
+                        <googleJavaFormat>
+                            <groupArtifact>com.google.googlejavaformat:google-java-format</groupArtifact>
+                            <version>1.22.0</version>
+                            <style>AOSP</style>
+                            <reorderImports>true</reorderImports>
+                            <reflowLongStrings>true</reflowLongStrings>
+                            <formatJavadoc>true</formatJavadoc>
+                        </googleJavaFormat>
+                    </java>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <modules>