modeling oss

4dkankan-center-modeling/pom.xml

@@ -7,7 +7,6 @@
 		<artifactId>4dkankan-parent</artifactId>
 		<version>2.0.0</version>
 	</parent>
-	<groupId>com.fdkankan</groupId>
 	<artifactId>4dkankan-center-modeling</artifactId>
 	<version>2.0.0</version>
 	<name>4dkankan-center-modeling</name>
@@ -72,20 +71,14 @@
 			<artifactId>firebase-admin</artifactId>
 			<version>6.8.1</version>
 		</dependency>
-		<dependency>
-			<groupId>com.fdkankan</groupId>
-			<artifactId>4dkankan-sdk-oss</artifactId>
-			<version>1.0.0</version>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.fdkankan</groupId>-->
+<!--			<artifactId>4dkankan-sdk-oss</artifactId>-->
+<!--			<version>1.0.0</version>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>jackson-annotations</artifactId>
-					<groupId>com.fasterxml.jackson.core</groupId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
@@ -102,19 +95,13 @@
 			<artifactId>lombok</artifactId>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
 <!--		<dependency>-->
-<!--			<groupId>org.springframework</groupId>-->
-<!--			<artifactId>spring-webmvc</artifactId>-->
-<!--			<version>5.3.13</version>-->
+<!--			<groupId>com.fasterxml.jackson.core</groupId>-->
+<!--			<artifactId>jackson-annotations</artifactId>-->
+<!--			<version>2.12.3</version>-->
 <!--		</dependency>-->
 
-		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.12.3</version>
-		</dependency>
-
 
 	</dependencies>
 

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneReceiver.java

@@ -18,7 +18,7 @@ import com.fdkankan.modeling.service.ISceneService;
 import com.fdkankan.modeling.utils.DingDingUtils;
 import com.fdkankan.modeling.utils.PushMsgUtil;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
-import com.fdkankan.oss.UploadUtils;
+import com.fdkankan.common.util.UploadToOssUtil;
 import com.fdkankan.platform.api.vo.User;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.utils.constant.ConstantFilePath;
@@ -42,6 +42,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
 import java.io.*;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -90,8 +91,8 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
     private String prefixAli;
 
 
-    @Autowired
-    private UploadUtils uploadUtils;
+    @Resource
+    private UploadToOssUtil uploadUtils;
 
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgExt,

4dkankan-center-modeling/src/main/resources/bootstrap.yml

@@ -15,6 +15,10 @@ spring:
           data-id: common-mq-config.yaml
           group: DEFAULT_GROUP
           refresh: true
+        extension-configs[2]:
+          data-id: oss-modeling-config.yaml
+          group: DEFAULT_GROUP
+          refresh: true
       discovery:
         server-addr: 192.168.0.47:8848
         namespace: 4dkankan-dev

4dkankan-center-scene/src/main/java/com/fdkankan/scene/TestController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene;
+
+import com.fdkankan.platform.api.feign.PlatformClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RequestMapping("/ts")
+@RestController
+public class TestController {
+
+    @Resource
+    PlatformClient platformClient;
+
+    @GetMapping("/test")
+    private void test(){
+        platformClient.getCompanyById(10006L);
+    }
+}

4dkankan-common-redis/pom.xml

@@ -45,19 +45,16 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.12.3</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.12.3</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.3</version>
         </dependency>
 
         <dependency>

4dkankan-common/src/main/java/com/fdkankan/common/util/UploadToOssUtil.java

@@ -113,7 +113,7 @@ public class UploadToOssUtil {
 
 
 	public void upload(String filePath, String key1) {
-		log.info("开始上传文件 源路径：{},目标路径：{}" , filePath,key1);
+		log.info("开始上传文件 源路径：{},目标路径：{},point:{}" , filePath,key1,point);
 		if("oss".equals(type)){
 			OSSClient ossClient = new OSSClient(point, key, secrey);
 			try {