From 8e88066052000a4e1c19a19890b8c65b1828a4b3 Mon Sep 17 00:00:00 2001 From: qiushui Date: Thu, 18 Nov 2021 14:23:29 +0800 Subject: [PATCH] fix bug: order --- .../com/zhehekeji/web/service/PlcService.java | 3 --- web/src/main/resources/application-dev.yml | 9 ++++++++- web/src/main/resources/application-prod.yml | 9 ++++++++- web/src/main/resources/application-test.yml | 18 ++++++++++++------ 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index 5bbb37b..7ac2288 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -40,9 +40,6 @@ public class PlcService { @Resource private OrderService orderService; - @Value("${picPort}") - private String picPort; - @Value("${mp4Path}") private String mp4Path; diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 6124000..0bfb371 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -29,12 +29,19 @@ zhehe: filter: enable: true postToken: w89euijon2&UHBTY$%huni34ri +# --------本服务端口号 server: port: 8099 +#-------------- +# ------用户中心地址 userUrl: http://115.236.65.98:11001 -picPort: 8544 +# ----------- +# ----默认摄像头的连接信息 cameraPassword: admin123 cameraUser: admin cameraPort: 37777 +# ------------ +# -----图片 mp4下载地址 mediaPath: d:\\data\media\ mp4Path: d:\\data\mp4\ +# ------------ diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 6124000..0bfb371 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -29,12 +29,19 @@ zhehe: filter: enable: true postToken: w89euijon2&UHBTY$%huni34ri +# --------本服务端口号 server: port: 8099 +#-------------- +# ------用户中心地址 userUrl: http://115.236.65.98:11001 -picPort: 8544 +# ----------- +# ----默认摄像头的连接信息 cameraPassword: admin123 cameraUser: admin cameraPort: 37777 +# ------------ +# -----图片 mp4下载地址 mediaPath: d:\\data\media\ mp4Path: d:\\data\mp4\ +# ------------ diff --git a/web/src/main/resources/application-test.yml b/web/src/main/resources/application-test.yml index 4cb67c9..62b2da6 100644 --- a/web/src/main/resources/application-test.yml +++ b/web/src/main/resources/application-test.yml @@ -29,13 +29,19 @@ zhehe: filter: enable: true postToken: w89euijon2&UHBTY$%huni34ri +# --------本服务端口号 server: port: 8099 -userUrl: http://115.236.65.98:8007 -picPort: 8544 -cameraPassword: hzleaper123 +#-------------- +# ------用户中心地址 +userUrl: http://115.236.65.98:11001 +# ----------- +# ----默认摄像头的连接信息 +cameraPassword: admin123 cameraUser: admin cameraPort: 37777 -mediaPath: /home/test/lia/media/ -mp4Path: /home/test/lia/mp4/ -tcpPort: 8097 +# ------------ +# -----图片 mp4下载地址 谨慎修改 +mediaPath: d:\\data\media\ +mp4Path: d:\\data\mp4\ +# ------------