fix(docker): docker镜像制作相关

Dockerfile

@@ -0,0 +1,5 @@
+FROM java:8
+EXPOSE 8080
+ARG JAR_FILE
+ADD target/${JAR_FILE} /file-collect.jar
+ENTRYPOINT ["java", "-jar","/file-collect.jar"]

pom.xml

@@ -3,10 +3,10 @@
          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>
     <groupId>com.jiashun.gao</groupId>
-    <artifactId>power-system</artifactId>
+    <artifactId>file-collect</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>power-system</name>
-    <description>power-system project</description>
+    <name>file-collect</name>
+    <description>file-collect project</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,6 +15,7 @@
         <skipTests>true</skipTests>
         <docker.host>http://192.168.3.101:2375</docker.host>
         <docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
+        <docker.image.prefix>kekaida</docker.image.prefix>
         <druid.version>1.1.10</druid.version>
         <hutool.version>4.5.7</hutool.version>
         <swagger2.version>2.9.2</swagger2.version>
@@ -170,38 +171,124 @@
 
     <build>
         <plugins>
+            <!-- 基于maven-jar-plugin插件实现把依赖jar定义写入输出jar的META-INFO/MANIFEST文件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <!-- 拷贝项目所有依赖jar文件到构建lib目录下 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <!--
+                            各子模块按照实际层级定义各模块对应的属性值，检查所有微服务模块依赖jar文件合并复制到同一个目录
+                            详见各子模块中 boot-jar-output 属性定义
+                            -->
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <excludeTransitive>false</excludeTransitive>
+                            <stripVersion>false</stripVersion>
+                            <silent>false</silent>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Spring Boot模块jar构建 -->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <!-- 不存在的include引用，相当于排除所有maven依赖jar，没有任何三方jar文件打入输出jar -->
+                        <include>
+                            <groupId>null</groupId>
+                            <artifactId>null</artifactId>
+                        </include>
+                    </includes>
+                    <layout>ZIP</layout>
+                    <!--
+                    基于maven-jar-plugin输出微服务jar文件进行二次spring boot重新打包文件的输出目录
+                    所有微服务构建输出jar文件统一输出到与lib同一个目录，便于共同引用同一个lib目录
+                    详见各子模块中boot-jar-output属性定义
+                    -->
+                    <!--  -->
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.image.prefix}/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>${docker.maven.plugin.version}</version>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>build-image</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>build</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--                <configuration>-->
-<!--                    <imageName>power-system/${project.artifactId}:${project.version}</imageName>-->
-<!--                    <dockerHost>${docker.host}</dockerHost>-->
-<!--                    <baseImage>java:8</baseImage>-->
-<!--                    <entryPoint>["java", "-jar","/${project.build.finalName}.jar"]-->
-<!--                    </entryPoint>-->
-<!--                    <resources>-->
-<!--                        <resource>-->
-<!--                            <targetPath>/</targetPath>-->
-<!--                            <directory>${project.build.directory}</directory>-->
-<!--                            <include>${project.build.finalName}.jar</include>-->
-<!--                        </resource>-->
-<!--                    </resources>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
+            <!--            <plugin>-->
+            <!--                <groupId>com.spotify</groupId>-->
+            <!--                <artifactId>docker-maven-plugin</artifactId>-->
+            <!--                <version>${docker.maven.plugin.version}</version>-->
+            <!--                <executions>-->
+            <!--                    <execution>-->
+            <!--                        <id>build-image</id>-->
+            <!--                        <phase>package</phase>-->
+            <!--                        <goals>-->
+            <!--                            <goal>build</goal>-->
+            <!--                        </goals>-->
+            <!--                    </execution>-->
+            <!--                </executions>-->
+            <!--                <configuration>-->
+            <!--                    <imageName>file-collect/${project.artifactId}:${project.version}</imageName>-->
+            <!--                    <dockerHost>${docker.host}</dockerHost>-->
+            <!--                    <baseImage>java:8</baseImage>-->
+            <!--                    <entryPoint>["java", "-jar","/${project.build.finalName}.jar"]-->
+            <!--                    </entryPoint>-->
+            <!--                    <resources>-->
+            <!--                        <resource>-->
+            <!--                            <targetPath>/</targetPath>-->
+            <!--                            <directory>${project.build.directory}</directory>-->
+            <!--                            <include>${project.build.finalName}.jar</include>-->
+            <!--                        </resource>-->
+            <!--                    </resources>-->
+            <!--                </configuration>-->
+            <!--            </plugin>-->
         </plugins>
     </build>
 

