From 71cf8d87063893cf0fe1b5621811ad0f7390c3e4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 14 Sep 2023 20:30:06 +0800
Subject: [PATCH] 配置文件修改，系统登录有效期设置，生成环境日志打印配置修改
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 13 +++++++++++++
src/main/resources/log/logback-prod.xml | 32 ++++++++++++++++++++++++++++++--
src/main/resources/application-prod.yml | 4 ++--
src/main/resources/application-test.yml | 4 ++--
4 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
index 227b74d..126115d 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -29,6 +29,7 @@
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.launch.constant.TokenConstant;
import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
@@ -44,6 +45,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.Duration;
import java.util.UUID;
@@ -93,6 +96,16 @@
return authInfo.set("error_code", HttpServletResponse.SC_BAD_REQUEST).set("error_description", "未获得用户的角色信息");
}
+ try {
+ Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-10-15").getTime();
+ long now= System.currentTimeMillis();
+ if (parse < now){
+ throw new ServiceException("试用已到期");
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
return TokenUtil.createAuthInfo(userInfo);
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 32ddf20..4821dd2 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -17,9 +17,9 @@
datasource:
# MySql
#
- url: jdbc:mysql://127.0.0.1:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://127.0.0.1:3308/jbld?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: HCyj@2022
+ password: Zhba@jc@2023
# url: jdbc:mysql://61.131.136.25:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
# username: root
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 89f0180..47c9f2c 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -29,9 +29,9 @@
# username: root
# password: ZHba@0112
- url: jdbc:mysql://106.225.193.35:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
+ url: jdbc:mysql://127.0.0.1:3308/jbld?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
username: root
- password: HCyj@2022
+ password: root
# PostgreSQL
diff --git a/src/main/resources/log/logback-prod.xml b/src/main/resources/log/logback-prod.xml
index ab6b102..1c16f30 100644
--- a/src/main/resources/log/logback-prod.xml
+++ b/src/main/resources/log/logback-prod.xml
@@ -21,11 +21,14 @@
</encoder>
</appender>
+
<!-- 生成日志文件 -->
<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件输出的文件名 -->
- <FileNamePattern>target/blade/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
+ <!-- 日志文件输出的文件名 -->
+ <FileNamePattern>/home/jbld/log/info/info-%d{yyyy-MM-dd}.log</FileNamePattern>
+ <maxHistory>3</maxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
@@ -39,10 +42,30 @@
</appender>
<!-- 生成日志文件 -->
+ <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 日志文件输出的文件名 -->
+ <!-- 日志文件输出的文件名 -->
+ <FileNamePattern>/home/jbld/log/warn/warn-%d{yyyy-MM-dd}.log</FileNamePattern>
+ <maxHistory>7</maxHistory>
+ </rollingPolicy>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
+ </encoder>
+ <!-- 打印日志级别 -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>WARN</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <!-- 生成日志文件 -->
<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件输出的文件名 -->
- <FileNamePattern>target/blade/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>/home/jbld/log/error/error-%d{yyyy-MM-dd}.log</FileNamePattern>
+ <maxHistory>30</maxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
@@ -144,6 +167,11 @@
<logger name="net.sf.ehcache" level="INFO"/>
<logger name="druid.sql" level="INFO"/>
+ <logger name="org.springblade.modules" level="DEBUG">
+ <appender-ref ref="ERROR"/>
+ <appender-ref ref="WARN"/>
+ <appender-ref ref="INFO"/>
+ </logger>
<!-- 减少nacos日志 -->
<logger name="com.alibaba.nacos" level="ERROR"/>
--
Gitblit v1.9.3