Merge branch 'master' of gitee.com:youlaiorg/youlai-boot

# Conflicts:
#	src/main/java/com/youlai/boot/config/SecurityConfig.java
#	src/main/java/com/youlai/boot/config/property/TencentSmsProperties.java
#	src/main/java/com/youlai/boot/support/sms/impl/AliyunSmsServiceImpl.java
#	src/main/java/com/youlai/boot/support/sms/impl/TencentSmsService.java
#	src/main/resources/application-dev.yml
#	src/main/resources/application-prod.yml

sql/youlai-admin.sql

@@ -411,7 +411,7 @@ CREATE TABLE `sys_log` (
     `module` TINYINT NOT NULL COMMENT '模块，数字枚举，参考 LogModule 枚举',
     `action_type` TINYINT NOT NULL COMMENT '操作类型，数字枚举，参考 ActionType 枚举',
     `title` VARCHAR(100) NOT NULL COMMENT '前端显示标题',
-    `content` TEXT COMMENT '自定义日志内容',
+    `content` VARCHAR(500) COMMENT '自定义日志内容',
     `operator_id` BIGINT COMMENT '操作人ID',
     `operator_name` VARCHAR(50) COMMENT '操作人名称',
     `request_uri` VARCHAR(255) COMMENT '请求路径',
@@ -423,7 +423,7 @@ CREATE TABLE `sys_log` (
     `os` VARCHAR(100) COMMENT '操作系统',
     `browser` VARCHAR(100) COMMENT '浏览器',
     `status` TINYINT DEFAULT 1 COMMENT '0失败 1成功',
-    `error_msg` VARCHAR(255) COMMENT '错误信息',
+    `error_msg` VARCHAR(1000) COMMENT '错误信息',
     `execution_time` INT COMMENT '执行时间(ms)',
     `create_time` DATETIME COMMENT '操作时间',
     PRIMARY KEY (`id`) USING BTREE,