重新调整测试页面

jiazx0107@163.com

2023-11-09 eebab358e2882fc7e3aeec152db5151a6bd0be02

 pom.xml

@@ -13,7 +13,6 @@
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <spring.boot.version>2.1.2.RELEASE</spring.boot.version>
      <spring.version>5.1.1.RELEASE</spring.version>
      <dorado.version>7.6.0-SNAPSHOT</dorado.version>
      <druid.version>1.2.8</druid.version>
      <mysql.version>5.1.45</mysql.version>
      <fastjson.version>2.0.10</fastjson.version>
@@ -28,7 +27,7 @@
      <dependency>
         <groupId>com.bstek.dorado</groupId>
         <artifactId>dorado-core</artifactId>
         <version>${dorado.version}</version>
         <version>7.6.0</version>
         <exclusions>
            <exclusion>
               <groupId>org.slf4j</groupId>
@@ -38,10 +37,14 @@
               <artifactId>javassist</artifactId>
               <groupId>javassist</groupId>
            </exclusion>
            <exclusion>
               <artifactId>dom4j</artifactId>
               <groupId>dom4j</groupId>
            </exclusion>
         </exclusions>
      </dependency>
		
		


      <dependency>
         <groupId>com.bstek.dorado</groupId>
         <artifactId>dorado-uploader</artifactId>
@@ -65,21 +68,21 @@
            </exclusion>
         </exclusions>
      </dependency>
		
		


      <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
            <version>2.9.8</version>
<!--             <scope>runtime</scope>-->
        </dependency>
        
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
         <version>2.9.8</version>
<!--            <scope>runtime</scope>-->
        </dependency>
         <!-- <scope>runtime</scope> -->
      </dependency>

      <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
         <version>2.9.8</version>
         <!-- <scope>runtime</scope> -->
      </dependency>

      <!-- springBoot -->
      <dependency>
@@ -107,11 +110,45 @@
         <version>${spring.boot.version}</version>
      </dependency>

      <!-- websocket -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-websocket</artifactId>
         <version>${spring.boot.version}</version>
      </dependency>


      <!-- mqtt -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-integration</artifactId>
         <version>${spring.boot.version}</version>
      </dependency>

      <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-stream</artifactId>
         <version>5.2.0.RELEASE</version>
      </dependency>

      <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-mqtt</artifactId>
         <version>5.2.0.RELEASE</version>
      </dependency>

      <!-- thymeleaf -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-thymeleaf</artifactId>
         <version>${spring.boot.version}</version>
      </dependency>

      <!-- kafka -->
      <dependency>
         <groupId>org.springframework.kafka</groupId>
         <artifactId>spring-kafka</artifactId>
         <version>2.2.0.RELEASE</version>
      </dependency>

      <dependency>
@@ -126,12 +163,9 @@
         <version>1.4.01</version>
      </dependency>

      <!-- Security -->
      <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-core</artifactId>
         <version>${spring.security}</version>
      </dependency>
      <!-- Security <dependency> <groupId>org.springframework.security</groupId> 
         <artifactId>spring-security-core</artifactId> <version>${spring.security}</version> 
         </dependency> -->


      <!-- druid -->
@@ -142,6 +176,14 @@
      <!-- </dependency> -->


      <!-- 引入IO包 -->
      <dependency>
         <groupId>com.ld.base.io</groupId>
         <artifactId>base-io-netty</artifactId>
         <version>1.0.0-SNAPSHOT</version>
      </dependency>


      <!-- mysql连接 -->
      <dependency>
         <groupId>mysql</groupId>
@@ -150,13 +192,12 @@
      </dependency>


      <!-- JSON-->
      <!-- JSON -->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>fastjson</artifactId>
         <version>${fastjson.version}</version>
      </dependency>
		 


      <!-- lombok -->
