Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-06-27 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-admin/pom.xml

@@ -30,6 +30,26 @@
    </repositories>

    <dependencies>

        <dependency>
            <groupId>org.joda</groupId>
            <artifactId>joda-money</artifactId>
            <version>1.0.2</version> <!-- 最新版本可在 Maven Central 查询 -->
        </dependency>


        <dependency>
            <groupId>com.oracle.database.jdbc</groupId>
            <artifactId>ojdbc8</artifactId>
            <version>19.8.0.0</version>
        </dependency>

        <dependency>
            <groupId>com.oracle.database.jdbc</groupId>
            <artifactId>orai18n</artifactId>
            <version>12.1.0.2.0</version>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter</artifactId>
@@ -93,6 +113,13 @@
            <artifactId>sqljdbc4</artifactId>
            <version>4.0</version>
        </dependency>

<!--        <dependency>-->
<!--            <groupId>com.microsoft.sqlserver</groupId>-->
<!--            <artifactId>mssql-jdbc</artifactId>-->
<!--            <version>6.4.0.jre8</version> &lt;!&ndash; 使用最新版本 &ndash;&gt;-->
<!--        </dependency>-->


        <!-- Mysql驱动包 -->
        <dependency>
@@ -180,46 +207,52 @@
            <artifactId>weixin-java-miniapp</artifactId>
            <version>4.2.0</version>
        </dependency>

        <dependency>
            <groupId>org.seleniumhq.selenium</groupId>
            <artifactId>selenium-java</artifactId>
            <version>3.141.59</version>
        </dependency>
    </dependencies>


<!--
        <build>
            <plugins>
                &lt;!&ndash; maven打包插件&ndash;&gt;
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <version>2.1.1.RELEASE</version>
                    <configuration>
                        <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;
                    </configuration>
                    <executions>
                        <execution>
                            <goals>
                                <goal>repackage</goal>
                            </goals>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-war-plugin</artifactId>
                    <version>3.2.2</version>
                    <configuration>
                        <failOnMissingWebXml>false</failOnMissingWebXml>
    &lt;!&ndash;                    <warName>${project.artifactId}</warName>&ndash;&gt;
                        <warName>ltkj-admin</warName>
                    </configuration>
                </plugin>
            </plugins>
            <finalName>ltkj-admin</finalName>
        </build>
-->
    <!--
            <build>
                <plugins>
                    &lt;!&ndash; maven打包插件&ndash;&gt;
                    <plugin>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-maven-plugin</artifactId>
                    </plugin>
                    <plugin>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-maven-plugin</artifactId>
                        <version>2.1.1.RELEASE</version>
                        <configuration>
                            <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;
                        </configuration>
                        <executions>
                            <execution>
                                <goals>
                                    <goal>repackage</goal>
                                </goals>
                            </execution>
                        </executions>
                    </plugin>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-war-plugin</artifactId>
                        <version>3.2.2</version>
                        <configuration>
                            <failOnMissingWebXml>false</failOnMissingWebXml>
        &lt;!&ndash;                    <warName>${project.artifactId}</warName>&ndash;&gt;
                            <warName>ltkj-admin</warName>
                        </configuration>
                    </plugin>
                </plugins>
                <finalName>ltkj-admin</finalName>
            </build>
    -->

    <build>
        <plugins>
@@ -247,6 +280,17 @@
                    <warName>${project.artifactId}</warName>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <version>3.2.0</version>
                <configuration>
                    <excludes>
                        <!-- 排除 Font 文件夹 -->
                        <exclude>**/Font/**</exclude>
                    </excludes>
                </configuration>
            </plugin>
        </plugins>
        <finalName>${project.artifactId}</finalName>
    </build>