Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 pom.xml

@@ -248,7 +248,13 @@
         <artifactId>springfox-swagger-ui</artifactId>
         <version>${swagger.version}</version>
      </dependency>
		

      <dependency>
         <groupId>com.github.ulisesbocchio</groupId>
         <artifactId>jasypt-spring-boot-starter</artifactId>
         <version>2.0.0</version>
      </dependency>

      <!-- 获取系统信息 -->
      <dependency>
         <groupId>com.github.oshi</groupId>
@@ -354,16 +360,15 @@
            <version>13.0</version>
            <scope>compile</scope>
        </dependency>

      <dependency>
         <groupId>com.ots</groupId>
         <artifactId>tai-ots-framework</artifactId>
         <version>1.0</version>
         <scope>system</scope>
         <systemPath>${project.basedir}/jar/tai-ots-framework-1.0.jar</systemPath>
         <systemPath>${project.basedir}/jar/tai-ots-framework.jar</systemPath>
      </dependency>

    </dependencies>
   </dependencies>

<!--   <build>-->
<!--      <finalName>${project.artifactId}</finalName>-->
@@ -397,6 +402,7 @@
               <mainClass>com.ots.OtsApplication</mainClass>
               <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
               <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
               <includeSystemScope>true</includeSystemScope>
            </configuration>
         </plugin>
         <plugin>