admin 1 year ago
parent
commit
263d58cda2

+ 2 - 0
.idea/encodings.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/file-starter/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xsky-service/src/main/java" charset="UTF-8" />
   </component>
 </project>

+ 0 - 1
.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="JsBuildToolPackageJson" sorting="DEFINITION_ORDER" />

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

+ 49 - 0
file-starter/pom.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.itheima</groupId>
+        <artifactId>wukuang-demo</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>file-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>7.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

+ 2 - 2
src/main/java/com/itheima/file/config/MinIOConfig.java → file-starter/src/main/java/com/heima/file/config/MinIOConfig.java

@@ -1,6 +1,6 @@
-package com.itheima.file.config;
+package com.heima.file.config;
 
-import com.itheima.file.service.FileStorageService;
+import com.heima.file.service.FileStorageService;
 import io.minio.MinioClient;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
src/main/java/com/itheima/file/config/MinIOConfigProperties.java → file-starter/src/main/java/com/heima/file/config/MinIOConfigProperties.java

@@ -1,4 +1,4 @@
-package com.itheima.file.config;
+package com.heima.file.config;
 
 
 import lombok.Data;

+ 1 - 1
src/main/java/com/itheima/file/service/FileStorageService.java → file-starter/src/main/java/com/heima/file/service/FileStorageService.java

@@ -1,4 +1,4 @@
-package com.itheima.file.service;
+package com.heima.file.service;
 
 import java.io.InputStream;
 

+ 4 - 4
src/main/java/com/itheima/file/service/impl/MinIOFileStorageService.java → file-starter/src/main/java/com/heima/file/service/impl/MinIOFileStorageService.java

@@ -1,8 +1,8 @@
-package com.itheima.file.service.impl;
+package com.heima.file.service.impl;
 
-import com.itheima.file.config.MinIOConfig;
-import com.itheima.file.config.MinIOConfigProperties;
-import com.itheima.file.service.FileStorageService;
+import com.heima.file.config.MinIOConfig;
+import com.heima.file.config.MinIOConfigProperties;
+import com.heima.file.service.FileStorageService;
 import io.minio.GetObjectArgs;
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;

+ 1 - 1
src/main/resources/META-INF/spring.factories → file-starter/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.itheima.file.service.impl.MinIOFileStorageService
+  com.heima.file.service.impl.MinIOFileStorageService

+ 5 - 56
pom.xml

@@ -7,6 +7,11 @@
     <groupId>com.itheima</groupId>
     <artifactId>wukuang-demo</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>file-starter</module>
+        <module>xsky-service</module>
+    </modules>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -20,62 +25,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.dameng/DmJdbcDriver18 -->
-
-<!--         docker load -i dm8_20220822_rev166351_x86_rh6_64_ctm.tar-->
-<!--docker run -d -p 5236:5236 &#45;&#45;restart=always &#45;&#45;name dm8_single &#45;&#45;privileged=true -e PAGE_SIZE=16 \-->
-<!-- -e LD_LIBRARY_PATH=/opt/dmdbms/bin -e INSTANCE_NAME=dm8_single \-->
-<!-- -v /data/dm8_01:/opt/dmdbms/data dm8_single:v8.1.2.128_ent_x86_64_ctm_pack4-->
-
-<!--docker logs -f dm8_01-->
-
-        <dependency>
-            <groupId>com.dameng</groupId>
-            <artifactId>DmJdbcDriver18</artifactId>
-            <version>8.1.3.140</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>7.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-    </dependencies>
 
 </project>

+ 65 - 0
xsky-service/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.itheima</groupId>
+        <artifactId>wukuang-demo</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>xsky-service</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.dameng/DmJdbcDriver18 -->
+
+        <!--         docker load -i dm8_20220822_rev166351_x86_rh6_64_ctm.tar-->
+        <!--docker run -d -p 5236:5236 &#45;&#45;restart=always &#45;&#45;name dm8_single &#45;&#45;privileged=true -e PAGE_SIZE=16 \-->
+        <!-- -e LD_LIBRARY_PATH=/opt/dmdbms/bin -e INSTANCE_NAME=dm8_single \-->
+        <!-- -v /data/dm8_01:/opt/dmdbms/data dm8_single:v8.1.2.128_ent_x86_64_ctm_pack4-->
+
+        <!--docker logs -f dm8_01-->
+
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.3.140</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.itheima</groupId>
+            <artifactId>file-starter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+</project>

