From 530ba237d2b8ba9af2744cdfcf06008ab1ea8155 Mon Sep 17 00:00:00 2001
From: wangbing <wangbing@wbsite.xyz>
Date: Fri, 13 Mar 2020 23:10:47 +0800
Subject: [PATCH] 11111

---
 admin/pom.xml                                 |   6 +-
 .../src/main/resources/application.properties |   6 +-
 admin/src/main/resources/logback-config.xml   | 109 ------------------
 pom.xml                                       |   2 +-
 wsqlite/pom.xml                               |   2 +-
 5 files changed, 6 insertions(+), 119 deletions(-)
 delete mode 100644 admin/src/main/resources/logback-config.xml

diff --git a/admin/pom.xml b/admin/pom.xml
index 346ef14..2a8eeab 100644
--- a/admin/pom.xml
+++ b/admin/pom.xml
@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>xyz.wbsite</groupId>
-        <artifactId>nginx-admin</artifactId>
+        <artifactId>nginx-admin-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>xyz.wbsite</groupId>
-    <artifactId>admin</artifactId>
+    <artifactId>nginx-admin</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
@@ -78,7 +78,7 @@
 
     <build>
         <!-- 项目名称 -->
-        <finalName>${artifactId}-${version}</finalName>
+        <finalName>${artifactId}</finalName>
         <!-- 默认的主代码目录 -->
         <sourceDirectory>src/main/java</sourceDirectory>
         <!-- 默认的测试代码目录 -->
diff --git a/admin/src/main/resources/application.properties b/admin/src/main/resources/application.properties
index beb5296..d77045b 100644
--- a/admin/src/main/resources/application.properties
+++ b/admin/src/main/resources/application.properties
@@ -15,10 +15,6 @@ server.tomcat.uri-encoding=UTF-8
 web.welcome.page=/mapping.htm
 # 不需要验证授权, 或该请求有自己的验证机制
 web.url.auth.excluded=/favicon.ico,/static/**,/api,/login.htm,/sse/**
-# 日志配置
-logging.path=D://
-logging.levels=DEBUG
-logging.config=classpath:logback-config.xml
 # jackson 相关配置
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
@@ -51,4 +47,4 @@ dbpath=
 nginx-path=
 admin.username=admin
 admin.password=admin
-mapping.default.port=8080
\ No newline at end of file
+mapping.default.port=80
\ No newline at end of file
diff --git a/admin/src/main/resources/logback-config.xml b/admin/src/main/resources/logback-config.xml
deleted file mode 100644
index 39f7b30..0000000
--- a/admin/src/main/resources/logback-config.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-
-    <!-- 日志根目录 -->
-    <springProperty scope="context" name="root" source="logging.path"/>
-    <!-- 日志等级 -->
-    <springProperty scope="context" name="level" source="logging.levels"/>
-
-    <!-- 迭代日志All级别文件 -->
-    <appender name="RollingFile_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${root}log/all/all.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${root}log/all/all-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <MaxHistory>30</MaxHistory>
-            <TimeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <MaxFileSize>10MB</MaxFileSize>
-            </TimeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>[%-4level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%logger{36}-%method] %msg%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-    </appender>
-
-    <!-- 迭代日志error级别文件 -->
-    <appender name="RollingFile_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${root}log/error/error.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${root}log/error/error-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <MaxHistory>30</MaxHistory>
-            <TimeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <MaxFileSize>10MB</MaxFileSize>
-            </TimeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>[%-4level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%logger{36}-%method] %msg%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 迭代日志warn级别文件 -->
-    <appender name="RollingFile_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${root}log/warn/warn.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${root}log/warn/warn-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <MaxHistory>30</MaxHistory>
-            <TimeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <MaxFileSize>10MB</MaxFileSize>
-            </TimeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>[%-4level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%logger{36}-%method] %msg%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>WARN</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 迭代日志info级别文件 -->
-    <appender name="RollingFile_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${root}log/info/info.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${root}log/info/info-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <MaxHistory>30</MaxHistory>
-            <TimeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <MaxFileSize>10MB</MaxFileSize>
-            </TimeBasedFileNamingAndTriggeringPolicy>
-        </rollingPolicy>
-        <encoder>
-            <pattern>[%-4level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%logger{36}-%method] %msg%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 控制台输出 -->
-    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
-         debug级别及以上
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>DEBUG</level>
-        </filter>
-        <encoder>
-            <pattern>%highlight(%d{yyyy-MM-dd HH:mm:ss.SSS} [%-4level] [%thread] [%logger{36}-%method] %ex %msg%n)</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="java.sql" level="INFO"></logger>
-
-    <!-- 日志总入口 -->
-    <root level="${level}">
-        <appender-ref ref="RollingFile_ALL"/>
-        <appender-ref ref="RollingFile_ERROR"/>
-        <appender-ref ref="RollingFile_WARN"/>
-        <appender-ref ref="RollingFile_INFO"/>
-        <appender-ref ref="Console"/>
-    </root>
-
-</configuration>
diff --git a/pom.xml b/pom.xml
index ae254e0..65b8fd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <groupId>xyz.wbsite</groupId>
-    <artifactId>nginx-admin</artifactId>
+    <artifactId>nginx-admin-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
diff --git a/wsqlite/pom.xml b/wsqlite/pom.xml
index cc71de7..3792fa4 100644
--- a/wsqlite/pom.xml
+++ b/wsqlite/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>xyz.wbsite</groupId>
-        <artifactId>nginx-admin</artifactId>
+        <artifactId>nginx-admin-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>