Merge branch 'huangzqa-new-version-20210404' into 'develop'

修改tomcate

See merge request dcuc-tjdsj/coder-service!1

dcuc-coder-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-coder</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dcuc-coder-api</artifactId>

dcuc-coder-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-coder</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dcuc-coder-model</artifactId>

dcuc-coder-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-coder</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dcuc-coder-service</artifactId>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-common</artifactId>
-            <version>${project.version}</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <!--配置 dcuc 结束-->
 
@@ -105,7 +105,43 @@
         <!--许可依赖包 结束-->
     </dependencies>
     <!--指定仓库地址-->
+    <packaging>${project.packaging}</packaging>
     <profiles>
+        <!--war打包配置-->
+        <!--使用方式 mvn clean package -Pwar-->
+        <profile>
+            <id>war</id>
+            <properties>
+                <project.packaging>war</project.packaging>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>com.dragonsoft</groupId>
+                    <artifactId>duceap-boot-starter-web</artifactId>
+                    <!-- 移除嵌入式tomcat插件 -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-starter-tomcat</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <version>2.1.1</version>
+                        <configuration>
+                            <failOnMissingWebXml>false</failOnMissingWebXml>
+                            <!--排除licenseignore包，用来禁用许可开关，防止生产环境通过关闭开关，绕过许可-->
+                            <packagingExcludes>WEB-INF/lib/duceap-support-licenseignore*.jar</packagingExcludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>jar</id>
             <activation>

dcuc-coder-service/src/main/java/com/dragoninfo/dcuc/coder/ConsumerTomcatApplication.java

@@ -0,0 +1,22 @@
+package com.dragoninfo.dcuc.coder;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * @author huangzqa
+ * @date 2021/4/4
+ **/
+@SpringBootApplication(scanBasePackages = {"com.dragonsoft", "com.dragoninfo"})
+public class ConsumerTomcatApplication extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(ConsumerTomcatApplication.class);
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(ConsumerTomcatApplication.class, args);
+    }
+}

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-coder</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0-tjdsj-SNAPSHOT</version>
 
     <modules>
         <module>dcuc-coder-api</module>