Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java

 Source/UBCS-WEB/dist/cdn/animate/3.5.2/animate.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/avue/2.9.12/avue.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/avue/2.9.12/index.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/axios/1.0.0/axios.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/element-ui/2.15.6/index.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/element-ui/2.15.6/theme-chalk/fonts/element-icons.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/element-ui/2.15.6/theme-chalk/fonts/element-icons.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/element-ui/2.15.6/theme-chalk/index.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.eot

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.json

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.woff2

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/index.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.eot

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.json

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.woff2

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/bpmn.08b5f281.eot

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/bpmn.3c4c9f45.woff2

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/bpmn.acbc6cbd.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/bpmn.f922519e.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/codicon.22349029.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/fontawesome-webfont.674f50d2.eot

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/fontawesome-webfont.af7ae505.woff2

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/fontawesome-webfont.b06871f2.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/fontawesome-webfont.fee66e71.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/img/bpmn.1381b44e.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/img/fontawesome-webfont.912ec66d.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/index.umd.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/vue-router/3.0.1/vue-router.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/vue/2.6.10/vue.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/vuex/3.1.1/vuex.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/xlsx/FileSaver.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/xlsx/xlsx.full.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/css/chunk-vendors.e41156d0.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/css/fontSize.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/css/page.e84a6fd9.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/css/views.cd3521c3.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/favicon.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/403.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/img/bg/404.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/img/bg/500.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/img/bg/bg.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/bg1.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/bg2.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/bg3.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/bg4.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/cloud.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/img-logo.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/login.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/logo.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/star-squashed.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/vip1.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/vip2.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/vip3.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/vip4.png

Binary files differ

 Source/UBCS-WEB/dist/img/logo.png

Binary files differ

 Source/UBCS-WEB/dist/img/mock/card/card-1.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/mock/card/card-2.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/mock/card/card-3.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/mock/card/card-4.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/mock/cli/1.png

Binary files differ

 Source/UBCS-WEB/dist/img/mock/cli/2.png

Binary files differ

 Source/UBCS-WEB/dist/img/mock/cli/3.png

Binary files differ

 Source/UBCS-WEB/dist/img/mock/iconfont.png

Binary files differ

 Source/UBCS-WEB/dist/img/pageLogo.jpeg

Binary files differ

 Source/UBCS-WEB/dist/js/chunk-2d0e4caf.c02e3bd1.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/js/chunk-vendors.e37ddf76.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/src/router/avue-router.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/svg/loading-spin.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/util/aes.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/util/font_4017492_2d1qk52m7xp.ttf

Binary files differ

 Source/UBCS-WEB/dist/util/font_4017492_2d1qk52m7xp.woff

Binary files differ

 Source/UBCS-WEB/dist/util/font_4017492_2d1qk52m7xp.woff2

Binary files differ

 Source/UBCS-WEB/dist/util/screen/guge.png

Binary files differ

 Source/UBCS-WEB/dist/util/screen/huohu.png

Binary files differ

 Source/UBCS-WEB/dist/util/screen/screen.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/util/screen/screen.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/vue.config.js

