Merge branch 'master-xlk' into master-xlk-test

fhx

2024-09-30 c0c7be5af4cd201290be57ffb02721fa35297212

 phi_platform_user/pom.xml

@@ -13,14 +13,94 @@

    <parent>
        <groupId>com.hx</groupId>
        <artifactId>phi_platform</artifactId>
        <version>1.0-SNAPSHOT</version>
        <artifactId>phi-platform</artifactId>
        <version>xlk</version>
    </parent>

    <artifactId>phi_platform_user</artifactId>
    <version>0.0.1-SNAPSHOT</version>
    <artifactId>phi-platform-user</artifactId>
    <version>xlk</version>

    <dependencies>

        <dependency>
            <groupId>com.hz</groupId>
            <artifactId>phi-warehouse-user</artifactId>
            <version>xlk</version>
        </dependency>

        <dependency>
            <groupId>com.hz</groupId>
            <artifactId>phis-provider</artifactId>
            <version>xlk</version>
        </dependency>

        <dependency>
            <groupId>com.hx</groupId>
            <artifactId>phi-synchro-his</artifactId>
            <version>xlk</version>
        </dependency>

        <!--springCloud-nacos-->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.cloud</groupId>
                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
        </dependency>

        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.cloud</groupId>
                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
        </dependency>

        <!--spring cloud的支持-->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-bootstrap</artifactId>
        </dependency>

        <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-context -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-context</artifactId>
        </dependency>

        <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-commons -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-commons</artifactId>
        </dependency>

        <!--openfeign的支持-->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>

        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -30,49 +110,69 @@
        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>hx-common</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>phi_platform_common</artifactId>
            <version>1.0-SNAPSHOT</version>
            <artifactId>phi-platform-common</artifactId>
            <version>xlk</version>
        </dependency>

        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>phi_platform_model</artifactId>
            <version>1.0-SNAPSHOT</version>
            <artifactId>phi-platform-model</artifactId>
            <version>xlk</version>
        </dependency>

        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>phi_platform_his</artifactId>
            <version>1.0-SNAPSHOT</version>
            <artifactId>phi-platform-his</artifactId>
            <version>xlk</version>
        </dependency>

        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>phi_common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <artifactId>phi-util-common</artifactId>
        </dependency>

        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>phi-method-common</artifactId>
        </dependency>

        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>platform-common</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>hx-auto</artifactId>
            <version>2.0-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.hz</groupId>
            <artifactId>phis-feign</artifactId>
        </dependency>

        <dependency>
            <groupId>com.hz</groupId>
            <artifactId>crm-platform-feign</artifactId>
        </dependency>

        <dependency>
            <groupId>com.hz</groupId>
            <artifactId>phi-warehouse-feign</artifactId>
        </dependency>

        <dependency>
            <groupId>com.hz</groupId>
            <artifactId>phi-sms-feign</artifactId>
        </dependency>

        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
            <version>1.1.23</version>
        </dependency>

        <dependency>
@@ -143,18 +243,25 @@
        </dependency>

        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter-api</artifactId>
            <version>RELEASE</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <!--<dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
        </dependency>-->

        <dependency>
            <groupId>org.hibernate.validator</groupId>
            <artifactId>hibernate-validator</artifactId>
        </dependency>

        <!--生成PDF使用包-->
        <dependency>
            <groupId>com.itextpdf</groupId>
            <artifactId>itextpdf</artifactId>
        </dependency>

        <dependency>
            <groupId>com.itextpdf</groupId>
            <artifactId>itext-asian</artifactId>
        </dependency>

    </dependencies>

@@ -164,23 +271,21 @@
            <properties>
                <!--使用${environment}获取值-->
                <environment>local</environment>
                <logXml>local</logXml>
            </properties>
        </profile>
        <profile>
            <id>prod</id>
            <properties>
                <environment>prod</environment>
                <logXml>prod</logXml>
            </properties>
        </profile>
        <profile>
            <id>heTest</id>
            <id>stander</id>
            <properties>
                <environment>heTest</environment>
                <logXml>local</logXml>
                <environment>stander</environment>
            </properties>
        </profile>

    </profiles>

    <build>
@@ -202,7 +307,7 @@
                <directory>src/main/resources</directory>
                <includes>
                    <include>application-${environment}.properties</include>
                    <include>log4j2-${logXml}.xml</include>
                    <include>log4j2-${environment}.xml</include>
                </includes>
            </resource>
        </resources>
@@ -246,6 +351,7 @@
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <!--SpringBoot2.3.x版本之后打包之后指定加载类，否则打包部署启动会失败-->
                    <mainClass>com.hx.phip.PhiPlatformUserApplication</mainClass>
                    <layout>ZIP</layout>
                    <includes>