Merge remote-tracking branch 'origin/main'

template/entrance/web/pom.xml

@@ -20,6 +20,21 @@
       <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,5 +1,8 @@
 package {{ .package }}.entrance.web;
 
+import com.vs.debug.stack.agent.LogStackContextInvokeRecorder;
+import com.vs.debug.stack.agent.MethodVisitorHandlerFilter;
+import com.vs.debug.stack.agent.StackContextInvokeRecorder;
 import com.vs.debug.stack.config.EnableVSReplayConfiguration;
 import com.vs.sqlmapper.spring.DataSourceConfig;
 import com.vs.sqlmapper.spring.scan.VSDaoBeanScan;
@@ -7,13 +10,10 @@ 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 com.vs.debug.stack.agent.MethodVisitorHandlerFilter;
-import com.vs.debug.stack.agent.StackContextInvokeRecorder;
 
+import org.mybatis.spring.annotation.MapperScan;
 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;
 

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

@@ -14,10 +14,10 @@ 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 "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
 {{- end }}
-spring.datasource.username={{ .dbUsername }}
-spring.datasource.password={{ .dbPassword }}
+spring.datasource.username=${DB_USER:hande_test_user}
+spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5}
 spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
 
 # Druid Data Source Config

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

@@ -13,10 +13,10 @@ 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 "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
 {{- end }}
-spring.datasource.username={{ .dbUsername }}
-spring.datasource.password={{ .dbPassword }}
+spring.datasource.username=${DB_USER:hande_test_user}
+spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5}
 spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
 
 # Druid Data Source Config

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

@@ -13,10 +13,10 @@ 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 "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
 {{- end }}
-spring.datasource.username={{ .dbUsername }}
-spring.datasource.password={{ .dbPassword }}
+spring.datasource.username=${DB_USER:hande_test_user}
+spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5}
 spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
 
 # Druid Data Source Config