1、日志文件

2、开发水印


Former-commit-id: 8ebd499d2eb991489475601645676d9d898c332f

src/main/resources/modules/SpringBoot/java/action/screen/Index.java

@@ -18,6 +18,7 @@ public class Index extends Screen {
         prop.put("coll", false);//左侧菜单是否收缩
         prop.put("tran", false);//是否展示动画
         prop.put("full", false);//是否全屏
+        prop.put("active", LocalData.getActive());//当前激活环境
         model.addAttribute("prop", prop);
         model.addAttribute("token", LocalData.getToken());
     }

src/main/resources/modules/SpringBoot/resources/application-dev.ftl

@@ -14,9 +14,6 @@ spring.http.encoding.force=true
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.enabled=true
 server.tomcat.uri-encoding=UTF-8
-# 日志配置
-logging.path=D://
-logging.levels=DEBUG
 <#if project.needMoreDB>
 # ==================================================================================
 <#if dataBase == 'Oracle'>

src/main/resources/modules/SpringBoot/resources/application-prod.ftl

@@ -14,9 +14,6 @@ spring.http.encoding.force=true
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.enabled=true
 server.tomcat.uri-encoding=UTF-8
-# 日志配置
-logging.path=/root/
-logging.levels=INFO
 <#if project.needMoreDB>
 # ==================================================================================
 <#if dataBase == 'Oracle'>

src/main/resources/modules/SpringBoot/resources/logback-spring.xml

@@ -1,16 +1,35 @@
 <?xml version="1.0"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
+<configuration scan="true" scanPeriod="5 seconds" debug="false">
 
+    <!-- 开发环境时激活 -->
+    <springProfile name="dev">
+        <!-- 控制台输出 -->
+        <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+            <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="DEBUG"></logger>
+
+        <root level="DEBUG">
+            <appender-ref ref="Console"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境时激活 -->
+    <springProfile name="prod">
         <!-- 日志根目录 -->
-    <springProperty scope="context" name="root" source="logging.path"/>
+        <property name="root" value="/root"/>
-    <!-- 日志等级 -->
-    <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>
+            <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>
+                <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>
@@ -26,9 +45,9 @@
 
         <!-- 迭代日志error级别文件 -->
         <appender name="RollingFile_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${root}log/error/error.log</File>
+            <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>
+                <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>
@@ -46,9 +65,9 @@
 
         <!-- 迭代日志warn级别文件 -->
         <appender name="RollingFile_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${root}log/warn/warn.log</File>
+            <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>
+                <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>
@@ -66,9 +85,9 @@
 
         <!-- 迭代日志info级别文件 -->
         <appender name="RollingFile_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${root}log/info/info.log</File>
+            <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>
+                <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>
@@ -84,26 +103,14 @@
             </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}">
+        <root level="INFO">
             <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>
-
+    </springProfile>
 </configuration>

src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl

@@ -8,6 +8,8 @@
                 stroke-linecap="round"></el-progress>
     </div>
 
+    <p v-if="'${r'${prop.active}'}' == 'dev'" id="devMarker" marker-value="DEV"></p>
+
     <div id="aside" :style="{width:(prop.coll?'64px':'200px')}">
         <el-menu
                 @open="handleOpen"
@@ -180,6 +182,28 @@
         background-color: transparent;
     }
 
+    #devMarker{
+        position: absolute;
+        bottom: 50px;
+        right: 50px;
+    }
+
+    #devMarker:after{
+        pointer-events:none;
+        content: attr(marker-value);
+        font-size: 100px;
+        color: rgba(188, 188, 188, 0.5);
+        z-index: 9999;
+        display: block;
+        position: relative;
+        text-align: center;
+        line-height: 100%;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+    }
+
     #aside {
         overflow: hidden;
         height: 100%;