zh

.drone.yml

@@ -0,0 +1,60 @@
+kind: pipeline
+type: docker
+name: master
+steps:
+  - name: restore-cache
+    image: meltwater/drone-cache
+    settings:
+      backend: filesystem
+      restore: true
+      cache_key: "maven"
+      archive_format: gzip
+      filesystem_cache_root: "/var/lib/cache"
+      mount:
+        - "maven"
+    volumes:
+      - name: cache
+        path: "/var/lib/cache"
+  # Do stuff..
+  - name: build
+    image: maven:3.8-openjdk-8
+    commands:
+      - mkdir /root/.m2
+      - cp /usr/share/maven/ref/settings-docker.xml /root/.m2/settings.xml
+      - sed -i 's/\\/usr\\/share\\/maven\\/ref\\/repository/\\/drone\\/src\\/maven/g' /root/.m2/settings.xml
+      - mvn package
+  - name: rebuild-cache
+    image: meltwater/drone-cache
+    settings:
+      backend: filesystem
+      rebuild: true
+      cache_key: "maven"
+      archive_format: gzip
+      filesystem_cache_root: "/var/lib/cache"
+      mount:
+        - "maven"
+    volumes:
+      - name: cache
+        path: "/var/lib/cache"
+  - name: docker
+    image: plugins/docker
+    settings:
+      dockerfile: "Dockerfile.drone"
+      repo: harbor.oa00.com/sws/project0512
+      registry: harbor.oa00.com
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      tags:
+        - master
+volumes:
+  - name: cache
+    host:
+      path: "/var/lib/cache"
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - merge

Dockerfile

@@ -0,0 +1,11 @@
+# 编译
+FROM maven:3.8-openjdk-8
+COPY . /build/
+WORKDIR /build
+RUN mvn package
+# 运行阶段
+FROM openjdk:8-jdk-alpine
+# 从编译阶段的中拷贝编译结果到当前镜像中
+COPY --from=0 /build/target/project0512-0.0.1-SNAPSHOT.jar /work/project0512-0.0.1-SNAPSHOT.jar
+WORKDIR /work
+ENTRYPOINT ["java","-jar","project0512-0.0.1-SNAPSHOT.jar","--spring.profiles.active=test"]

Dockerfile.drone

@@ -0,0 +1,6 @@
+FROM openjdk:8-jdk-alpine
+# 从编译阶段的中拷贝编译结果到当前镜像中
+COPY ./target/project0512-0.0.1-SNAPSHOT.jar /work/project0512-0.0.1-SNAPSHOT.jar
+WORKDIR /work
+ENTRYPOINT ["java","-jar","project0512-0.0.1-SNAPSHOT.jar","--spring.profiles.active=test"]
+

src/main/java/com/zh/project0512/controller/TaskController.java

@@ -125,6 +125,22 @@ public class TaskController {
         return Result.success(obj);
     }
 
-
+//    @Data
+//    static class StatusTaskParam {
+//        @NotNull(message = "id不能为空")
+//        @Min(value = 1, message = "id最小值为1")
+//        @Schema(title = "任务id")
+//        private Integer id;
+//        @Schema(title = "任务id")
+//        private Integer id;
+//        @Schema(title = "任务id")
+//        private Integer id;
+//    }
+//
+//    @Operation(summary = "详情")
+//    @PostMapping("/detail")
+//    public Result detail(@Validated @RequestBody StatusTaskParam param) {
+//
+//    }
 }
 

src/main/java/com/zh/project0512/controller/UtilsController.java

@@ -44,7 +44,7 @@ public class UtilsController {
     @Autowired
     private AliyunOss aliyunOss;
 
-    @Value("${img_upload_path}")
+    @Value("${web.uploadPath}")
     private String path;
 
     @Operation(summary="上传")
@@ -58,14 +58,15 @@ public class UtilsController {
 //        fileName=name;//图片名
         //  String suffixName = fileName.substring(fileName.lastIndexOf("."));//后缀名
         //String path = System.getProperty("user.home"); //文件存储位置  我放在了我的项目下
-        //获取jar包所在目录
-        ApplicationHome h = new ApplicationHome(getClass());
-        File jarF = h.getSource();
-        //在jar包所在目录下生成一个upload文件夹用来存储上传的图片
-        String dirPath = jarF.getParentFile().toString()+"/upload/";
-        System.out.println(dirPath);
-        File dest = new File(dirPath+fileName);
-//        File dest = new File(path+"/"+fileName);
+//        //获取jar包所在目录
+//        ApplicationHome h = new ApplicationHome(getClass());
+//        File jarF = h.getSource();
+//        //在jar包所在目录下生成一个upload文件夹用来存储上传的图片
+//        String dirPath = jarF.getParentFile().toString()+"/upload/";
+//        System.out.println(dirPath);
+//        System.out.println(path);
+//        File dest = new File(dirPath+fileName);
+        File dest = new File(path+"/"+fileName);
         if (!dest.getParentFile().exists()) {
             dest.getParentFile().mkdirs();
         }

src/main/resources/application-test.yml

@@ -1,19 +1,19 @@
 server:
-    port: 8081
+  port: 8080
 
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://121.41.171.43:3306/project0512?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://mysql:3306/project0512?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: project0512
     password: zhang123.
     hikari:
       max-lifetime: 500000
 
   redis:
-        host: 121.41.171.43
+    host: redis
     port: 6379
-        password: zhang123.
+    password:
     database: 15 # 指定redis的分库（共16个0到15）
     timeout: 5000
   jackson:
@@ -52,7 +52,7 @@ mybatis-plus:
       # 删除后
       logic-delete-value: 0
 web:
-    uploadPath: /www/wwwroot/project0512/upload/
+  uploadPath: /static/sws/upload/
 
 #springdoc:
 #    swagger-ui: