dengsixing 1 неделя назад
Родитель
Сommit
d799c51b7d
2 измененных файлов с 50 добавлено и 22 удалено
  1. 36 5
      pom.xml
  2. 14 17
      src/main/java/com/fdkankan/modeling/ModelingApplication.java

+ 36 - 5
pom.xml

@@ -32,6 +32,36 @@
 			<groupId>com.fdkankan</groupId>
 			<artifactId>4dkankan-utils-model</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.aliyun</groupId>
+					<artifactId>aliyun-java-sdk-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.aliyun</groupId>
+					<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.auth0</groupId>
+					<artifactId>java-jwt</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.bytedeco.javacpp-presets</groupId>
+					<artifactId>ffmpeg-platform</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>io.jsonwebtoken</groupId>
+					<artifactId>jjwt</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.bytedeco</groupId>
+					<artifactId>javacv-platform</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.amazonaws</groupId>
+					<artifactId>aws-java-sdk</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -129,15 +159,16 @@
 			<version>1.5.0</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.fdkankan</groupId>
-			<artifactId>4dkankan-utils-fyun-local</artifactId>
-			<version>3.0.0-SNAPSHOT</version>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.fdkankan</groupId>-->
+<!--			<artifactId>4dkankan-utils-fyun-s3</artifactId>-->
+<!--			<version>3.0.0-SNAPSHOT</version>-->
+<!--		</dependency>-->
 
 	</dependencies>
 
 	<build>
+		<finalName>${artifactId}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>

+ 14 - 17
src/main/java/com/fdkankan/modeling/ModelingApplication.java

@@ -2,7 +2,6 @@ package com.fdkankan.modeling;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.redis.util.RedisLockUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -33,8 +32,6 @@ public class ModelingApplication implements CommandLineRunner {
 	@Value("${spring.profiles.active:#{null}}")
 	private String profiles;
 
-	@Autowired(required = false)
-	private Optional<FYunFileServiceInterface> fYunFileService;
 
 	public static void main(String[] args) {
 
@@ -48,20 +45,20 @@ public class ModelingApplication implements CommandLineRunner {
 	@Override
 	public void run(String... args) throws Exception {
 
-		log.info("fYunFileService.isPresent():{}", fYunFileService.isPresent());
-		if(fYunFileService.isPresent() && StrUtil.isNotEmpty(profiles)){
-			//更新弹性伸缩jar包
-			boolean lock = redisLockUtil.lock("uploadModelingJar", 300);
-			try {
-				if(lock){
-					String jarPath = System.getProperty("java.class.path");
-					fYunFileService.get().uploadFile(jarPath, "elastic_model_jar/fdkk_" + profiles + "/" + FileUtil.getName(jarPath));
-				}
-			}finally {
-				redisLockUtil.unlockLua("uploadModelingJar");
-			}
-
-		}
+//		log.info("fYunFileService.isPresent():{}", fYunFileService.isPresent());
+//		if(fYunFileService.isPresent() && StrUtil.isNotEmpty(profiles)){
+//			//更新弹性伸缩jar包
+//			boolean lock = redisLockUtil.lock("uploadModelingJar", 300);
+//			try {
+//				if(lock){
+//					String jarPath = System.getProperty("java.class.path");
+//					fYunFileService.get().uploadFile(jarPath, "elastic_model_jar/fdkk_" + profiles + "/" + FileUtil.getName(jarPath));
+//				}
+//			}finally {
+//				redisLockUtil.unlockLua("uploadModelingJar");
+//			}
+//
+//		}
 
 	}
 }