From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java
index 4cd9997..3d4bc9e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java
@@ -1,10 +1,14 @@
package com.ruoyi.framework.config;
-import java.awt.*;
-
-import cn.hutool.captcha.*;
+import cn.hutool.captcha.CaptchaUtil;
+import cn.hutool.captcha.CircleCaptcha;
+import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.captcha.ShearCaptcha;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+import java.awt.*;
/**
* 楠岃瘉鐮侀厤缃�
@@ -22,8 +26,9 @@
/**
* 鍦嗗湀骞叉壈楠岃瘉鐮�
*/
- @Bean(name = "CircleCaptcha")
- public CircleCaptcha getCircleCaptcha() {
+ @Lazy
+ @Bean
+ public CircleCaptcha circleCaptcha() {
CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(width, height);
captcha.setBackground(background);
captcha.setFont(font);
@@ -33,8 +38,9 @@
/**
* 绾挎骞叉壈鐨勯獙璇佺爜
*/
- @Bean(name = "LineCaptcha")
- public LineCaptcha getLineCaptcha() {
+ @Lazy
+ @Bean
+ public LineCaptcha lineCaptcha() {
LineCaptcha captcha = CaptchaUtil.createLineCaptcha(width, height);
captcha.setBackground(background);
captcha.setFont(font);
@@ -44,8 +50,9 @@
/**
* 鎵洸骞叉壈楠岃瘉鐮�
*/
- @Bean(name = "ShearCaptcha")
- public ShearCaptcha getShearCaptcha() {
+ @Lazy
+ @Bean
+ public ShearCaptcha shearCaptcha() {
ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(width, height);
captcha.setBackground(background);
captcha.setFont(font);
--
Gitblit v1.9.3