ChenYang 1 vuosi sitten
vanhempi
commit
f86cb1777b

+ 7 - 0
package.xml

@@ -53,6 +53,13 @@
                 <include>logs</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/src/main/resources/lib</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
     </fileSets>
     <!-- 依赖的 jar 包 copy 到 lib 目录下 -->
     <dependencySets>

+ 0 - 4
pom.xml

@@ -237,10 +237,6 @@
     <packaging>pom</packaging>
 
 
-    <dependencies>
-
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>

+ 0 - 18
ruoyi-admin/pom.xml

@@ -183,24 +183,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.libUrl}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- 使用 mvn clean package 打包 更多配置可参考官司方文档:http://maven.apache.org/plugins/maven-assembly-plugin/single-mojo.html -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

+ 1 - 0
ruoyi-admin/src/main/resources/application-dev.yml

@@ -88,6 +88,7 @@ init-task:
     autosend: false # 自动下发任务
     aciservice: false # ndc通讯
 
+
 #modbus:
 #    tcp-master:
 #        first: # 称重机

warewms-hard/src/main/resources/lib/RFIDAPI32PC.dll → ruoyi-admin/src/main/resources/lib/RFIDAPI32PC.dll


warewms-hard/src/main/resources/lib/RFIDAPI3_JNI_HOST.dll → ruoyi-admin/src/main/resources/lib/RFIDAPI3_JNI_HOST.dll


warewms-hard/src/main/resources/lib/RXTXcomm.jar → ruoyi-admin/src/main/resources/lib/RXTXcomm.jar


warewms-hard/src/main/resources/lib/jssc-2.8.0.jar → ruoyi-admin/src/main/resources/lib/jssc-2.8.0.jar


warewms-hard/src/main/resources/lib/modbus-spring-boot-starter.jar → ruoyi-admin/src/main/resources/lib/modbus-spring-boot-starter.jar


warewms-hard/src/main/resources/lib/modbus4j-3.0.5.jar → ruoyi-admin/src/main/resources/lib/modbus4j-3.0.5.jar


warewms-hard/src/main/resources/lib/rfid-1.0.0.jar → ruoyi-admin/src/main/resources/lib/rfid-1.0.0.jar


warewms-hard/src/main/resources/lib/rfid-zebra-spring-boot-starter.jar → ruoyi-admin/src/main/resources/lib/rfid-zebra-spring-boot-starter.jar


warewms-hard/src/main/resources/lib/rxtxParallel.dll → ruoyi-admin/src/main/resources/lib/rxtxParallel.dll


warewms-hard/src/main/resources/lib/rxtxSerial.dll → ruoyi-admin/src/main/resources/lib/rxtxSerial.dll


+ 11 - 7
warewms-hard/pom.xml

@@ -13,6 +13,10 @@
     <version>1.0</version>
     <description>硬件对接</description>
 
+    <properties>
+        <local.lib.basedir>${pom.basedir}/../ruoyi-admin/src/main/resources/lib</local.lib.basedir>
+    </properties>
+
     <dependencies>
         <!-- 若依框架 -->
         <dependency>
@@ -25,23 +29,23 @@
             <artifactId>modbus-spring-boot-starter</artifactId>
             <version>1.0</version>
             <scope>system</scope>
-            <systemPath>${pom.basedir}/src/main/resources/lib/modbus-spring-boot-starter.jar</systemPath>
+            <systemPath>${local.lib.basedir}/modbus-spring-boot-starter.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.jwk</groupId>
             <artifactId>rfid-zebra-spring-boot-starter</artifactId>
             <version>1.0</version>
             <scope>system</scope>
-            <systemPath>${pom.basedir}/src/main/resources/lib/rfid-zebra-spring-boot-starter.jar</systemPath>
+            <systemPath>${local.lib.basedir}/rfid-zebra-spring-boot-starter.jar</systemPath>
         </dependency>
 
         <!-- rfid-zebra-只能跑在window上-->
         <dependency>
-            <groupId>com.warewms</groupId>
+            <groupId>com.jwk</groupId>
             <artifactId>rfid</artifactId>
             <version>1.0.0</version>
             <scope>system</scope>
-            <systemPath>${pom.basedir}/src/main/resources/lib/rfid-1.0.0.jar</systemPath>
+            <systemPath>${local.lib.basedir}/rfid-1.0.0.jar</systemPath>
         </dependency>
 
         <!--modbus4j start-->
@@ -50,21 +54,21 @@
             <artifactId>RXTXcomm</artifactId>
             <version>3.0.5</version>
             <scope>system</scope>
-            <systemPath>${pom.basedir}/src/main/resources/lib/RXTXcomm.jar</systemPath>
+            <systemPath>${local.lib.basedir}/RXTXcomm.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.jwk</groupId>
             <artifactId>modbus4j</artifactId>
             <version>3.0.5</version>
             <scope>system</scope>
-            <systemPath>${pom.basedir}/src/main/resources/lib/modbus4j-3.0.5.jar</systemPath>
+            <systemPath>${local.lib.basedir}/modbus4j-3.0.5.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.jwk</groupId>
             <artifactId>jssc</artifactId>
             <version>2.8.0</version>
             <scope>system</scope>
-            <systemPath>${pom.basedir}/src/main/resources/lib/jssc-2.8.0.jar</systemPath>
+            <systemPath>${local.lib.basedir}/jssc-2.8.0.jar</systemPath>
         </dependency>
         <!--modbus4j end-->
     </dependencies>