diff --git a/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java index e8ace4e..1f47d7a 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java @@ -50,7 +50,6 @@ public class RateLimiterAspect @Before("@annotation(rateLimiter)") public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable { - String key = rateLimiter.key(); int time = rateLimiter.time(); int count = rateLimiter.count(); @@ -63,7 +62,7 @@ public class RateLimiterAspect { throw new ServiceException("访问过于频繁,请稍候再试"); } - log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), key); + log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), combineKey); } catch (ServiceException e) { diff --git a/src/main/resources/mybatis/tool/GenTableColumnMapper.xml b/src/main/resources/mybatis/tool/GenTableColumnMapper.xml index 5169d05..175b016 100644 --- a/src/main/resources/mybatis/tool/GenTableColumnMapper.xml +++ b/src/main/resources/mybatis/tool/GenTableColumnMapper.xml @@ -112,19 +112,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update gen_table_column - column_comment = #{columnComment}, - java_type = #{javaType}, - java_field = #{javaField}, - is_insert = #{isInsert,jdbcType=CHAR}, - is_edit = #{isEdit,jdbcType=CHAR}, - is_list = #{isList,jdbcType=CHAR}, - is_query = #{isQuery,jdbcType=CHAR}, - is_required = #{isRequired,jdbcType=CHAR}, - query_type = #{queryType}, - html_type = #{htmlType}, - dict_type = #{dictType}, - sort = #{sort}, - update_by = #{updateBy,jdbcType=VARCHAR}, + is_insert = #{isInsert}, + is_edit = #{isEdit}, + is_list = #{isList}, + is_query = #{isQuery}, + is_required = #{isRequired}, + column_comment = #{columnComment}, + java_type = #{javaType}, + java_field = #{javaField}, + query_type = #{queryType}, + html_type = #{htmlType}, + dict_type = #{dictType}, + sort = #{sort}, + update_by = #{updateBy}, update_time = sysdate where column_id = #{columnId}