Forráskód Böngészése

bug修复,注释掉docker打包

hecheng 3 éve
szülő
commit
bf38b83290

+ 27 - 27
zd-auth/pom.xml

@@ -83,34 +83,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
 
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 28 - 28
zd-gateway/pom.xml

@@ -115,34 +115,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 28 - 28
zd-modules/zd-airbottle/pom.xml

@@ -145,34 +145,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 27 - 27
zd-modules/zd-alarm/pom.xml

@@ -103,34 +103,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
 
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 28 - 28
zd-modules/zd-chemical/pom.xml

@@ -161,34 +161,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 </project>

+ 27 - 27
zd-modules/zd-common-face/pom.xml

@@ -97,34 +97,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
 
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 </project>

+ 28 - 28
zd-modules/zd-exam/pom.xml

@@ -127,34 +127,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 27 - 27
zd-modules/zd-forward/pom.xml

@@ -110,34 +110,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
 
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 </project>

+ 27 - 27
zd-modules/zd-message/pom.xml

@@ -153,34 +153,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
 
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 </project>

+ 27 - 27
zd-modules/zd-modules-app/pom.xml

@@ -89,34 +89,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
 
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 </project>

+ 28 - 28
zd-modules/zd-modules-file/pom.xml

@@ -117,34 +117,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 28 - 28
zd-modules/zd-modules-gen/pom.xml

@@ -105,34 +105,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 28 - 28
zd-modules/zd-modules-job/pom.xml

@@ -105,34 +105,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 28 - 28
zd-modules/zd-modules-laboratory/pom.xml

@@ -165,34 +165,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 28 - 28
zd-modules/zd-modules-system/pom.xml

@@ -120,34 +120,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 27 - 27
zd-modules/zd-netty/pom.xml

@@ -174,34 +174,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
 
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 </project>

+ 0 - 1
zd-modules/zd-netty/src/main/java/com/zd/netty/controller/FridDeviceController.java

@@ -29,7 +29,6 @@ public class FridDeviceController {
      *         Session.S2 在辐射范围内重复出现或停止不动的有且仅返回一次数据,当设备离开辐射区域后重置缓存记录,根据厂商提供的文档和本人结合业务应用实际测试,推荐使用此session
      *         Session.S3 这个暂时没搞懂,选择此session的时候在没有标签在辐射区域会报错,不知道是因为识别设备不够四个还是其他问题,待确定
      */
-    @GetMapping("/startMonitor")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "index",value = "session 枚举类所提供的下标,从0开始,最大为3,超过会默认为0"),
             @ApiImplicitParam(name = "uniformPower",value = "设备输出功率,1开始,默认最大33"),

+ 0 - 21
zd-modules/zd-netty/src/main/java/com/zd/netty/service/impl/FridServiceImpl.java

@@ -1,33 +1,12 @@
 package com.zd.netty.service.impl;
 
-import com.payne.connect.net.NetworkHandle;
-import com.payne.reader.Reader;
-import com.payne.reader.base.BaseInventory;
-import com.payne.reader.bean.config.AntennaCount;
-import com.payne.reader.bean.config.ProfileId;
-import com.payne.reader.bean.config.Session;
-import com.payne.reader.bean.receive.Failure;
-import com.payne.reader.bean.receive.Success;
-import com.payne.reader.bean.send.*;
-import com.payne.reader.process.ReaderImpl;
-import com.zd.common.core.enums.HardwareOperate;
-import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.SpringUtils;
-import com.zd.netty.base.FridConsumer;
 import com.zd.netty.enums.ManufacturerTypeEnum;
 import com.zd.netty.service.IFridService;
-import com.zd.netty.service.ISendService;
 import com.zd.netty.service.IService;
-import com.zd.system.api.airbottle.RemoteAirBottleService;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
 import com.zd.system.api.laboratory.domain.RemoteLabHardware;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 @Service
 @Slf4j

+ 27 - 27
zd-modules/zd-speaker/pom.xml

@@ -90,34 +90,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
 
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

+ 28 - 28
zd-visual/zd-monitor/pom.xml

@@ -87,34 +87,34 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.maven.verion}</version>
-
-                <executions>
-                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
-                    <execution>
-                        <id>default</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>latest</tag>
-                    <!-- 镜像服务器账号密码  -->
-                    <username>admin</username>
-                    <password>zd123456..</password>
-                    <!-- 构建参数,指定jar包名称 -->
-                    <buildArgs>
-                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+ <!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${docker.maven.verion}</version>-->
+
+<!--                <executions>-->
+<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    &lt;!&ndash; 镜像服务器账号密码  &ndash;&gt;-->
+<!--                    <username>admin</username>-->
+<!--                    <password>zd123456..</password>-->
+<!--                    &lt;!&ndash; 构建参数,指定jar包名称 &ndash;&gt;-->
+<!--                    <buildArgs>-->
+<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>