From 1f45c25ea725445d7e78e8d5da6e72150f35f2eb Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 20 十二月 2024 11:09:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/PlatformApplication.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/PlatformApplication.java b/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
index e668187..2e2b512 100644
--- a/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
+++ b/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
@@ -1,9 +1,13 @@
package com.ycl;
+import com.dahua.netsdk.AppDemo;
+import com.ycl.util.VideoUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.core.env.Environment;
@@ -19,10 +23,10 @@
@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
@EnableAsync(proxyTargetClass = true)
@EnableScheduling
+@EnableFeignClients
@EnableTransactionManagement(proxyTargetClass = true)
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "com.ycl")
public class PlatformApplication {
-
public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext application = SpringApplication.run(PlatformApplication.class, args);
@@ -38,6 +42,11 @@
env.getProperty("server.servlet.context-path"),
"127.0.0.1",
env.getProperty("server.port"));
- }
+ try {
+ new AppDemo().start();
+ } catch (Exception e) {
+ log.info("鎵ц澶у崕鎶ヨ绋嬪簭鍑洪敊锛�", e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0