浏览代码

modeling yml

lyhzzz 3 年之前
父节点
当前提交
4d345a65e6

+ 0 - 43
4dkankan-center-api/pom.xml

@@ -15,47 +15,4 @@
         <module>4dkankan-center-scene-api</module>
         <module>4dkankan-center-platform-api</module>
     </modules>
-
-    <properties>
-<!--        <java.version>1.8</java.version>-->
-<!--        <spring-cloud.version>2020.0.2</spring-cloud.version>-->
-<!--        <spring-cloud-alibaba.version>2020.0.RC1</spring-cloud-alibaba.version>-->
-<!--        <spring-boot.version>2.4.5</spring-boot.version>-->
-    </properties>
-
-    <dependencyManagement>
-<!--        <dependencies>-->
-<!--            <dependency>-->
-<!--                <groupId>com.fdkankan</groupId>-->
-<!--                <artifactId>4dkankan-common</artifactId>-->
-<!--                <version>2.0.0</version>-->
-<!--            </dependency>-->
-<!--            &lt;!&ndash; spring boot 依赖 &ndash;&gt;-->
-<!--            <dependency>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-dependencies</artifactId>-->
-<!--                <version>${spring-boot.version}</version>-->
-<!--                <type>pom</type>-->
-<!--                <scope>import</scope>-->
-<!--            </dependency>-->
-
-<!--            &lt;!&ndash; spring cloud 依赖 &ndash;&gt;-->
-<!--            <dependency>-->
-<!--                <groupId>org.springframework.cloud</groupId>-->
-<!--                <artifactId>spring-cloud-dependencies</artifactId>-->
-<!--                <version>${spring-cloud.version}</version>-->
-<!--                <type>pom</type>-->
-<!--                <scope>import</scope>-->
-<!--            </dependency>-->
-<!--            &lt;!&ndash; spring cloud alibaba 依赖 &ndash;&gt;-->
-<!--            <dependency>-->
-<!--                <groupId>com.alibaba.cloud</groupId>-->
-<!--                <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
-<!--                <version>${spring-cloud-alibaba.version}</version>-->
-<!--                <type>pom</type>-->
-<!--                <scope>import</scope>-->
-<!--            </dependency>-->
-<!--        </dependencies>-->
-    </dependencyManagement>
-
 </project>

+ 5 - 5
4dkankan-center-modeling/pom.xml

@@ -71,11 +71,11 @@
 			<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>

+ 20 - 0
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/TestController.java

@@ -0,0 +1,20 @@
+package com.fdkankan.modeling;
+
+import com.fdkankan.oss.UploadUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/ts")
+public class TestController {
+
+    @Autowired
+    private UploadUtils uploadUtils;
+    @GetMapping("/up")
+    private void upload(){
+        uploadUtils.upload("C:\\Users\\Admin\\Desktop\\fsdownload\\Up.txt","testUp/up.txt");
+        uploadUtils.upload2("C:\\Users\\Admin\\Desktop\\fsdownload\\Up1.txt","testUp/up1.txt");
+    }
+}

+ 1 - 1
4dkankan-sdk-oss/src/main/java/com/fdkankan/oss/UploadUtils.java

@@ -25,7 +25,7 @@ public class UploadUtils {
     @Value("${oss.secrey}")
     private String secrey;
 
-    @Value("${oss.bucket}")
+    @Value("${oss.bucket.bucket}")
     private String bucket;
 
     public void upload(String filePath, String key1) {

+ 0 - 2
4dkankan-sdk-oss/src/main/resources/bootstrap.yml

@@ -1,2 +0,0 @@
-oss:
-  type: oss

+ 0 - 2
4dkankan-sdk-oss/target/classes/bootstrap.yml

@@ -1,2 +0,0 @@
-oss:
-  type: oss