guzijian / wvp-GB28181-pro · Commits

Commit 57192a49d1e6c441389bb54f968b93744b5eadac

Authored by 648540858
1 parent 6bbac849

修复引入的错误Order

Inline Side-by-side
Showing 8 changed files with 8 additions and 8 deletions
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
  View file @57192a4
@@ -2,11 +2,11 @@ package com.genersoft.iot.vmp.conf; @@ -2,11 +2,11 @@ package com.genersoft.iot.vmp.conf;
2 2
3 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 3 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
4 import com.genersoft.iot.vmp.utils.DateUtil; 4 import com.genersoft.iot.vmp.utils.DateUtil;
5 -import org.junit.jupiter.api.Order;  
6 import org.slf4j.Logger; 5 import org.slf4j.Logger;
7 import org.slf4j.LoggerFactory; 6 import org.slf4j.LoggerFactory;
8 import org.springframework.beans.factory.annotation.Value; 7 import org.springframework.beans.factory.annotation.Value;
9 import org.springframework.context.annotation.Configuration; 8 import org.springframework.context.annotation.Configuration;
  9 +import org.springframework.core.annotation.Order;
10 import org.springframework.util.ObjectUtils; 10 import org.springframework.util.ObjectUtils;
11 11
12 import java.net.InetAddress; 12 import java.net.InetAddress;
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
  View file @57192a4
@@ -5,7 +5,7 @@ import com.genersoft.iot.vmp.service.IMediaServerService; @@ -5,7 +5,7 @@ import com.genersoft.iot.vmp.service.IMediaServerService;
5 import org.apache.http.HttpHost; 5 import org.apache.http.HttpHost;
6 import org.apache.http.HttpRequest; 6 import org.apache.http.HttpRequest;
7 import org.apache.http.HttpResponse; 7 import org.apache.http.HttpResponse;
8 -import org.junit.jupiter.api.Order; 8 +import org.springframework.core.annotation.Order;
9 import org.mitre.dsmiley.httpproxy.ProxyServlet; 9 import org.mitre.dsmiley.httpproxy.ProxyServlet;
10 import org.slf4j.Logger; 10 import org.slf4j.Logger;
11 import org.slf4j.LoggerFactory; 11 import org.slf4j.LoggerFactory;
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
  View file @57192a4
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 3
4 -import org.junit.jupiter.api.Order; 4 +import org.springframework.core.annotation.Order;
5 import org.springframework.boot.context.properties.ConfigurationProperties; 5 import org.springframework.boot.context.properties.ConfigurationProperties;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
  View file @57192a4
@@ -4,7 +4,7 @@ import io.swagger.v3.oas.models.OpenAPI; @@ -4,7 +4,7 @@ import io.swagger.v3.oas.models.OpenAPI;
4 import io.swagger.v3.oas.models.info.Contact; 4 import io.swagger.v3.oas.models.info.Contact;
5 import io.swagger.v3.oas.models.info.Info; 5 import io.swagger.v3.oas.models.info.Info;
6 import io.swagger.v3.oas.models.info.License; 6 import io.swagger.v3.oas.models.info.License;
7 -import org.junit.jupiter.api.Order; 7 +import org.springframework.core.annotation.Order;
8 import org.springdoc.core.GroupedOpenApi; 8 import org.springdoc.core.GroupedOpenApi;
9 import org.springframework.beans.factory.annotation.Value; 9 import org.springframework.beans.factory.annotation.Value;
10 import org.springframework.context.annotation.Bean; 10 import org.springframework.context.annotation.Bean;
src/main/java/com/genersoft/iot/vmp/conf/ThreadPoolTaskConfig.java
  View file @57192a4
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import org.junit.jupiter.api.Order;  
4 import org.springframework.context.annotation.Bean; 3 import org.springframework.context.annotation.Bean;
5 import org.springframework.context.annotation.Configuration; 4 import org.springframework.context.annotation.Configuration;
  5 +import org.springframework.core.annotation.Order;
6 import org.springframework.scheduling.annotation.EnableAsync; 6 import org.springframework.scheduling.annotation.EnableAsync;
7 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; 7 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
8 8
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
  View file @57192a4
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import org.junit.jupiter.api.Order; 3 +import org.springframework.core.annotation.Order;
4 import org.springframework.boot.context.properties.ConfigurationProperties; 4 import org.springframework.boot.context.properties.ConfigurationProperties;
5 import org.springframework.stereotype.Component; 5 import org.springframework.stereotype.Component;
6 6
src/main/java/com/genersoft/iot/vmp/conf/VersionConfig.java
  View file @57192a4
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import org.junit.jupiter.api.Order; 3 +import org.springframework.core.annotation.Order;
4 import org.springframework.boot.context.properties.ConfigurationProperties; 4 import org.springframework.boot.context.properties.ConfigurationProperties;
5 import org.springframework.stereotype.Component; 5 import org.springframework.stereotype.Component;
6 6
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
  View file @57192a4
1 package com.genersoft.iot.vmp.conf.security; 1 package com.genersoft.iot.vmp.conf.security;
2 2
3 import com.genersoft.iot.vmp.conf.UserSetting; 3 import com.genersoft.iot.vmp.conf.UserSetting;
4 -import org.junit.jupiter.api.Order; 4 +import org.springframework.core.annotation.Order;
5 import org.slf4j.Logger; 5 import org.slf4j.Logger;
6 import org.slf4j.LoggerFactory; 6 import org.slf4j.LoggerFactory;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;