sccg_server.git

parent: 948522fe | 补丁 | 提交 | ignore whitespace

zhanghua

2023-03-02 904f2b3a10d21a557e161cae6e0bad98c062d578

打包方式

6个文件已修改

	pom.xml	71 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-common/pom.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-generator/pom.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-platform/pom.xml	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-smoke/pom.xml	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pom.xml

@@ -2,85 +2,18 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>

    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <!-- 如果要把依赖一起打包,注释下面configuration -->
                <configuration>
                    <layout>ZIP</layout>
                    <classifier>execute</classifier>
                    <mainClass>none</mainClass>
                    <includes>
                        <!--将依赖剔除,只编译打包本项目-->
                        <include>
                            <groupId>nothing</groupId>
                            <artifactId>nothing</artifactId>
                        </include>
                    </includes>
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>

                </executions>
            </plugin>


            <!-- 跳过Test测试打包 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                </configuration>
            </plugin>

            <plugin>
                <artifactId>maven-dependency-plugin</artifactId>
                <configuration>
                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
                </configuration>
                <!--执行package时自动将依赖复制出来到/lib中-->
                <executions>
                    <execution>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-dependencies</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>


            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
                    <annotationProcessorPaths>
                        <path>
                            <groupId>org.projectlombok</groupId>
                            <artifactId>lombok</artifactId>
                            <version>1.18.20</version>
                        </path>
                    </annotationProcessorPaths>

                    <annotationProcessors>
                        <annotationProcessor>
                            lombok.launch.AnnotationProcessorHider$AnnotationProcessor
                        </annotationProcessor>
                    </annotationProcessors>

                    <source>${java.version}</source>
                    <target>${java.version}</target>
                </configuration>
            </plugin>
        </plugins>
    </build>

    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>

 ycl-common/pom.xml

@@ -45,6 +45,7 @@
                <artifactId>maven-resources-plugin</artifactId>
                <configuration>
                    <encoding>UTF-8</encoding>
                    <skip>true</skip>
                </configuration>
            </plugin>
        </plugins>

 ycl-generator/pom.xml

@@ -92,6 +92,9 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                </configuration>
            </plugin>
        </plugins>
    </build>

 ycl-platform/pom.xml

@@ -39,13 +39,73 @@
    </dependencies>

    <build>
        <finalName>ycl-platform</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <!-- 如果要把依赖一起打包,注释下面configuration -->
                <configuration>
                    <layout>ZIP</layout>
                    <includes>
                        <!--将依赖剔除,只编译打包本项目-->
                        <include>
                            <groupId>nothing</groupId>
                            <artifactId>nothing</artifactId>
                        </include>
                    </includes>
                </configuration>
            </plugin>


            <!-- 跳过Test测试打包 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                </configuration>
            </plugin>

            <plugin>
                <artifactId>maven-dependency-plugin</artifactId>
                <configuration>
                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
                </configuration>
                <!--执行package时自动将依赖复制出来到/lib中-->
                <executions>
                    <execution>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-dependencies</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>



            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
                    <annotationProcessorPaths>
                        <path>
                            <groupId>org.projectlombok</groupId>
                            <artifactId>lombok</artifactId>
                            <version>1.18.20</version>
                        </path>
                    </annotationProcessorPaths>

                    <annotationProcessors>
                        <annotationProcessor>
                            lombok.launch.AnnotationProcessorHider$AnnotationProcessor
                        </annotationProcessor>
                    </annotationProcessors>

                </configuration>
            </plugin>
        </plugins>
    </build>


</project>

 ycl-smoke/pom.xml

@@ -39,13 +39,73 @@
    </dependencies>

    <build>
        <finalName>ycl-smoke</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <!-- 如果要把依赖一起打包,注释下面configuration -->
                <configuration>
                    <layout>ZIP</layout>
                    <includes>
                        <!--将依赖剔除,只编译打包本项目-->
                        <include>
                            <groupId>nothing</groupId>
                            <artifactId>nothing</artifactId>
                        </include>
                    </includes>
                </configuration>
            </plugin>


            <!-- 跳过Test测试打包 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                </configuration>
            </plugin>

            <plugin>
                <artifactId>maven-dependency-plugin</artifactId>
                <configuration>
                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
                </configuration>
                <!--执行package时自动将依赖复制出来到/lib中-->
                <executions>
                    <execution>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-dependencies</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>



            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
                    <annotationProcessorPaths>
                        <path>
                            <groupId>org.projectlombok</groupId>
                            <artifactId>lombok</artifactId>
                            <version>1.18.20</version>
                        </path>
                    </annotationProcessorPaths>

                    <annotationProcessors>
                        <annotationProcessor>
                            lombok.launch.AnnotationProcessorHider$AnnotationProcessor
                        </annotationProcessor>
                    </annotationProcessors>

                </configuration>
            </plugin>
        </plugins>
    </build>


</project>

 ycl-smoke/src/main/java/com/ycl/smoke/remote/service/ISmokeDetectionService.java

@@ -32,15 +32,15 @@
    @PostMapping(value = "/admin/listDataIntime")
    SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto paramDto,
                                                                             @RequestHeader("Auth") String token);

    @PostMapping(value = "/admin/listLocale")
    SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
                                                                             @RequestHeader("Auth") String token);

    @PostMapping(value = "/admin/queryCustomer")
    SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
                                                                             @RequestHeader("Auth") String token);

