修改

heheng

5 天以前 3aacec366786f81ec475b8577d6c857faa427252

修改

 multi-common/pom.xml

@@ -152,29 +152,29 @@
            <artifactId>easyexcel</artifactId>
        </dependency>

        <dependency>
            <groupId>com.deepoove</groupId>
            <artifactId>poi-tl</artifactId>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.deepoove</groupId>-->
<!--            <artifactId>poi-tl</artifactId>-->
<!--        </dependency>-->

        <!-- 如果需要解析HTML -->
        <dependency>
            <groupId>org.jsoup</groupId>
            <artifactId>jsoup</artifactId>
        </dependency>
        <dependency>
            <groupId>com.itextpdf</groupId>
            <artifactId>itextpdf</artifactId>
        </dependency>
        <dependency>
            <groupId>org.bouncycastle</groupId>
            <artifactId>bcprov-jdk15on</artifactId>
        </dependency>
        <!-- 支持中文 -->
        <dependency>
            <groupId>com.itextpdf</groupId>
            <artifactId>itext-asian</artifactId>
        </dependency>
<!--        &lt;!&ndash; 如果需要解析HTML &ndash;&gt;-->
<!--        <dependency>-->
<!--            <groupId>org.jsoup</groupId>-->
<!--            <artifactId>jsoup</artifactId>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>com.itextpdf</groupId>-->
<!--            <artifactId>itextpdf</artifactId>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>org.bouncycastle</groupId>-->
<!--            <artifactId>bcprov-jdk15on</artifactId>-->
<!--        </dependency>-->
<!--        &lt;!&ndash; 支持中文 &ndash;&gt;-->
<!--        <dependency>-->
<!--            <groupId>com.itextpdf</groupId>-->
<!--            <artifactId>itext-asian</artifactId>-->
<!--        </dependency>-->

    </dependencies>


 multi-common/src/main/java/com/gkhy/exam/common/config/FFmpegConfig.java

@@ -20,8 +20,8 @@
    @Bean
    public FFmpeg fFmpeg() {
        String path = System.getProperty("user.dir");
        if(path.endsWith("multi-admin")){
            path=path.replace("\\multi-admin","");
        if(path.endsWith("exam-admin")){
            path=path.replace("\\exam-admin","");
        }
        if (isLinux()){
            path+="/ffmpeg/ffmpeg-linux/ffmpeg";

 pom.xml

@@ -204,35 +204,35 @@
                <artifactId>easyexcel</artifactId>
                <version>${easyexcel.version}</version>
            </dependency>
            <dependency>
                <groupId>com.deepoove</groupId>
                <artifactId>poi-tl</artifactId>
                <version>1.10.0</version>
            </dependency>
<!--            <dependency>-->
<!--                <groupId>com.deepoove</groupId>-->
<!--                <artifactId>poi-tl</artifactId>-->
<!--                <version>1.10.0</version>-->
<!--            </dependency>-->

            <!-- 如果需要解析HTML -->
            <dependency>
                <groupId>org.jsoup</groupId>
                <artifactId>jsoup</artifactId>
                <version>1.15.3</version>
            </dependency>
<!--            &lt;!&ndash; 如果需要解析HTML &ndash;&gt;-->
<!--            <dependency>-->
<!--                <groupId>org.jsoup</groupId>-->
<!--                <artifactId>jsoup</artifactId>-->
<!--                <version>1.15.3</version>-->
<!--            </dependency>-->

            <dependency>
                <groupId>com.itextpdf</groupId>
                <artifactId>itextpdf</artifactId>
                <version>5.5.13.3</version>
            </dependency>
            <dependency>
                <groupId>org.bouncycastle</groupId>
                <artifactId>bcprov-jdk15on</artifactId>
                <version>1.68</version>
            </dependency>
            <!-- 支持中文 -->
            <dependency>
                <groupId>com.itextpdf</groupId>
                <artifactId>itext-asian</artifactId>
                <version>5.2.0</version>
            </dependency>
<!--            <dependency>-->
<!--                <groupId>com.itextpdf</groupId>-->
<!--                <artifactId>itextpdf</artifactId>-->
<!--                <version>5.5.13.3</version>-->
<!--            </dependency>-->
<!--            <dependency>-->
<!--                <groupId>org.bouncycastle</groupId>-->
<!--                <artifactId>bcprov-jdk15on</artifactId>-->
<!--                <version>1.68</version>-->
<!--            </dependency>-->
<!--            &lt;!&ndash; 支持中文 &ndash;&gt;-->
<!--            <dependency>-->
<!--                <groupId>com.itextpdf</groupId>-->
<!--                <artifactId>itext-asian</artifactId>-->
<!--                <version>5.2.0</version>-->
<!--            </dependency>-->


        </dependencies>