Merge branch 'develop' into 'master'

Develop

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

Jenkinsfile

@@ -3,9 +3,11 @@
 
 def build = new org.devops.build()
 def color = new org.devops.color()
+def systemtime = new org.devops.systemtime()
 
-String cpu = "${env.cpu}"
-String imagePrefix = "${env.imagePrefix}"
+def String cpu = "${env.cpu}"
+def String imagePrefix = "${env.imagePrefix}"
+def String buildImage = "${env.buildImage}"
 
 pipeline {
     agent {
@@ -20,13 +22,15 @@ pipeline {
 
     //设定2个参数,根据项目类型不同,修改对应的description name value visibleItemCount  defaultValue 即可
     parameters {
-        extendedChoice description: '请选择CPU架构.可单选/多选/全选', multiSelectDelimiter: ',', name: 'cpu',
+        choice choices: ['false', 'true'], description: '是否需要打镜像包，默认为否', name: 'buildImage'
+        extendedChoice description: '只有在需要打镜像包的情况下，才需要选择CPU架构。可单选/多选/全选', multiSelectDelimiter: ',', name: 'cpu',
                 quoteValue: true,
                 saveJSONParameterToFile: false,
                 type: 'PT_CHECKBOX',
                 value: 'x86,arm64',
                 visibleItemCount: 5
-        string defaultValue: 'bus.ga/jzywb/dcuc/', description: '请填写打的镜像通用前缀名称,注意最后面要加 / ', name: 'imagePrefix', trim: false
+        // 需修改对应的镜像名称
+        string defaultValue: 'bus.ga/jzywb/dcuc/', description: '只有在需要打镜像包的情况下，才需要填写要打镜像通用前缀名称,注意最后面要加 / ', name: 'imagePrefix', trim: false
     }
     stages {
         stage('MAVEN-BUILD') {
@@ -34,11 +38,31 @@ pipeline {
                 script {
                     color.PrintMes('执行mvn打包', 'green')
                     //使用mvn方法打包,并传入打包参数.根据实际情况修改打包策略
-                    build.Build('mvn', 'mvn clean package -DskipTests=true', 'master')
+                    build.Build('mvn', 'mvn clean deploy -DskipTests=true', 'master')
                 }
             }
+            post {
+                success {
+                    script {
+                        version = build.GetMvnParentVersion()
+                        systime = systemtime.GetSysTime('yyMMdd')
+                        //将打出来的tar包，按照命名规范命名。根据实际情况，修改对应的系统简称和区域标识（DCUC-CODER-SERVICE-TJDSJ）
+                        sh """cd dcuc-coder-service/target
+                            cp dcuc-coder-service-*.tar.gz DCUC-CODER-SERVICE-TJDSJ-${version}-${env.GIT_COMMIT.take(8)}-BETA-${systime}.tar.gz
+                        """
+                        //将复制的按照命名规范的tar包提取到Jenkins的面板，方便下载。根据实际情况，修改对应的系统简称和区域标识（DCUC-CODER-SERVICE-TJDSJ）
+                        archiveArtifacts artifacts: 'dcuc-coder-service/target/DCUC-CODER-SERVICE-TJDSJ-*.tar.gz'
+                    }
+                }
+            }
+
         }
         stage('DOCKER-BUILD') {
+            when {
+                expression {
+                    return (buildImage  == 'true')
+                }
+            }
             steps {
                 script {
                     //将cpu架构和模块名称传入方法打镜像包.若在上面定义的参数名称没变,可不修改

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);
+    }
+}

dcuc-coder-service/src/main/resources/application-base.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     username: dcuc
-    password: dragon
+    password: 123
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.23.170:3306/dcuc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+    url: jdbc:mysql://10.254.10.31:3306/dcuc_tjdsj_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
     druid:
       filters: sqlaudit
   application:

pom.xml

@@ -3,9 +3,10 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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.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>
@@ -17,7 +18,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!--revisions需写死，用于标识打包的版本号，不可删除-->
-        <revision>2.0.0-SNAPSHOT</revision>
+        <revision>2.0.0-tjdsj-SNAPSHOT</revision>
         <duceap.version>2.1.0-SNAPSHOT</duceap.version>
         <oracle.version>11.2.0.1.0</oracle.version>
         <mysql.version>5.1.49</mysql.version>