From b903ae9914d68dec427b90d14b59a2ffeb32a8ee Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 07 十月 2023 10:40:41 +0800
Subject: [PATCH] 优化
---
.gitignore | 1
HELP.md | 10 ++
src/main/resources/logback-spring.xml | 17 ----
src/main/java/com/ard/utils/http/HttpUtils.java | 2
ard-alarm.iml | 150 +++++++++++++++++++++++++++++++++++++
src/main/resources/application-dev.yml | 1
src/main/resources/application-prod.yml | 2
7 files changed, 163 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index 549e00a..f2d67c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
### VS Code ###
.vscode/
+/logs/
diff --git a/HELP.md b/HELP.md
new file mode 100644
index 0000000..664b5e5
--- /dev/null
+++ b/HELP.md
@@ -0,0 +1,10 @@
+# Getting Started
+
+### Reference Documentation
+
+For further reference, please consider the following sections:
+
+* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
+* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.7.12/maven-plugin/reference/html/)
+* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.7.12/maven-plugin/reference/html/#build-image)
+
diff --git a/ard-alarm.iml b/ard-alarm.iml
new file mode 100644
index 0000000..21425ab
--- /dev/null
+++ b/ard-alarm.iml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <webroots />
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src/main/java" />
+ <root url="file://$MODULE_DIR$/src/main/resources" />
+ </sourceRoots>
+ </configuration>
+ </facet>
+ <facet type="Spring" name="Spring">
+ <configuration />
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.12" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.12" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.12" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.12" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
+ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-haproxy:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-memcache:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-mqtt:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-redis:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-smtp:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-stomp:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-codec-xml:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-handler-ssl-ocsp:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-transport-rxtx:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-transport-sctp:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-transport-udt:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-transport-classes-epoll:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-transport-classes-kqueue:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns-classes-macos:4.1.92.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.92.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.92.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.92.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.92.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.92.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.92.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mqtt:6.0.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.5.18" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.4" level="project" />
+ <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.29" level="project" />
+ <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.23" level="project" />
+ <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.26" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.12" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.12" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.12" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.75" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.75" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.75" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: net.java.jna:jna:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.examples:examples:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.5.3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.0" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: com.oracle.ojdbc:ojdbc8:19.3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.oracle.ojdbc:ucp:19.3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.oracle.ojdbc:oraclepki:19.3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.oracle.ojdbc:osdt_cert:19.3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.oracle.ojdbc:osdt_core:19.3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.oracle.ojdbc:simplefan:19.3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.oracle.ojdbc:ons:19.3.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.oracle.database.nls:orai18n:21.1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: io.minio:minio:8.3.5" level="project" />
+ <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:30.1.1-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.3" level="project" />
+ <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21" level="project" />
+ <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.21" level="project" />
+ <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" />
+ <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.8.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+ <orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.12" level="project" />
+ <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.27" level="project" />
+ <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.3.8" level="project" />
+ <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/src/main/java/com/ard/utils/http/HttpUtils.java b/src/main/java/com/ard/utils/http/HttpUtils.java
index 9787ae2..e850e9e 100644
--- a/src/main/java/com/ard/utils/http/HttpUtils.java
+++ b/src/main/java/com/ard/utils/http/HttpUtils.java
@@ -29,7 +29,7 @@
*
* @author ruoyi
*/
-@Slf4j(topic = "httpUtils")
+@Slf4j
public class HttpUtils
{
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3d06baa..83184ea 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -73,4 +73,3 @@
tube: info
digitization3: info
stealAlarm: info
- httpUtils: info
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 40c012f..b219f3f 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -69,4 +69,4 @@
netty: info
external: info
camera: info
- tube: info
+ tube: info
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 5336ba7..3522a31 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -141,19 +141,6 @@
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
- <!--httpUtils鏃ュ織杈撳嚭-->
- <appender name="httpUtils" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/httpUtils.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!--鎸夊ぉ鍥炴粴daily-->
- <fileNamePattern>${log.path}/httpUtils.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!--鏃ュ織鏈�澶х殑鍘嗗彶60澶�-->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
<root level="DEBUG">
<appender-ref ref="console"/>
</root>
@@ -193,10 +180,6 @@
<!--stealAlarm鎿嶄綔鏃ュ織-->
<logger name="stealAlarm" level="INFO">
<appender-ref ref="stealAlarm"/>
- </logger>
- <!--HttpUtils鎿嶄綔鏃ュ織-->
- <logger name="httpUtils" level="INFO">
- <appender-ref ref="httpUtils"/>
</logger>
</configuration>
--
Gitblit v1.9.3