Merge remote-tracking branch 'origin/jsxswms' into jsxswms

zhou zhou

21 小时以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

 pom.xml

@@ -11,7 +11,7 @@
    <groupId>com.zy</groupId>
    <artifactId>asrs</artifactId>
    <version>1.1.1</version>
    <packaging>war</packaging>
    <packaging>jar</packaging>

    <properties>
        <java.version>1.8</java.version>
@@ -21,8 +21,12 @@
        <fastjson.version>1.2.58</fastjson.version>
        <springfox.version>2.7.0</springfox.version>
    </properties>

    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
@@ -37,9 +41,21 @@
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <!-- 使用本地 JAR 解决缺失的 cn.cool:framework:jar:3.2.0 -->
        <dependency>
            <groupId>cn.cool</groupId>
            <artifactId>framework</artifactId>
            <version>${cool.version}</version>
            <version>3.2.0</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/version/lib/framework-3.2.0.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>org.apache.tika</groupId>
            <artifactId>tika-core</artifactId>
            <version>2.1.0</version>
        </dependency>
        <dependency>
            <groupId>mysql</groupId>
@@ -103,10 +119,15 @@
            <artifactId>okhttp</artifactId>
            <version>3.10.0</version>
        </dependency>
        <dependency>
            <groupId>de.schlichtherle.truelicense</groupId>
            <artifactId>truelicense-core</artifactId>
            <version>1.33</version>
        </dependency>
    </dependencies>

    <build>
        <finalName>lywms</finalName>
        <finalName>wms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>