1.0.0

.gitignore

@@ -6,6 +6,7 @@ HELP.md
 **/out/
 **/logs/
 !gradle/wrapper/gradle-wrapper.jar
+*.log
 
 ### STS ###
 .apt_generated

common-utils/src/main/java/com/zq/common/config/limit/LimitAspect.java

@@ -8,7 +8,6 @@ import com.zq.common.context.ContextUtils;
 import com.zq.common.http.HttpRequestUtils;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.vo.ApiTokenVo;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -32,13 +31,12 @@ import java.util.List;
  * @author wilmiam
  * @since 2021-07-09 17:51
  */
-@Slf4j
 @Aspect
 @Component
 public class LimitAspect {
 
     private final StringRedisTemplate stringRedisTemplate;
-    private static final Logger logger = LoggerFactory.getLogger(LimitAspect.class);
+    private static final Logger log = LoggerFactory.getLogger("ratelimit");
 
     public LimitAspect(StringRedisTemplate stringRedisTemplate) {
         this.stringRedisTemplate = stringRedisTemplate;
@@ -69,7 +67,7 @@ public class LimitAspect {
 
         String name = limit.name();
         name = StringUtils.isNotBlank(name) ? name : signatureMethod.getName();
-        logger.debug("第{}次访问，KEY为 {}，描述为 [{}] 的接口", count, keys, name);
+        log.debug("第{}次访问，KEY为 {}，描述为 [{}] 的接口", count, keys, name);
     }
 
     /**

config-server/src/main/resources/properties/config-dev.yml

@@ -57,5 +57,3 @@ task:
     # 活跃时间
     keep-alive-seconds: 30
 
-#日志等级
-logging.level.com.zq.*: debug

user-server/src/main/java/com/zq/user/controller/app/UserController.java

@@ -33,7 +33,7 @@ public class UserController {
      * @param phone
      * @return
      */
-    @Limit(limitType = LimitType.PARAM, keyParamIndex = 0, period = 30, count = 1, name = "发送手机验证码", errMsg = "请稍后再试!")
+    @Limit(limitType = LimitType.PARAM, keyParamIndex = 0, period = 1, count = 1, name = "发送手机验证码", errMsg = "请稍后再试!")
     @ApiOperation("发送验证码")
     @GetMapping(value = "/sendCode")
     public ResultVo sendCode(String phone) {

user-server/src/main/java/com/zq/user/service/UserService.java

@@ -20,7 +20,6 @@ import com.zq.user.vo.LoginVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 
@@ -152,7 +151,7 @@ public class UserService {
         userDao.updateById(appUser);
     }
 
-    @Cacheable
+    // @Cacheable
     public AppUser getUserInfo(String userId) {
         return userDao.selectById(userId);
     }

user-server/src/main/resources/bootstrap.yml

 spring:
+  profiles:
+    active: @profiles.active@
   cloud:
     config:
       name: config

user-server/src/main/resources/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+
+    <property name="default_log_path" value="logs"/>
+    <property name="default_log_file" value="user"/>
+    <property name="LOG_PATH" value="${LOG_PATH:-${default_log_path}}"/>
+    <property name="LOG_FILE" value="${LOG_FILE:-${default_log_file}}"/>
+
+    <!-- the name of the application's logging context -->
+    <!-- by default each JMXConfigurator instance will be registered under the same name in the same JVM -->
+    <!-- we need to set the contextName for different apps, so that the jmxconfigurator won't collide -->
+    <contextName>user</contextName>
+    <jmxConfigurator/>
+
+    <!--主要日志配置 开始-->
+    <appender name="SIZED_ROLLING_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>%d %-5p [%t] %logger : %m%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <file>${LOG_FILE}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!-- 日志文档保留天数 -->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+    </appender>
+    <!-- 异步输出 -->
+    <appender name="main-logger-appender" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="SIZED_ROLLING_FILE"/>
+    </appender>
+    <!--主要日志配置 结束-->
+
+    <!--限流日志配置 开始-->
+    <appender name="RATELIMIT_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>%d %-5p [%t] %logger : %m%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <file>ratelimit.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/ratelimit.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!-- 日志文档保留天数 -->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+    </appender>
+    <!-- 异步输出 -->
+    <appender name="ratelimit-appender" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="RATELIMIT_FILE"/>
+    </appender>
+    <!-- 配置指定日志输出到指定文件 name => LoggerFactory.getLogger("ratelimit") -->
+    <logger name="ratelimit" additivity="false" level="DEBUG">
+        <appender-ref ref="ratelimit-appender"/>
+    </logger>
+    <!--限流日志配置 结束-->
+
+
+    <!-- 多环境配置 按照active profile选择分支 -->
+    <springProfile name="dev">
+        <logger name="com.zq" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+    <springProfile name="product">
+        <logger name="com.zq" level="INFO"/>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="main-logger-appender"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file