From ea13a0ac649581dcc216d00efa67dcd1fe6c03f2 Mon Sep 17 00:00:00 2001
From: qiushui <=>
Date: Wed, 26 Oct 2022 15:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/common/pom.xml | 70 ++++++++++++++----
.../com/zhehekeji/common/util/FileUtil.java | 2 +-
.../com/zhehekeji/common/util/PathUtil.java | 6 +-
.../resources/lib/base-assembly-1.0.0.jar | Bin 0 -> 2331 bytes
.../src/main/resources/lib/core-1.0.0.jar | Bin 0 -> 9461 bytes
modules/filter/pom.xml | 4 +-
modules/pom.xml | 15 +---
pom.xml | 9 +--
web/pom.xml | 6 +-
.../web/service/sick/SickSocket.java | 3 +-
10 files changed, 70 insertions(+), 45 deletions(-)
create mode 100644 modules/common/src/main/resources/lib/base-assembly-1.0.0.jar
create mode 100644 modules/common/src/main/resources/lib/core-1.0.0.jar
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 0000000000000000000000000000000000000000..c2edb274d5bcfb3ed3f0d901df1f9f76facc7066
GIT binary patch
literal 2331
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
-
+
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();
}