//
//    @PostMapping(value = "/admin/listLocale")
//    SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
//                                                                             @RequestHeader("Auth") String token);
//
//    @PostMapping(value = "/admin/queryCustomer")
//    SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
//                                                                             @RequestHeader("Auth") String token);
//


    @PostMapping(value = "/admin/listAlarmRecord")

			@@ -2,85 +2,18 @@
			<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
			<modelVersion>4.0.0</modelVersion>

			<build>
			<plugins>
			<plugin>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-maven-plugin</artifactId>
			<!-- 如果要把依赖一起打包,注释下面configuration -->
			<configuration>
			<layout>ZIP</layout>
			<classifier>execute</classifier>
			<mainClass>none</mainClass>
			<includes>
			<!--将依赖剔除,只编译打包本项目-->
			<include>
			<groupId>nothing</groupId>
			<artifactId>nothing</artifactId>
			</include>
			</includes>
			</configuration>
			<executions>
			<execution>
			<goals>
			<goal>repackage</goal>
			</goals>
			</execution>

			</executions>
			</plugin>


			<!-- 跳过Test测试打包 -->
			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-surefire-plugin</artifactId>
			<configuration>
			<skip>true</skip>
			</configuration>
			</plugin>

			<plugin>
			<artifactId>maven-dependency-plugin</artifactId>
			<configuration>
			<outputDirectory>${project.build.directory}/lib</outputDirectory>
			</configuration>
			<!--执行package时自动将依赖复制出来到/lib中-->
			<executions>
			<execution>
			<phase>package</phase>
			<goals>
			<goal>copy-dependencies</goal>
			</goals>
			</execution>
			</executions>
			</plugin>


			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-compiler-plugin</artifactId>
			<configuration>
			<annotationProcessorPaths>
			<path>
			<groupId>org.projectlombok</groupId>
			<artifactId>lombok</artifactId>
			<version>1.18.20</version>
			</path>
			</annotationProcessorPaths>

			<annotationProcessors>
			<annotationProcessor>
			lombok.launch.AnnotationProcessorHider$AnnotationProcessor
			</annotationProcessor>
			</annotationProcessors>

			<source>${java.version}</source>
			<target>${java.version}</target>
			</configuration>
			</plugin>
			</plugins>
			</build>

			<parent>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-parent</artifactId>

			@@ -45,6 +45,7 @@
			<artifactId>maven-resources-plugin</artifactId>
			<configuration>
			<encoding>UTF-8</encoding>
			<skip>true</skip>
			</configuration>
			</plugin>
			</plugins>

			@@ -92,6 +92,9 @@
			<plugin>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-maven-plugin</artifactId>
			<configuration>
			<skip>true</skip>
			</configuration>
			</plugin>
			</plugins>
			</build>

			@@ -39,13 +39,73 @@
			</dependencies>

			<build>
			<finalName>ycl-platform</finalName>
			<plugins>
			<plugin>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-maven-plugin</artifactId>
			<!-- 如果要把依赖一起打包,注释下面configuration -->
			<configuration>
			<layout>ZIP</layout>
			<includes>
			<!--将依赖剔除,只编译打包本项目-->
			<include>
			<groupId>nothing</groupId>
			<artifactId>nothing</artifactId>
			</include>
			</includes>
			</configuration>
			</plugin>


			<!-- 跳过Test测试打包 -->
			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-surefire-plugin</artifactId>
			<configuration>
			<skip>true</skip>
			</configuration>
			</plugin>

			<plugin>
			<artifactId>maven-dependency-plugin</artifactId>
			<configuration>
			<outputDirectory>${project.build.directory}/lib</outputDirectory>
			</configuration>
			<!--执行package时自动将依赖复制出来到/lib中-->
			<executions>
			<execution>
			<phase>package</phase>
			<goals>
			<goal>copy-dependencies</goal>
			</goals>
			</execution>
			</executions>
			</plugin>



			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-compiler-plugin</artifactId>
			<configuration>
			<annotationProcessorPaths>
			<path>
			<groupId>org.projectlombok</groupId>
			<artifactId>lombok</artifactId>
			<version>1.18.20</version>
			</path>
			</annotationProcessorPaths>

			<annotationProcessors>
			<annotationProcessor>
			lombok.launch.AnnotationProcessorHider$AnnotationProcessor
			</annotationProcessor>
			</annotationProcessors>

			</configuration>
			</plugin>
			</plugins>
			</build>


			</project>

			@@ -32,15 +32,15 @@
			@PostMapping(value = "/admin/listDataIntime")
			SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto paramDto,
			@RequestHeader("Auth") String token);

			@PostMapping(value = "/admin/listLocale")
			SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
			@RequestHeader("Auth") String token);

			@PostMapping(value = "/admin/queryCustomer")
			SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
			@RequestHeader("Auth") String token);

			//
			// @PostMapping(value = "/admin/listLocale")
			// SmokeResultResponseDto<DetectorDailyResponseDto> listLocale(@RequestBody LocaleParamDto paramDto,
			// @RequestHeader("Auth") String token);
			//
			// @PostMapping(value = "/admin/queryCustomer")
			// SmokeResultResponseDto<DetectorDailyResponseDto> queryCustomer(@RequestBody CustomerParamDto paramDto,
			// @RequestHeader("Auth") String token);
			//


			@PostMapping(value = "/admin/listAlarmRecord")