更新模板

template/common/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.insigma</groupId>
-    <artifactId>insiis7</artifactId>
+    <groupId>{{ .groupId }}</groupId>
+    <artifactId>{{ .artifactId }}</artifactId>
     <version>${revision}</version>
   </parent>
 
   <groupId>com.insigma</groupId>
   <artifactId>insiis7-common</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>${revision}</version>
 
   <properties>
     <elasticsearch.version>7.3.1</elasticsearch.version>

template/common/src/main/java/{{.packagePath}}/common/config/MqConfig.java

@@ -1,4 +1,4 @@
-package com.insigma.common.config;
+package {{ .package }}.common.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java

@@ -1,6 +1,5 @@
-package com.insigma.common.config;
+package {{ .package }}.common.config;
 
-import com.insigma.common.config.MqConfig;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.MockClock;
@@ -9,8 +8,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import javax.annotation.Resource;
 
-import com.insigma.common.rocketmq.RocketMQService;
-import com.insigma.common.rocketmq.RocketMQServiceImpl;
+import {{ .package }}.common.config.MqConfig;
+import {{ .package }}.common.rocketmq.RocketMQService;
+import {{ .package }}.common.rocketmq.RocketMQServiceImpl;
 
 @Configuration
 public class RocketMqAutoConfiguration {

template/common/src/main/java/{{.packagePath}}/common/elasticsearch/ESConfig.java

@@ -1,4 +1,4 @@
-package com.insigma.common.elasticsearch;
+package {{ .package }}.common.elasticsearch;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

template/common/src/main/java/{{.packagePath}}/common/elasticsearch/EsConfiguration.java

@@ -1,6 +1,5 @@
-package com.insigma.common.elasticsearch;
+package {{ .package }}.common.elasticsearch;
 
-import com.insigma.common.elasticsearch.ESConfig;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;

template/common/src/main/java/{{.packagePath}}/common/elasticsearch/EsService.java

@@ -1,6 +1,5 @@
-package com.insigma.common.elasticsearch;
+package {{ .package }}.common.elasticsearch;
 
-import com.vs.ox.common.utils.JsonUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.elasticsearch.action.admin.indices.alias.Alias;
@@ -56,6 +55,7 @@ import java.util.UUID;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 
+import {{ .package }}.common.utils.JsonUtils;
 
 /**
  * es 的工具类

template/common/src/main/java/{{.packagePath}}/common/redis/RedisPoolConfig.java

@@ -1,4 +1,4 @@
-package com.insigma.common.redis;
+{{ .package }}.common.redis;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

template/common/src/main/java/{{.packagePath}}/common/redis/RedisPoolProperties.java

@@ -1,4 +1,4 @@
-package com.insigma.common.redis;
+package {{ .package }}.common.redis;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

template/common/src/main/java/{{.packagePath}}/common/rocketmq/RocketMQService.java

@@ -1,4 +1,4 @@
-package com.insigma.common.rocketmq;
+package {{ .package }}.common.rocketmq;
 
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 

template/common/src/main/java/{{.packagePath}}/common/rocketmq/RocketMQServiceImpl.java

@@ -1,6 +1,5 @@
-package com.insigma.common.rocketmq;
+package {{ .package }}.common.rocketmq;
 
-import com.insigma.common.rocketmq.RocketMQService;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;

template/common/src/main/java/{{.packagePath}}/common/utils/JsonUtils.java

@@ -1,4 +1,4 @@
-package com.insigma.common.utils;
+package {{ .package }}.common.utils;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;

template/insiis-web/pom.xml

@@ -11,8 +11,8 @@
     <name>insiis-web</name>
     <description>Web project for Insiis7</description>
     <parent>
-        <groupId>com.insigma</groupId>
-        <artifactId>insiis7</artifactId>
+        <groupId>{{ .groupId }}</groupId>
+        <artifactId>{{ .artifactId }}</artifactId>
         <version>${revision}</version>
     </parent>
     <dependencies>
@@ -25,9 +25,9 @@
             <artifactId>vs-sqlmapper-spring</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.insigma</groupId>
-            <artifactId>insiis7-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>{{ .groupId }}</groupId>
+            <artifactId>{{ .artifactId }}-common</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 

template/pom.xml

@@ -3,14 +3,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.insigma</groupId>
-    <artifactId>insiis7</artifactId>
-    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.insigma</groupId>
+        <artifactId>insiis7</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath/>
+        <!-- lookup parent from dao -->
+    </parent>
+
+    <groupId>{{ .groupId }}</groupId>
+    <artifactId>{{ .artifactId }}</artifactId>
     <version>${revision}</version>
-    <name>insiis7</name>
+    <packaging>pom</packaging>
+
     <description>epsoft insiis7 project for Spring Boot</description>
     <properties>
-        <revision>3.1.0-SNAPSHOT</revision>
+        <revision>{{ .version }}</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>11</maven.compiler.source>
@@ -75,13 +84,6 @@
         <toco.version>1.0.0-SNAPSHOT</toco.version>
         <toco-common.version>1.0.0-SNAPSHOT</toco-common.version>
     </properties>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
-        <relativePath/>
-        <!-- lookup parent from dao -->
-    </parent>
 
     <dependencies>
         <dependency>