From 6ff5109ae38c83bc1b326d50c0b2e034aab297f7 Mon Sep 17 00:00:00 2001
From: jlt <jltdev@163.com>
Date: Sat, 2 Apr 2022 22:45:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BC=95=E5=85=A5Ruoyi-Vue-Plus?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E5=BD=A9=E8=89=B2=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E6=97=A5=E5=BF=97=E3=80=82=202=E3=80=81=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E7=95=8C=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?out-in=20fade-transform=E6=B7=A1=E5=85=A5=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E3=80=82=203=E3=80=81=E6=B7=BB=E5=8A=A0=E9=9D=9E=E4=B8=BB?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=86=85=E7=9A=84=E7=8B=AC=E7=AB=8B=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E7=94=A8=E4=BA=8E=E6=B5=8B=E8=AF=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                    |   7 ++
 ruoyi-admin/pom.xml                        |   5 +
 ruoyi-admin/src/main/resources/logback.xml |  20 +++-
 ruoyi-ui/src/layout/components/AppMain.vue | 112 ++++++++++-----------
 ruoyi-ui/src/router/index.js               |   5 +
 ruoyi-ui/src/views/test.vue                |  46 +++++++++
 6 files changed, 133 insertions(+), 62 deletions(-)
 create mode 100644 ruoyi-ui/src/views/test.vue

diff --git a/pom.xml b/pom.xml
index ab460d4b1..1588b9d5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
         <jwt.version>0.9.1</jwt.version>
         <qiniu.version>7.9.0</qiniu.version>
         <gson.version>2.8.5</gson.version>
+        <tlog.version>1.3.6</tlog.version>
     </properties>
 	
     <!-- 依赖声明 -->
@@ -220,6 +221,12 @@
                 <version>${gson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>tlog-web-spring-boot-starter</artifactId>
+                <version>${tlog.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index bb6aa4945..9f4102838 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -66,6 +66,11 @@
             <artifactId>private-farm</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>tlog-web-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index 62c42835b..24f86ab84 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -2,15 +2,25 @@
 <configuration>
     <!-- 日志存放路径 -->
 	<property name="log.path" value="/home/ruoyi/logs" />
+    <property name="console.log.pattern"
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
 	<!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-	</appender>
+<!--	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">-->
+<!--		<encoder>-->
+<!--			<pattern>${log.pattern}</pattern>-->
+<!--		</encoder>-->
+<!--	</appender>-->
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+            <pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
 	
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index 7cc667488..b03ea0fb9 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -1,57 +1,55 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
-        <router-view :key="key" />
-      </keep-alive>
-    </transition>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'AppMain',
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
-    },
-    key() {
-      return this.$route.path
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-main {
-  /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
-  width: 100%;
-  position: relative;
-  overflow: hidden;
-}
-
-.fixed-header+.app-main {
-  padding-top: 50px;
-}
-
-.hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
-  }
-
-  .fixed-header+.app-main {
-    padding-top: 84px;
-  }
-}
-</style>
-
-<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 17px;
-  }
-}
-</style>
+<template>
+  <section class="app-main">
+      <keep-alive :include="cachedViews">
+        <router-view :key="key" />
+      </keep-alive>
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'AppMain',
+  computed: {
+    cachedViews() {
+      return this.$store.state.tagsView.cachedViews
+    },
+    key() {
+      return this.$route.path
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-main {
+  /* 50= navbar  50  */
+  min-height: calc(100vh - 50px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+
+.fixed-header+.app-main {
+  padding-top: 50px;
+}
+
+.hasTagsView {
+  .app-main {
+    /* 84 = navbar + tags-view = 50 + 34 */
+    min-height: calc(100vh - 84px);
+  }
+
+  .fixed-header+.app-main {
+    padding-top: 84px;
+  }
+}
+</style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 17px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 52bfc0cf9..1f290aede 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -51,6 +51,11 @@ export const constantRoutes = [
     component: () => import('@/views/register'),
     hidden: true
   },
+  {
+    path: '/test',
+    component: () => import('@/views/test'),
+    hidden: true
+  },
   {
     path: '/404',
     component: () => import('@/views/error/404'),
diff --git a/ruoyi-ui/src/views/test.vue b/ruoyi-ui/src/views/test.vue
new file mode 100644
index 000000000..4dc2dec56
--- /dev/null
+++ b/ruoyi-ui/src/views/test.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="register">
+    <!--  底部  -->
+    <div class="el-register-footer">
+      <span>Copyright © 2018-2022 私家农场 版权所有.</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Test",
+  data() {
+    return {
+      codeUrl: ""
+    };
+  },
+  created() {
+    this.getCode();
+  },
+  methods: {
+    getCode() {
+    },
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.register {
+  height: 100%;
+  background-color: #1f2d3d;
+}
+
+.el-register-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+</style>