diff --git a/xiuosiot-backend/pom.xml b/xiuosiot-backend/pom.xml
index c87863f..4ee70ba 100644
--- a/xiuosiot-backend/pom.xml
+++ b/xiuosiot-backend/pom.xml
@@ -121,7 +121,12 @@
spring-boot-starter-aop
1.4.1.RELEASE
-
+
+
+ cn.zhxu
+ okhttps-fastjson
+ 4.0.1
+
org.springframework.boot
@@ -129,11 +134,27 @@
- org.apache.spark
- spark-core_2.12
- 3.3.1
+ cn.hutool
+ hutool-all
+ 5.8.15
+
+ ch.qos.logback
+ logback-core
+ 1.1.7
+
+
+
+ ch.qos.logback
+ logback-classic
+ 1.1.7
+
+
+ commons-lang
+ commons-lang
+ 2.6
+
diff --git a/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml b/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml
new file mode 100644
index 0000000..973a5a4
--- /dev/null
+++ b/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml
@@ -0,0 +1,483 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ C:\Users\XIOS\AppData\Roaming\Subversion
+
+
+
+
+ 1661333758208
+
+
+ 1661333758208
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1661504382339
+
+
+
+ 1661504382340
+
+
+ 1661505205169
+
+
+
+ 1661505205169
+
+
+ 1663209401377
+
+
+
+ 1663209401377
+
+
+ 1663925693595
+
+
+
+ 1663925693595
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/Utils/GenerateIdUtil.java
+ 27
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/DeviceController.java
+ 65
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/impl/RequestLogInfoServiceImpl.java
+ 36
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/DataForwardService.java
+ 7
+
+
+
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/DataForwardService.java
+ 8
+
+
+
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/AlarmInfoService.java
+ 15
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
index d825f75..6025855 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
@@ -3,7 +3,6 @@ package com.aiit.xiuos;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/xiuosiot-backend/src/main/resources/application-local.yml b/xiuosiot-backend/src/main/resources/application-local.yml
index 321a6f0..e9b6596 100644
--- a/xiuosiot-backend/src/main/resources/application-local.yml
+++ b/xiuosiot-backend/src/main/resources/application-local.yml
@@ -79,10 +79,6 @@ mqtt:
tdengine:
url: jdbc:TAOS://taosnode1:6030/xiuosiot?user=root&password=taosdata
-logging:
- file:
- name: xiuosiot.log
-
diff --git a/xiuosiot-backend/src/main/resources/application-prod.yml b/xiuosiot-backend/src/main/resources/application-prod.yml
index 8327905..5d9ebca 100644
--- a/xiuosiot-backend/src/main/resources/application-prod.yml
+++ b/xiuosiot-backend/src/main/resources/application-prod.yml
@@ -71,9 +71,7 @@ mqtt:
default-topic: xiuosiot/#
tdengine:
url: jdbc:TAOS://xiuosiot.taosnode1:6030/xiuosiot?user=root&password=taosdata
-logging:
- file:
- name: xiuosiot.log
+
diff --git a/xiuosiot-backend/src/main/resources/application.yml b/xiuosiot-backend/src/main/resources/application.yml
index bf63079..60e4e57 100644
--- a/xiuosiot-backend/src/main/resources/application.yml
+++ b/xiuosiot-backend/src/main/resources/application.yml
@@ -7,7 +7,9 @@ spring:
profiles:
active: {spring.profiles.active}
-
+logging:
+ config:
+ classpath: logback.xml
diff --git a/xiuosiot-backend/src/main/resources/logback.xml b/xiuosiot-backend/src/main/resources/logback.xml
new file mode 100644
index 0000000..f981884
--- /dev/null
+++ b/xiuosiot-backend/src/main/resources/logback.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+ %d [%thread] %-5level %logger{50} -[%file:%line]- %msg%n
+ UTF-8
+
+
+
+
+
+ ${logFile}.log
+
+
+ %d [%thread] %-5level -[%file:%line]- %msg%n
+ UTF-8
+
+
+ ${logFile}.%d{yyyy-MM-dd}.%i.log
+ ${maxFileSize}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xiuosiot-backend/xiuosiot b/xiuosiot-backend/xiuosiot
deleted file mode 100644
index e69de29..0000000
diff --git a/xiuosiot-backend/xiuosiot.iml b/xiuosiot-backend/xiuosiot.iml
deleted file mode 100644
index 9d165af..0000000
--- a/xiuosiot-backend/xiuosiot.iml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file