From f6778aeffde522ccc56dae919842bd1b0d384da8 Mon Sep 17 00:00:00 2001
From: zjh <temp2016good@163.com>
Date: Sat, 18 Feb 2023 12:17:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=B4=A6=E5=8F=B7=E5=92=8C=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renren-admin/src/main/resources/application-dev.yml  | 4 ++--
 renren-admin/src/main/resources/application-prod.yml | 4 ++--
 renren-api/src/main/resources/application-dev.yml    | 4 ++--
 renren-generator/src/main/resources/application.yml  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/renren-admin/src/main/resources/application-dev.yml b/renren-admin/src/main/resources/application-dev.yml
index ad7412a7..395d743a 100644
--- a/renren-admin/src/main/resources/application-dev.yml
+++ b/renren-admin/src/main/resources/application-dev.yml
@@ -4,8 +4,8 @@ spring:
       #MySQL
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://localhost:3306/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-      username: renren
-      password: 123456
+      username: root
+      password: root
       #达梦8
 #      driver-class-name: dm.jdbc.driver.DmDriver
 #      url: jdbc:dm://192.168.10.10:5236/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
diff --git a/renren-admin/src/main/resources/application-prod.yml b/renren-admin/src/main/resources/application-prod.yml
index 80d85af6..61b6dbea 100644
--- a/renren-admin/src/main/resources/application-prod.yml
+++ b/renren-admin/src/main/resources/application-prod.yml
@@ -4,8 +4,8 @@ spring:
       #MySQL
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://localhost:3306/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-      username: renren
-      password: 123456
+      username: root
+      password: Ok2023@ak47
       initial-size: 10
       max-active: 100
       min-idle: 10
diff --git a/renren-api/src/main/resources/application-dev.yml b/renren-api/src/main/resources/application-dev.yml
index fa43e6c8..c4c364d3 100644
--- a/renren-api/src/main/resources/application-dev.yml
+++ b/renren-api/src/main/resources/application-dev.yml
@@ -3,8 +3,8 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://localhost:3306/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-      username: renren
-      password: 123456
+      username: root
+      password: root
       initial-size: 10
       max-active: 100
       min-idle: 10
diff --git a/renren-generator/src/main/resources/application.yml b/renren-generator/src/main/resources/application.yml
index 9e7d6484..67c16bfb 100644
--- a/renren-generator/src/main/resources/application.yml
+++ b/renren-generator/src/main/resources/application.yml
@@ -10,8 +10,8 @@ spring:
     #MySQL配置
     driverClassName: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://localhost:3306/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-    username: renren
-    password: 123456
+    username: root
+    password: root
     #oracle配置
 #    driverClassName: oracle.jdbc.OracleDriver
 #    url: jdbc:oracle:thin:@192.168.10.10:1521:xe
-- 
Gitee


From 0c8853fd4250fd8eb21f95f7ffcc2928536f5069 Mon Sep 17 00:00:00 2001
From: zjh <temp2016good@163.com>
Date: Sat, 18 Feb 2023 15:41:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/renren-admin/src/main/resources/logback-spring.xml b/renren-admin/src/main/resources/logback-spring.xml
index 5deef210..351756fd 100644
--- a/renren-admin/src/main/resources/logback-spring.xml
+++ b/renren-admin/src/main/resources/logback-spring.xml
@@ -1,9 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <springProperty scope="context" name="applicationName" source="spring.application.name" defaultValue="renren-security"/>
+    <springProperty scope="context" name="logLevel" source="log.level" defaultValue="INFO"/>
+    <springProperty scope="context" name="logPath" source="log.path" defaultValue="/opt/logs"/>
+
     <include resource="org/springframework/boot/logging/logback/base.xml" />
     <logger name="org.springframework.web" level="INFO"/>
     <logger name="org.springboot.sample" level="TRACE" />
 
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date %-5level [%thread] -[%X{traceId}] %logger{36}.%M [L:%line] - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <layout>
+            <pattern>%date %-5level [%thread] -[%X{traceId}] %logger{36}.%M [L:%line] - %msg%n</pattern>
+        </layout>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logPath}/${applicationName}/${applicationName}-%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
+    </appender>
+    <appender name="rollingFile-debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <layout>
+            <pattern>%date %-5level [%thread] -[%X{traceId}] %logger{36}.%M [L:%line] - %msg%n</pattern>
+        </layout>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logPath}/${applicationName}/${applicationName}-debug-%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
+    </appender>
+
     <!-- 开发、测试环境 -->
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
-- 
Gitee