diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 6198415..2340aa1 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -14,6 +14,15 @@
2.1
UTF-8
1.0.0
+
+ 3.0.7.1
+ 2.0.1
+ 1.2.10
+ 1.1.9
+ 2.9.2
+ 1.9.1
+ 8.0.12
+ 2.9.2
@@ -97,11 +106,55 @@
com.zhehekeji
core
1.0.0
+ system
+ ${project.basedir}/src/main/resources/lib/core-1.0.0.jar
+
- com.zhehekeji
- base-assembly
- 1.0.0
+ com.baomidou
+ mybatis-plus-boot-starter
+ ${mybatisplus.boot.version}
+
+
+ com.github.pagehelper
+ pagehelper-spring-boot-starter
+ ${pagehelper.version}
+
+
+ org.mybatis
+ mybatis-spring
+ ${mybatis.version}
+
+
+ mysql
+ mysql-connector-java
+ ${mysql.version}
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ ${druid.springboot.version}
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.version}
+
+
+ com.github.xiaoymin
+ swagger-bootstrap-ui
+ ${swagger.ui.version}
+
+
+
+ io.springfox
+ springfox-swagger2
+ ${swagger.version}
+
+
+ org.apache.commons
+ commons-lang3
+ 3.8
@@ -117,14 +170,5 @@
-
-
- nexus
- Nexus
- http://47.99.98.250:28888/repository/maven-public/
-
- false
-
-
-
+
\ No newline at end of file
diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/FileUtil.java b/modules/common/src/main/java/com/zhehekeji/common/util/FileUtil.java
index 81eea3a..c56f19d 100644
--- a/modules/common/src/main/java/com/zhehekeji/common/util/FileUtil.java
+++ b/modules/common/src/main/java/com/zhehekeji/common/util/FileUtil.java
@@ -56,4 +56,4 @@ public class FileUtil {
save("www",path);
getText(path);
}
-}
\ No newline at end of file
+}
diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/PathUtil.java b/modules/common/src/main/java/com/zhehekeji/common/util/PathUtil.java
index 37df32e..cb36cc2 100644
--- a/modules/common/src/main/java/com/zhehekeji/common/util/PathUtil.java
+++ b/modules/common/src/main/java/com/zhehekeji/common/util/PathUtil.java
@@ -26,14 +26,14 @@ public class PathUtil {
public static String createFileName(String fileType,Integer cameraId) {
LocalDateTime now = LocalDateTime.now();
- String time = now.format(DateTimeFormatter.ofPattern("yyyy\\MM\\dd")) + "\\"+cameraId;
- return time + "\\" + now.format(DateTimeFormatter.ofPattern("HHmmss-"))+getRandomString(10) + "."+fileType;
+ String time = now.format(DateTimeFormatter.ofPattern("yyyy/MM/dd")) + "/"+cameraId;
+ return time + "/" + now.format(DateTimeFormatter.ofPattern("HHmmss-"))+getRandomString(10) + "."+fileType;
}
public static String createFileNameByRowColumn(String fileType,Integer cameraId,Integer row,Integer column){
LocalDateTime now = LocalDateTime.now();
String date = now.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- return cameraId+"\\"+row+"-"+column+"\\"+date + "\\" +now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss-"))+row+"-"+column + "."+fileType;
+ return cameraId+"/"+row+"-"+column+"/"+date + "/" +now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss-"))+row+"-"+column + "."+fileType;
}
/**
diff --git a/modules/common/src/main/resources/lib/base-assembly-1.0.0.jar b/modules/common/src/main/resources/lib/base-assembly-1.0.0.jar
new file mode 100644
index 0000000..c2edb27
Binary files /dev/null and b/modules/common/src/main/resources/lib/base-assembly-1.0.0.jar differ
diff --git a/modules/common/src/main/resources/lib/core-1.0.0.jar b/modules/common/src/main/resources/lib/core-1.0.0.jar
new file mode 100644
index 0000000..1b0adc4
Binary files /dev/null and b/modules/common/src/main/resources/lib/core-1.0.0.jar differ
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index 5ce40d3..068c85d 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -52,11 +52,11 @@
true
-
+
org.springframework.boot
diff --git a/modules/pom.xml b/modules/pom.xml
index f3ee85d..da6a14c 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -20,11 +20,11 @@
-
+
com.zhehekeji
common
@@ -41,15 +41,6 @@
-
-
- nexus
- Nexus
- http://47.99.98.250:28888/repository/maven-public/
-
- false
-
-
-
+
diff --git a/pom.xml b/pom.xml
index d9bc382..408210b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,14 +91,7 @@
-
- nexus
- Nexus
- http://47.99.98.250:28888/repository/maven-public/
-
- false
-
-
+
diff --git a/web/pom.xml b/web/pom.xml
index 90169b6..67d7005 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -19,11 +19,7 @@
-
- com.zhehekeji
- base-assembly
- ${base.assembly.version}
-
+
org.springframework.boot
spring-boot-starter-cache
diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java b/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
index 4f7ec61..a2bbe9b 100644
--- a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
+++ b/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java
@@ -18,7 +18,7 @@ public class SickSocket {
private static final Logger tcpLogger = LoggerFactory.getLogger("sick");
public static void main(String[] args) {
- String code = readOCR("192.168.8.236", 2002);
+ String code = readOCR("172.16.0.192", 2112);
System.out.println(code);
}
@@ -73,6 +73,7 @@ public class SickSocket {
}
private static String read(InputStream inStream) throws IOException {
+ System.out.println("Read");
BufferedReader bd = new BufferedReader(new InputStreamReader(inStream));
return bd.readLine();
}