+ 0 - 0
src/main/java/com/itheima/App.java → xsky-service/src/main/java/com/itheima/App.java


+ 25 - 0
xsky-service/src/main/java/com/itheima/file/controller/WmMaterialController.java

@@ -0,0 +1,25 @@
+package com.itheima.file.controller;
+
+import com.itheima.file.service.WmMaterialService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/v1/material")
+public class WmMaterialController {
+
+    @Autowired
+    private WmMaterialService wmMaterialService;
+
+    @PostMapping("upload_picture")
+    public String uploadPicture(MultipartFile multipartFile) {
+        return wmMaterialService.uploadPicture(multipartFile);
+    }
+
+}

+ 9 - 0
xsky-service/src/main/java/com/itheima/file/service/WmMaterialService.java

@@ -0,0 +1,9 @@
+package com.itheima.file.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public interface WmMaterialService {
+
+    String uploadPicture(MultipartFile multipartFile);
+
+}

+ 43 - 0
xsky-service/src/main/java/com/itheima/file/service/impl/WmMaterialServiceImpl.java

@@ -0,0 +1,43 @@
+package com.itheima.file.service.impl;
+
+import com.heima.file.service.FileStorageService;
+import com.itheima.file.service.WmMaterialService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.UUID;
+
+@Slf4j
+@Service
+public class WmMaterialServiceImpl implements WmMaterialService {
+
+    @Autowired
+    private FileStorageService fileStorageService;
+
+    @Override
+    public String uploadPicture(MultipartFile multipartFile) {
+        // 1 检查参数
+        if (multipartFile.isEmpty() || multipartFile.getSize() == 0) {
+            return "上传失败";
+        }
+        // 2 上传图片到minio中
+        String fileName = UUID.randomUUID().toString().replace("-", "");
+        // 文件名
+        String originalFilename = multipartFile.getOriginalFilename();
+        // 后缀名
+        String postfix = originalFilename.substring(originalFilename.lastIndexOf("."));
+        String newFileName = fileName + postfix;
+        String fileId = "";
+        try {
+            fileId = fileStorageService.uploadImgFile("", newFileName, multipartFile.getInputStream());
+            log.debug("上传图片到minio, fileId:{}", fileId);
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.error("WmMaterialServiceImpl---上传图片到minio失败");
+        }
+        return null;
+    }
+}

+ 7 - 0
xsky-service/src/main/java/com/itheima/file/test/XSkyTest.java

@@ -0,0 +1,7 @@
+package com.itheima.file.test;
+
+public class XSkyTest {
+    public static void main(String[] args) {
+
+    }
+}

+ 11 - 11
src/main/resources/application.yml → xsky-service/src/main/resources/application.yml

@@ -1,14 +1,14 @@
 spring:
   datasource:
     driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://139.198.181.54:3306/big_event?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+    url: jdbc:dm://10.2.147.94:5236/wukuang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
     username: SYSDBA
     password: SYSDBA
-  data:
-    redis:
-      host: 139.198.181.54
-      password: Dcp#7ujm
-      port: 6379
+
+  redis:
+    host: 139.198.181.54
+    password: Dcp#7ujm
+    port: 6379
 
 server:
   port: 8081
@@ -21,8 +21,8 @@ mybatis-plus:
     map-underscore-to-camel-case: true
 
 minio:
-  accessKey:
-  secretKey: 
-  bucket:
-  endpoint:
-  readPath:
+  accessKey: 5B0Q15E4KV8VRH290VE8
+  secretKey: tPRqRjVMLbGwsBvBOYHc38G5yjQb6R6VHP2dpCaB
+  bucket: wk-ppglxt
+  endpoint: http://10.2.11.39:8060/
+  readPath: d:/logs