From 5e724cc0628554b949f0102bee6294db8a23c7f5 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期三, 06 七月 2022 15:33:43 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mrjackwang/wvp-GB28181-pro into wvp-28181-2.0

---
 .gitignore |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c96aaf..21f4006 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,13 +3,13 @@
 
 # Log file
 *.log
-
+logs/*
 # BlueJ files
 *.ctxt
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
-
+src/main/resources/application-*.yml
 # Package Files #
 #*.jar
 *.war
@@ -18,7 +18,7 @@
 *.zip
 *.tar.gz
 *.rar
-
+*.iml
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.idea/*
@@ -26,3 +26,4 @@
 /.idea/
 /target/
 
+/src/main/resources/static/

--
Gitblit v1.8.0