From 5ea7f0263e5f84ee7c2064a05f88649e000c7bc6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G8BCEP0\\HP" <2037158277@qq.com>
Date: Fri, 30 Jul 2021 17:41:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                             |  5 -----
 .../com/xkrs/service/impl/FirePointServiceImpl.java |  4 ++--
 src/main/java/com/xkrs/utils/PhotoUtil.java         | 10 +++++-----
 src/main/resources/application.properties           |  4 ++--
 src/main/resources/log4j2.xml                       |  4 ++--
 .../java/com/xkrs/FirePointApplicationTests.java    | 13 -------------
 6 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 src/test/java/com/xkrs/FirePointApplicationTests.java

diff --git a/pom.xml b/pom.xml
index b284715..b4cc137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,11 +71,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
index 88c1756..fd9303c 100644
--- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
+++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
@@ -86,7 +86,7 @@ public class FirePointServiceImpl implements FirePointService {
         firePointEntity.setAddTime(DateTimeUtil.dateTimeToString(LocalDateTime.now()));
         firePointEntity.setFireType("0");
         log.info("-------发现新火点");
-        log.info("---------------开始进行实时通讯，将检测到的火点传给前端");
+        /*log.info("---------------开始进行实时通讯，将检测到的火点传给前端");
         Map map = new HashMap(3);
         map.put("countyCode",firePointQo.getCountyCode());
         map.put("countyName",firePointQo.getCountyName());
@@ -101,7 +101,7 @@ public class FirePointServiceImpl implements FirePointService {
         map1.put("fire",map);
         String websocket = JSON.toJSONString(map1);
         // 将监测到的火点信息返给前端
-        WebSocketServer.broadInfo(websocket);
+        WebSocketServer.broadInfo(websocket);*/
         return firePointDao.save(firePointEntity);
 
     }
diff --git a/src/main/java/com/xkrs/utils/PhotoUtil.java b/src/main/java/com/xkrs/utils/PhotoUtil.java
index ecf1462..021805a 100644
--- a/src/main/java/com/xkrs/utils/PhotoUtil.java
+++ b/src/main/java/com/xkrs/utils/PhotoUtil.java
@@ -79,14 +79,14 @@ public class PhotoUtil {
             //uuid生成新的文件名
             newName = UUID.randomUUID().toString() + suffix;
             //将图片保存到本地/usr/etc/images/Folder
-            //File file1 = new File("/home/web/wf-fire-service/forestTaskImage/");
-            File file1 = new File("E:/file/work/image/");
+            File file1 = new File("/home/sxy/image/firePointImage/");
+            //File file1 = new File("E:/file/work/image/");
             if (!file1.exists()) {
                 file1.mkdirs();
             }
-            //String path = "/home/web/wf-fire-service/forestTaskImage/" + newName;
-            String path = "E:/file/work/image/" + newName;
-            String uploadPaths = "/" + newName;
+            String path = "/home/sxy/image/firePointImage/" + newName;
+            //String path = "E:/file/work/image/" + newName;
+            String uploadPaths = "/firePointImage/" + newName;
             //实现上传
             file.transferTo(new File(path));
             FireTaskPhoto fireTaskPhoto = new FireTaskPhoto();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 238054a..f7f0d92 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-server.port = 6466
+server.port = 6700
 
 ## 数据源配置
 spring.datasource.url = jdbc:postgresql://192.168.2.9:5432/fire_point
@@ -24,7 +24,7 @@ spring.datasource.hikari.validation-timeout = 3000
 ## Spring Data JPA 配置
 spring.jpa.database = POSTGRESQL
 spring.jpa.database-platform = org.hibernate.dialect.PostgreSQLDialect
-spring.jpa.show-sql = true
+spring.jpa.show-sql = false
 # 指定 ddl mode (none, validate, create, create-drop, update)
 spring.jpa.hibernate.ddl-auto = update
 # 命名策略
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 1c812e2..a2982c7 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -11,8 +11,8 @@
         <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" />
         <!-- 定义日志存储的路径 -->
         <!--<property name="FILE_PATH" value="/home/web/logs/forest-fire-service" />-->
-        <property name="FILE_PATH" value="E:/log4j2/fire_point" />
-        <!--<property name="FILE_PATH" value="/usr/local/log/forest-fire-service" />-->
+        <!--<property name="FILE_PATH" value="E:/log4j2/fire_point" />-->
+        <property name="FILE_PATH" value="/home/sxy/logs/fire_point" />
         <property name="FILE_NAME" value="fire_point" />
     </Properties>
 
diff --git a/src/test/java/com/xkrs/FirePointApplicationTests.java b/src/test/java/com/xkrs/FirePointApplicationTests.java
deleted file mode 100644
index db9ac83..0000000
--- a/src/test/java/com/xkrs/FirePointApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.xkrs;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class FirePointApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}