Merge branch '配置文件改造' into developer

935090232@qq.com

2022-02-24 ceea128c48d5b21ebd1bb46943d656446aa974ec

 zq-erp/pom.xml

@@ -47,30 +47,6 @@
                <env>prd</env>
            </properties>
        </profile>
        <profile>
            <id>mdPrd</id>
            <properties>
                <env>mdPrd</env>
            </properties>
        </profile>
        <profile>
            <id>xcx</id>
            <properties>
                <env>xcx</env>
            </properties>
        </profile>
        <profile>
            <id>lhx</id>
            <properties>
                <env>lhx</env>
            </properties>
        </profile>
        <profile>
            <id>xcshop</id>
            <properties>
                <env>xcshop</env>
            </properties>
        </profile>
    </profiles>
    <dependencies>

@@ -398,6 +374,11 @@
            <artifactId>guava</artifactId>
            <version>26.0-jre</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-configuration-processor</artifactId>
            <optional>true</optional>
        </dependency>
    </dependencies>
    <build>
        <resources>
@@ -405,21 +386,6 @@
                <directory>src/main/resources</directory>
                <filtering>true</filtering>
                <excludes>

                    <exclude>config/dev/*</exclude>
                    <exclude>config/prd/*</exclude>
                    <exclude>config/mdPrd/*</exclude>
                    <exclude>config/test/*</exclude>
                    <exclude>config/xcx/*</exclude>
                    <exclude>config/xcshop/*</exclude>

                    <!--
                    <exclude>config/config.json</exclude>
                    <exclude>config/application.properties</exclude>
                    <exclude>config/system.properties</exclude>
-->


                    <exclude>**/*.woff</exclude>
                    <exclude>**/*.woff2</exclude>
                    <exclude>**/*.ttf</exclude>
@@ -435,10 +401,7 @@
                    <include>**/*.xls</include>
                </includes>
            </resource>
            <resource>
                <directory>src/main/resources/config/${env}</directory>
                <targetPath>BOOT-INF/classes/config</targetPath>
            </resource>

        </resources>
        <plugins>
            <plugin>