sql/power-system.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
         #这里可替换为你自己的执行程序，其他代码无需更改
-        APP_NAME=power-system-1.0.0-SNAPSHOT.jar
+        APP_NAME=file-collect-1.0.0-SNAPSHOT.jar
 
         #使用说明，用来提示输入参数
         usage() {

src/main/java/com/macro/mall/tiny/config/SwaggerConfig.java

@@ -17,8 +17,8 @@ public class SwaggerConfig extends BaseSwaggerConfig {
     public SwaggerProperties swaggerProperties() {
         return SwaggerProperties.builder()
                 .apiBasePackage("com.macro.mall.tiny.modules")
-                .title("power-system项目骨架")
-                .description("power-system项目骨架相关接口文档")
+                .title("file-collect项目骨架")
+                .description("file-collect项目骨架相关接口文档")
                 .contactName("jiashun")
                 .version("1.0")
                 .enableSecurity(true)

src/main/java/com/macro/mall/tiny/modules/business/controller/FileController.java

@@ -64,7 +64,6 @@ public class FileController {
         String lineName = fileUploadParam.getLineName();
         String provinceId = fileUploadParam.getProvince();
         String cityId = fileUploadParam.getCity();
-        String robotName = fileUploadParam.getRobotName();
         String voltage = fileUploadParam.getVoltage();
         String lineStatus = fileUploadParam.getLineStatus();
         Long serviceBegintimeTs = fileUploadParam.getServiceBegintimeTs();
@@ -77,7 +76,7 @@ public class FileController {
         String charset = fileUploadParam.getCharset();
 
         if (chunks != null && chunks != 0) {
-            fileService.uploadWithBlock(name, lineName, provinceId,cityId,robotName, voltage, lineStatus, serviceBegintimeTs, beginTower, endTower, size, chunks, chunk, file, charset);
+            fileService.uploadWithBlock(name, lineName, provinceId, cityId, voltage, lineStatus, serviceBegintimeTs, beginTower, endTower, size, chunks, chunk, file, charset);
         } else {
             fileService.upload(file);
         }

src/main/java/com/macro/mall/tiny/modules/business/dto/FileUploadParam.java

@@ -22,9 +22,6 @@ public class FileUploadParam {
     @ApiModelProperty(value = "上传压缩包所属城市ID")
     private String city;
 
-    @ApiModelProperty(value = "机器人名称")
-    private String robotName;
-
     @ApiModelProperty(value = "电压等级，例：直流220kV，交流xkV")
     private String voltage;
 

src/main/java/com/macro/mall/tiny/modules/business/model/KrBLine.java

@@ -52,9 +52,6 @@ public class KrBLine implements Serializable {
     @ApiModelProperty(value = "线路名称")
     private String lineName;
 
-    @ApiModelProperty(value = "机器人名称")
-    private String robotName;
-
     @ApiModelProperty(value = "电压等级，例：直流220kV，交流xkV")
     private String voltage;
 

src/main/java/com/macro/mall/tiny/modules/business/service/FileService.java

@@ -17,7 +17,7 @@ public interface FileService {
 
     void upload(MultipartFile file) throws IOException;
 
-    void uploadWithBlock(String name, String lineName, String provinceId, String cityId, String robotName, String voltage, String lineStatus, Long serviceBegintimeTs, Integer beginTower, Integer endTower, Long size, Integer chunks, Integer chunk, MultipartFile file, String charset) throws IOException;
+    void uploadWithBlock(String name, String lineName, String provinceId, String cityId, String voltage, String lineStatus, Long serviceBegintimeTs, Integer beginTower, Integer endTower, Long size, Integer chunks, Integer chunk, MultipartFile file, String charset) throws IOException;
 
     BDirectory getRootDirectory();
 

src/main/java/com/macro/mall/tiny/modules/business/service/impl/AsyncHandler.java

@@ -65,12 +65,13 @@ public class AsyncHandler {
 
     @Async
     @Transactional
-    public void handleDocument(String provinceId, String cityId, String fileSource, String lineName, String robotName, String voltage, String lineStatus, Long serviceBegintimeTs, Integer beginTower, Integer endTower, AdminUserDetails userDetails, String charset) {
+    public void handleDocument(String provinceId, String cityId, String fileSource, String lineName, String voltage, String lineStatus, Long serviceBegintimeTs, Integer beginTower, Integer endTower, AdminUserDetails userDetails, String charset) {
         StringBuilder warnMsg = new StringBuilder();
         KrBLine line = null;
         Long userId = null;
         try {
             if (provinceId == null) Asserts.fail("上传失败，省份不能为空，provinceId：" + provinceId);
+            if (cityId == null) Asserts.fail("上传失败，城市不能为空，cityId：" + cityId);
             if (userDetails == null) Asserts.fail("上传失败，未获取到当前用户");
 
             LambdaQueryWrapper<KrBRegionProvince> provinceWrapper = new QueryWrapper<KrBRegionProvince>().lambda().eq(KrBRegionProvince::getProvinceId, provinceId);
@@ -92,7 +93,6 @@ public class AsyncHandler {
                 newLine.setProvinceId(provinceId);
                 newLine.setCityId(cityId);
                 newLine.setLineName(lineName);
-                newLine.setRobotName(robotName);
                 newLine.setVoltage(voltage);
                 newLine.setLineStatus(lineStatus);
                 newLine.setServiceBegintime(new Date(serviceBegintimeTs));

src/main/java/com/macro/mall/tiny/modules/business/service/impl/FileServiceImpl.java

@@ -78,7 +78,6 @@ public class FileServiceImpl implements FileService {
                                 String lineName,
                                 String provinceId,
                                 String cityId,
-                                String robotName,
                                 String voltage,
                                 String lineStatus,
                                 Long serviceBegintimeTs,
@@ -96,7 +95,7 @@ public class FileServiceImpl implements FileService {
         if (isUploaded(name)) {
             removeKey(name);
             AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-            asyncHandler.handleDocument(provinceId, cityId, target, lineName, robotName, voltage, lineStatus, serviceBegintimeTs, beginTower, endTower, userDetails, charset);
+            asyncHandler.handleDocument(provinceId, cityId, target, lineName, voltage, lineStatus, serviceBegintimeTs, beginTower, endTower, userDetails, charset);
         }
     }
 

src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: power-system
+    name: file-collect
   profiles:
     active: dev
   servlet:

src/main/resources/mapper/business/KrBLineMapper.xml

@@ -9,7 +9,6 @@
                l.city_id,
                c.name city,
                l.line_name,
-               l.robot_name,
                l.voltage,
                l.line_status,
                l.service_begintime,
@@ -52,7 +51,6 @@
         l.city_id,
         c.name city,
         l.line_name,
-        l.robot_name,
         l.voltage,
         l.line_status,
         l.service_begintime,
@@ -106,7 +104,6 @@
         <result column="city_id" property="cityId"/>
         <result column="city" property="city"/>
         <result column="line_name" property="lineName"/>
-        <result column="robot_name" property="robotName"/>
         <result column="voltage" property="voltage"/>
         <result column="line_status" property="lineStatus"/>
         <result column="service_begintime" property="serviceBegintime"/>