@@ -181,27 +222,57 @@
         <scope>system</scope>
         <systemPath>${project.basedir}/src/main/resources/lib/dorado-skin-sky-2.0.2.jar</systemPath>
      </dependency>
		

      <dependency>
         <groupId>com.sun.jna</groupId>
         <artifactId>examples</artifactId>
         <version>3.0.9</version>
         <scope>system</scope>
         <systemPath>${project.basedir}/src/main/resources/lib/examples.jar</systemPath>
      </dependency>

<!--      <dependency>-->
<!--         <groupId>net.java.dev.jna</groupId>-->
<!--         <artifactId>jna</artifactId>-->
<!--         <version>4.2.1</version>-->
<!--      </dependency>-->
<!--      <dependency>-->
<!--         <groupId>com.sun.jna</groupId>-->
<!--         <artifactId>jna</artifactId>-->
<!--         <version>3.0.9</version>-->
<!--         <scope>system</scope>-->
<!--         <systemPath>${project.basedir}/src/main/resources/lib/jna.jar</systemPath>-->
<!--      </dependency>-->

      <dependency>
         <groupId>com.sun.jna</groupId>
         <artifactId>jna</artifactId>
         <version>3.0.9</version>
      </dependency>




      <!-- 集成httpclient -->
      <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
         <version>4.4.1</version>
      </dependency>
		

      <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
         <version>4.4.1</version>
      </dependency>
		

      <!-- 国密 -->
      <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-jdk15on</artifactId>
         <version>1.70</version>
      </dependency>
		

      <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-ext-jdk15on</artifactId>
@@ -255,31 +326,28 @@
         <artifactId>cxf-rt-ws-policy</artifactId>
         <version>3.2.2</version>
      </dependency>
		
<!--      <dependency>-->
<!--         <groupId>org.apache.cxf</groupId>-->
<!--         <artifactId>cxf-spring-boot-autoconfigure</artifactId>-->
<!--         <version>3.2.2</version>-->
<!--      </dependency>-->
<!--      <dependency>-->
<!--         <groupId>org.apache.cxf</groupId>-->
<!--         <artifactId>cxf-spring-boot-starter-jaxws</artifactId>-->
<!--         <version>3.2.2</version>-->
<!--      </dependency>-->

      <!-- <dependency> -->
      <!-- <groupId>org.apache.cxf</groupId> -->
      <!-- <artifactId>cxf-spring-boot-autoconfigure</artifactId> -->
      <!-- <version>3.2.2</version> -->
      <!-- </dependency> -->
      <!-- <dependency> -->
      <!-- <groupId>org.apache.cxf</groupId> -->
      <!-- <artifactId>cxf-spring-boot-starter-jaxws</artifactId> -->
      <!-- <version>3.2.2</version> -->
      <!-- </dependency> -->


   </dependencies>




   <build>
      <plugins>
         <!-- 设置编译版本 -->
         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-compiler-plugin</artifactId>
            <version>3.1</version>
            <configuration>
               <source>1.8</source>
               <target>1.8</target>
@@ -297,7 +365,19 @@
               </execution>
            </executions>
         </plugin>
        </plugins>
<!--         <plugin>-->
<!--            <groupId>org.springframework.boot</groupId>-->
<!--            <artifactId>spring-boot-maven-plugin</artifactId>-->
<!--            <executions>-->
<!--               <execution>-->
<!--                  <goals>-->
<!--                     <goal>repackage</goal>-->
<!--                  </goals>-->
<!--               </execution>-->
<!--            </executions>-->
<!--         </plugin>-->

      </plugins>

      <resources>
         <resource>
@@ -338,10 +418,10 @@


   <repositories>
      <repository>
         <id>sonatype</id>
         <url>https://oss.sonatype.org/content/groups/public/</url>
      </repository>
<!--      <repository>-->
<!--         <id>sonatype</id>-->
<!--         <url>https://oss.sonatype.org/content/groups/public/</url>-->
<!--      </repository>-->
      <repository>
         <id>bsdn-maven-repository</id>
         <url>http://nexus.bsdn.org/content/groups/public/</url>