Compare commits
No commits in common. "d5a34e10a44e2581e65048807bb3a0a0b253644b" and "93c2399ba608ce463641dea63f64727ca14953da" have entirely different histories.
d5a34e10a4
...
93c2399ba6
@ -10,6 +10,7 @@
|
|||||||
<sourceRoots>
|
<sourceRoots>
|
||||||
<root url="file://$MODULE_DIR$/src/main/java" />
|
<root url="file://$MODULE_DIR$/src/main/java" />
|
||||||
<root url="file://$MODULE_DIR$/src/main/resources" />
|
<root url="file://$MODULE_DIR$/src/main/resources" />
|
||||||
|
<root url="file://$MODULE_DIR$/target/generated-sources/annotations" />
|
||||||
</sourceRoots>
|
</sourceRoots>
|
||||||
</configuration>
|
</configuration>
|
||||||
</facet>
|
</facet>
|
||||||
@ -18,9 +19,10 @@
|
|||||||
<output url="file://$MODULE_DIR$/target/classes" />
|
<output url="file://$MODULE_DIR$/target/classes" />
|
||||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||||
<content url="file://$MODULE_DIR$">
|
<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/main/resources" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
@ -141,15 +143,6 @@
|
|||||||
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.22" level="project" />
|
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.22" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
|
<orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
|
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.opencsv:opencsv:5.7.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.10.0" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.23.0" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: org.tukaani:xz:1.9" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: com.github.junrar:junrar:7.5.4" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
|
|
||||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
|
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
|
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
|
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
|
||||||
@ -160,6 +153,7 @@
|
|||||||
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" 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.22" level="project" />
|
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.22" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.deepoove:poi-tl:1.10.0" level="project" />
|
<orderEntry type="library" name="Maven: com.deepoove:poi-tl:1.10.0" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.deepoove:poi-ooxml-schemas-extra:4.1.2" level="project" />
|
<orderEntry type="library" name="Maven: com.deepoove:poi-ooxml-schemas-extra:4.1.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" level="project" />
|
||||||
@ -203,11 +197,13 @@
|
|||||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.8" level="project" />
|
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.8" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
|
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
|
<orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
|
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.jfree:jfreechart:1.5.3" level="project" />
|
<orderEntry type="library" name="Maven: org.jfree:jfreechart:1.5.3" level="project" />
|
||||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
|
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
|
||||||
|
@ -30,7 +30,6 @@ spring:
|
|||||||
max-http-form-post-size: -1
|
max-http-form-post-size: -1
|
||||||
logging:
|
logging:
|
||||||
file:
|
file:
|
||||||
path: E:/projectJava/FileManage/logs/
|
|
||||||
name: logs/projectname.log
|
name: logs/projectname.log
|
||||||
level:
|
level:
|
||||||
com.genersoft.iot: debug
|
com.genersoft.iot: debug
|
||||||
|
@ -26,7 +26,6 @@ spring:
|
|||||||
max-request-size: 100MB
|
max-request-size: 100MB
|
||||||
logging:
|
logging:
|
||||||
file:
|
file:
|
||||||
path: /opt/filemgr/logs
|
|
||||||
name: logs/projectname.log
|
name: logs/projectname.log
|
||||||
level:
|
level:
|
||||||
com.genersoft.iot: debug
|
com.genersoft.iot: debug
|
||||||
|
0
java/src/main/resources/ip2region/ip2region.db
Normal file
0
java/src/main/resources/ip2region/ip2region.db
Normal file
@ -1,7 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!--生产环境关闭 scan="true",避免动态重载配置的风险。-->
|
|
||||||
<configuration scan="true" scanPeriod="30 seconds" debug="false">
|
<configuration scan="true" scanPeriod="30 seconds" debug="false">
|
||||||
<springProperty name="LOG_DIR" source="logging.file.path" />
|
|
||||||
<contextName>yfAdmin</contextName>
|
<contextName>yfAdmin</contextName>
|
||||||
<property name="log.charset" value="utf-8" />
|
<property name="log.charset" value="utf-8" />
|
||||||
<property name="log.pattern" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)" />
|
<property name="log.pattern" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)" />
|
||||||
@ -15,26 +13,27 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>${LOG_DIR}/FileMgr.log</file>
|
<file>/www/wwwlogs/java/springboot/doctor-log/doctor.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
||||||
<fileNamePattern>${LOG_DIR}/FileMgr.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
|
<fileNamePattern>/www/wwwlogs/java/springboot/doctor-log/doctor.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
|
||||||
<maxHistory>30</maxHistory>
|
<maxHistory>30</maxHistory>
|
||||||
<maxFileSize>10MB</maxFileSize>
|
<maxFileSize>10MB</maxFileSize>
|
||||||
</rollingPolicy>
|
</rollingPolicy>
|
||||||
<encoder>
|
<encoder>
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p [%thread] %c{1}:%L - %m%n</pattern>
|
<pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p [%thread] %c{1}:%L - %m%n</pattern>
|
||||||
</encoder>
|
</encoder>
|
||||||
<!--filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
|
||||||
<level>ERROR</level>
|
|
||||||
</filter-->
|
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<root level="INFO">
|
<root level="ERROR">
|
||||||
<appender-ref ref="console" />
|
|
||||||
<appender-ref ref="FILE" />
|
<appender-ref ref="FILE" />
|
||||||
</root>
|
</root>
|
||||||
|
|
||||||
<!--监控sql日志输出 生产环境建议OFF-->
|
<!--普通日志输出到控制台-->
|
||||||
|
<root level="info">
|
||||||
|
<appender-ref ref="console" />
|
||||||
|
</root>
|
||||||
|
|
||||||
|
<!--监控sql日志输出 -->
|
||||||
<logger name="jdbc.sqlonly" level="INFO" additivity="false">
|
<logger name="jdbc.sqlonly" level="INFO" additivity="false">
|
||||||
<appender-ref ref="console" />
|
<appender-ref ref="console" />
|
||||||
</logger>
|
</logger>
|
Loading…
Reference in New Issue
Block a user