@@ -22,14 +22,14 @@
  },
  //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
  devServer: {
    port: 38000,
    port: 8080,
    proxy: {
      '/api': {
        //本地服务接口地址
        target: 'http://localhost:37000',
        target: 'http://127.0.0.1',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.1.16:37000',
        // target: 'http://192.168.0.105:37000',
        // target: 'http://192.168.0.103:37000',
        // target: 'http://192.168.1.63:37000',

 Source/UBCS/pom.xml

@@ -10,7 +10,6 @@

    <properties>
        <bladex.project.version>3.0.1.RELEASE</bladex.project.version>

        <java.version>1.8</java.version>
        <maven.plugin.version>3.8.0</maven.plugin.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -29,6 +28,7 @@
        <docker.password>Harbor12345</docker.password>
        <docker.namespace>ubcs</docker.namespace>
        <docker.plugin.version>1.4.13</docker.plugin.version>
        <server.lib.path>../../target/libs</server.lib.path>
    </properties>

    <modules>
@@ -41,7 +41,7 @@
        <module>ubcs-plugin-api</module>
        <module>ubcs-service</module>
        <module>ubcs-service-api</module>
        <module>ubcs-codeApply</module>
<!--        <module>ubcs-codeApply</module>-->
    </modules>

    <dependencyManagement>
@@ -107,11 +107,13 @@
        <resources>
            <resource>
                <directory>src/main/resources</directory>
               <!-- <excludes>
                <excludes>
                    <exclude>bootstrap.yml</exclude>
                    <exclude>application.yml</exclude>
                    <exclude>application-prod.yml</exclude>
                </excludes>-->
                    <exclude>application-dev.yml</exclude>
                    <exclude>application-test.yml</exclude>
                    <exclude>application-prop.yml</exclude>
                </excludes>
            </resource>
            <resource>
                <directory>src/main/java</directory>
@@ -125,91 +127,91 @@
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <version>${spring.boot.version}</version>
                    <version>${spring.boot.version}</version> <!-- å¦‚æžœ spring.boot.version ç‰ˆæœ¬ä¿®æ”¹ï¼Œåˆ™è¿™é‡Œä¹Ÿè¦è·Ÿç€ä¿®æ”¹ -->
                    <configuration>
                        <fork>true</fork>
                        <finalName>${project.build.finalName}</finalName>
                        <!--解决windows命令行窗口中文乱码-->
                        <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
                        <!-- æ‹†å¼€ä¾èµ–-->
                        <layout>ZIP</layout>
                        <outputDirectory>../../target</outputDirectory>
                        <includes>
                            <include>
                                <!-- æŽ’除所有Jar -->
                                <groupId>nothing</groupId>
                                <artifactId>nothing</artifactId>
                            </include>
                        </includes>
                    </configuration>
                    <executions>
                        <execution>
                            <goals>
                                <goal>repackage</goal>
                                <goal>repackage</goal> <!-- å°†å¼•å…¥çš„ jar æ‰“入其中 -->
                            </goals>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>com.spotify</groupId>
                    <artifactId>dockerfile-maven-plugin</artifactId>
                    <version>${docker.plugin.version}</version>
                    <configuration>
                        <username>${docker.username}</username>
                        <password>${docker.password}</password>
                        <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                        <tag>${project.version}</tag>
                        <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                        <buildArgs>
                            <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                        </buildArgs>
                    </configuration>
                    <!--子服务添加如下配置，运行 mvn deploy å‘½ä»¤ä¾¿ä¼šè‡ªåŠ¨æ‰“包镜像-->
                    <!--<executions>
                        <execution>
                            <id>default</id>
                            <goals>
                                <goal>build</goal>
                                <goal>push</goal>
                            </goals>
                        </execution>
                    </executions>-->
                </plugin>
                <!--此插件用于将依赖包抽出-->
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-antrun-plugin</artifactId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <executions>
                        <execution>
                            <id>copy-dependencies</id>
                            <phase>package</phase>
                            <goals>
                                <goal>run</goal>
                                <goal>copy-dependencies</goal>
                            </goals>
                            <configuration>
                                <tasks>
                                    <!--suppress UnresolvedMavenProperty -->
                                    <copy overwrite="true"
                                          tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
                                          file="${project.build.directory}/${project.artifactId}.jar" />
                                </tasks>
                                <outputDirectory>${server.lib.path}</outputDirectory>
                                <excludeTransitive>false</excludeTransitive>
                                <stripVersion>false</stripVersion>
                                <includeScope>runtime</includeScope>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <artifactId>maven-surefire-plugin</artifactId>
                    <configuration>
                        <skip>true</skip>
                    </configuration>
                </plugin>
                <plugin>
                    <artifactId>maven-compiler-plugin</artifactId>
                    <version>${maven.plugin.version}</version>
                    <configuration>
                        <source>${java.version}</source>
                        <target>${java.version}</target>
                        <encoding>UTF-8</encoding>
                        <compilerArgs>
                            <arg>-parameters</arg>
                        </compilerArgs>
                    </configuration>
                </plugin>
                <!-- åŸºäºŽmaven-jar-plugin插件实现把依赖jar定义写入输出jar的META-INFO/MANIFEST文件 -->
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-jar-plugin</artifactId>
                    <configuration>
                        <archive>
                            <manifest>
                                <addClasspath>true</addClasspath>
                                <!--<classpathPrefix>./libs</classpathPrefix>-->
                                <classpathPrefix>/data1/ubcs/ubcs-server/libs</classpathPrefix>
                                <useUniqueVersions>false</useUniqueVersions>
                            </manifest>
                        </archive>
                        <excludes>
                            <exclude>application-dev.yml</exclude>
                            <exclude>application-prod.yml</exclude>
                            <exclude>application.yml</exclude>
                            <exclude>lib/*</exclude>
                        </excludes>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
                <version>${maven.plugin.version}</version>
                <configuration>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
                    <encoding>UTF-8</encoding>
                    <compilerArgs>
                        <arg>-parameters</arg>
                    </compilerArgs>
                </configuration>
            </plugin>
        </plugins>
    </build>

    <repositories>

 Source/UBCS/ubcs-auth/pom.xml

@@ -142,23 +142,21 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                    <outputDirectory>../target</outputDirectory>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
                <configuration>
                    <outputDirectory>./target/libs</outputDirectory>
                </configuration>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-auth/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36001
  port: 8100

#数据源配置
spring:

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeLibTreeCellRenderer.java

@@ -1,7 +1,5 @@
package com.vci.rmip.code.client.codeapply.Apply410;

import com.vci.base.ui.image.bundle.BundleImage;
import com.vci.base.ui.tree.VCIBaseTreeNode;
import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;

import javax.swing.*;

 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java

@@ -46,14 +46,14 @@
    /**
     * nacos prod åœ°å€
     */
    String NACOS_PROD_ADDR = "127.0.0.1:8848";
    //String NACOS_PROD_ADDR = "dev.vci-tech.com:38848";
    String NACOS_PROD_ADDR = "127.0.0.1:8848";

    /**
     * nacos test åœ°å€
     */
    //String NACOS_TEST_ADDR = "dev.vci-tech.com:38848";
    String NACOS_TEST_ADDR = "127.0.0.1:8848";
    //String NACOS_TEST_ADDR = "192.168.243.130:8848";

    /**
     * sentinel dev åœ°å€
@@ -78,42 +78,42 @@
    /**
     * seata prod åœ°å€
     */
    String SEATA_PROD_ADDR = "172.30.0.68:8091";
    String SEATA_PROD_ADDR = "127.0.0.1:8091";

    /**
     * seata test åœ°å€
     */
    String SEATA_TEST_ADDR = "172.30.0.68:8091";
    String SEATA_TEST_ADDR = "127.0.0.1:8091";

    /**
     * zipkin dev åœ°å€
     */
    String ZIPKIN_DEV_ADDR = "http://dev.vci-tech.com:38006";
    String ZIPKIN_DEV_ADDR = "http://127.0.0.1:9411";

    /**
     * zipkin prod åœ°å€
     */
    String ZIPKIN_PROD_ADDR = "http://172.30.0.71:9411";
    String ZIPKIN_PROD_ADDR = "http://127.0.0.1:9411";

    /**
     * zipkin test åœ°å€
     */
    String ZIPKIN_TEST_ADDR = "http://172.30.0.71:9411";
    String ZIPKIN_TEST_ADDR = "http://127.0.0.1:9411";

    /**
     * elk dev åœ°å€
     */
    String ELK_DEV_ADDR = "dev.vci-tech.com:38002";
    String ELK_DEV_ADDR = "127.0.0.1:9200";

    /**
     * elk prod åœ°å€
     */
    String ELK_PROD_ADDR = "dev.vci-tech.com:38002";
    String ELK_PROD_ADDR = "127.0.0.1:9200";

    /**
     * elk test åœ°å€
     */
    String ELK_TEST_ADDR = "dev.vci-tech.com:38002";
    String ELK_TEST_ADDR = "127.0.0.1:9200";

    /**
     * seata file模式

 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/launch/LauncherServiceImpl.java

@@ -44,7 +44,7 @@
        PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false");

        // å¼€å¯elk日志
        PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
        // PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));

        // seata注册地址
        // PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile));

 Source/UBCS/ubcs-gateway/pom.xml

@@ -79,23 +79,21 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                    <outputDirectory>../target</outputDirectory>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
                <configuration>
                    <outputDirectory>./target/libs</outputDirectory>
                </configuration>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml

ÎļþÒÑɾ³ý

 Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml

@@ -9,3 +9,17 @@
    prior-ip-pattern:
      - 192.168.0.*
      - 127.0.0.1
server:
  port: 80

spring:
  cloud:
    gateway:
      discovery:
        locator:
          enabled: true
    loadbalancer:
      retry:
        enabled: true
  main:
    web-application-type: reactive

 Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
server:
  port: 37000
  port: 80

spring:
  cloud:
@@ -10,3 +10,5 @@
    loadbalancer:
      retry:
        enabled: true
  main:
    web-application-type: reactive

 Source/UBCS/ubcs-ops/ubcs-admin/pom.xml

@@ -95,23 +95,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
server:
  port: 36002
  port: 8101
  undertow:
    threads:
      # è®¾ç½®IO线程数, å®ƒä¸»è¦æ‰§è¡Œéžé˜»å¡žçš„任务,它们会负责多个连接, é»˜è®¤è®¾ç½®æ¯ä¸ªCPU核心一个线程

 Source/UBCS/ubcs-ops/ubcs-develop/pom.xml

@@ -54,8 +54,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-ops/ubcs-develop/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36003
  port: 7007

#数据源配置
spring:

 Source/UBCS/ubcs-ops/ubcs-flow/pom.xml

@@ -93,19 +93,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

 Source/UBCS/ubcs-ops/ubcs-log/pom.xml

@@ -43,23 +43,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-ops/ubcs-log/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36005
  port: 8103

#数据源配置
spring:

 Source/UBCS/ubcs-ops/ubcs-report/pom.xml

@@ -47,23 +47,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-ops/ubcs-report/src/main/resources/application-prod.yml

@@ -1,6 +1,9 @@

#数据源配置
spring:
  datasource:
    url: ${blade.datasource.prod.url}
    username: ${blade.datasource.prod.username}
    password: ${blade.datasource.prod.password}
server:
  port: 8111

 Source/UBCS/ubcs-ops/ubcs-report/src/main/resources/application.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36006
  port: 8110

#报表配置
report:

 Source/UBCS/ubcs-ops/ubcs-resource/pom.xml

@@ -97,23 +97,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml

@@ -4,3 +4,26 @@
    url: ${blade.datasource.prod.url}
    username: ${blade.datasource.prod.username}
    password: ${blade.datasource.prod.password}
  servlet:
    multipart:
      max-file-size: 500MB
      max-request-size: 500MB

#服务器端口
server:
  port: 8010

#默认对象存储配置
oss:
  enabled: true
  name: minio
  tenant-mode: true
  endpoint: http://dev.vci-tech.com:39000
  access-key: TyEeBAJiAKDvHICUVAoH
  secret-key: Reo4wW8EWF4gSizUmVsNjWfbDZzR3rBYFn5Jehd9
  bucket-name: vci-ubcs

#关闭驼峰命名映射
mybatis-plus:
  configuration:
    map-underscore-to-camel-case: false

 Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36007
  port: 8010

#默认对象存储配置
oss:

 Source/UBCS/ubcs-ops/ubcs-swagger/pom.xml

@@ -33,23 +33,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-ops/ubcs-swagger/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 36008
  port: 18000
knife4j:
  enableAggregation: true
  cloud:

 Source/UBCS/ubcs-ops/ubcs-xxljob-admin/pom.xml

@@ -102,23 +102,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-ops/ubcs-xxljob-admin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 36013
  port: 7009
  servlet:
    context-path: /xxl-job-admin


 Source/UBCS/ubcs-ops/ubcs-xxljob/pom.xml

@@ -38,23 +38,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-ops/ubcs-xxljob/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 36009
  port: 7008

logging:
  config: classpath:logback.xml

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml

@@ -50,23 +50,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java

@@ -96,7 +96,6 @@
    /*
     * ä¸»æ•°æ®ä¸šåŠ¡æœåŠ¡
     */

    /**
     * èŽ·å–集团集团码，赋值到主数据
     * @param dockingReturnStoreVO

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-dev.yml

@@ -10,14 +10,5 @@
    password: ${ubcs.datasource.mdm.dev.password}
#关闭驼峰命名映射
mybatis-plus:
  configuration:
  configuration :
    map-underscore-to-camel-case: false
  #集团集成配置信息
docking:
  apply:
    #集团提供的接口地址
    jtInterUrl: http://116.205.176.185:8099
    #系统厂家单位代码
    unitCode: 41000
    #系统标识
    sysName:  410-MDM

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 8107
  port: 8108

#数据源配置
spring:

 Source/UBCS/ubcs-service/ubcs-code/pom.xml

@@ -96,12 +96,6 @@
            <version>3.0.1.RELEASE</version>
            <scope>compile</scope>
        </dependency>
        <!--达梦数据库驱动-->
        <!--<dependency>
            <groupId>com.dameng</groupId>
            <artifactId>DmJdbcDriver18</artifactId>
            <optional>true</optional>
        </dependency>-->
        <!--axis2 begin -->
        <dependency>
            <groupId>org.apache.axis2</groupId>
@@ -148,7 +142,6 @@
            <scope>compile</scope>
        </dependency>
        <!--axis2 end -->

        <dependency>
            <groupId>com.vci.ubcs</groupId>
            <artifactId>ubcs-file-api</artifactId>
@@ -165,23 +158,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java

@@ -389,9 +389,9 @@
                    && (isHistory || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
            ).collect(Collectors.toList());

                if (CollectionUtils.isEmpty(templateAttrVOS)) {
                    throw new VciBaseException("模板没有配置任何【表单显示】为【是】的属性");
                }
            if (CollectionUtils.isEmpty(templateAttrVOS)) {
                throw new VciBaseException("模板没有配置任何【表单显示】为【是】的属性");
            }

            List<CodeClassifyTemplateAttrVO> idAttrVOList = codeClassifyTemplateVO.getAttributes().stream().filter(s -> s.getId().equalsIgnoreCase(CODE_FIELD)).collect(Collectors.toList());
            LinkedList<WriteExcelData> excelDataList = new LinkedList<>();
@@ -2133,7 +2133,7 @@
            needSaveCboList.stream().forEach(clientBusinessObject -> {
                BaseModel baseModel=new BaseModel();
                BeanUtil.convert(clientBusinessObject,baseModel);
            //(VciBaseUtil.objectToMapString(clientBusinessObject));
                //(VciBaseUtil.objectToMapString(clientBusinessObject));
                dataCBOList.add(baseModel);
                allNeedSaveCboList.add(baseModel.getOid());
            });
@@ -2748,7 +2748,7 @@
//                    if (lifeCycleVO != null) {
//                        cbo.setLcStatus(lifeCycleVO.getStartStatus());
//                    } else {
                        cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
                    cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
//                    }
                } else {
                    cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
@@ -3147,7 +3147,7 @@
                            String fullPath,boolean newCode){
        rowDataList.stream().forEach(rowData -> {
            ClientBusinessObject cbo=new ClientBusinessObject();
             DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
            DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
            rowData.getData().forEach((index,value)->{
                String field = fieldIndexMap.get(index);
                if (StringUtils.isBlank(field)) {
@@ -3951,7 +3951,7 @@
     * @return é‡å¤çš„行号
     */
    private void getSelfRepeatRowIndex(Map<String/**属性的编号**/, CodeClassifyTemplateAttrVO> ketAttrMap,
                                              List<ClientBusinessObject> dataList,CodeKeyAttrRepeatVO keyRuleVO,CodeImportResultVO resultVO){
                                       List<ClientBusinessObject> dataList,CodeKeyAttrRepeatVO keyRuleVO,CodeImportResultVO resultVO){
        Set<String> selfRepeatRowIndexList = new CopyOnWriteArraySet<>();
        Map<String,List<String>> keyAttrOkOidTORepeatOidMap=new HashMap<>();
        boolean trimAll =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36014
  port: 8108
  tomcat:
    uri-encoding: UTF-8
  servlet:
@@ -11,9 +11,9 @@
#数据源配置
spring:
  datasource:
    url: ${ubcs.datasource.mdm.dev.url}
    username: ${ubcs.datasource.mdm.dev.username}
    password: ${ubcs.datasource.mdm.dev.password}
    url: ${ubcs.datasource.mdm.prod.url}
    username: ${ubcs.datasource.mdm.prod.username}
    password: ${ubcs.datasource.mdm.prod.password}
  messages:
    encoding: utf-8
    basename: i18n/messages

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36014
  port: 8109
  tomcat:
    uri-encoding: UTF-8
  servlet:

 Source/UBCS/ubcs-service/ubcs-desk/pom.xml

@@ -73,23 +73,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-service/ubcs-desk/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36010
  port: 8105

#数据源配置
spring:

 Source/UBCS/ubcs-service/ubcs-omd/pom.xml

@@ -86,23 +86,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 8105
  port: 8107

#数据源配置
spring:

 Source/UBCS/ubcs-service/ubcs-system/pom.xml

@@ -51,23 +51,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-service/ubcs-system/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36011
  port: 8106

#数据源配置
spring:

 Source/UBCS/ubcs-service/ubcs-user/pom.xml

@@ -52,23 +52,15 @@
    <build>
        <plugins>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <configuration>
                    <username>${docker.username}</username>
                    <password>${docker.password}</password>
                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
                    <tag>${project.version}</tag>
                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>

 Source/UBCS/ubcs-service/ubcs-user/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
#服务器端口
server:
  port: 36012
  port: 8102
#数据源配置
spring:
  datasource: