From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 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..b284216 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.*;
/**
* 楠岃瘉鐮侀厤缃�
@@ -14,41 +18,44 @@
@Configuration
public class CaptchaConfig {
- private final int width = 160;
- private final int height = 60;
- private final Color background = Color.PINK;
- private final Font font = new Font("Arial", Font.BOLD, 48);
+ private static final int WIDTH = 160;
+ private static final int HEIGHT = 60;
+ private static final Color BACKGROUND = Color.PINK;
+ private static final Font FONT = new Font("Arial", Font.BOLD, 48);
/**
* 鍦嗗湀骞叉壈楠岃瘉鐮�
*/
- @Bean(name = "CircleCaptcha")
- public CircleCaptcha getCircleCaptcha() {
- CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(width, height);
- captcha.setBackground(background);
- captcha.setFont(font);
+ @Lazy
+ @Bean
+ public CircleCaptcha circleCaptcha() {
+ CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(WIDTH, HEIGHT);
+ captcha.setBackground(BACKGROUND);
+ captcha.setFont(FONT);
return captcha;
}
/**
* 绾挎骞叉壈鐨勯獙璇佺爜
*/
- @Bean(name = "LineCaptcha")
- public LineCaptcha getLineCaptcha() {
- LineCaptcha captcha = CaptchaUtil.createLineCaptcha(width, height);
- captcha.setBackground(background);
- captcha.setFont(font);
+ @Lazy
+ @Bean
+ public LineCaptcha lineCaptcha() {
+ LineCaptcha captcha = CaptchaUtil.createLineCaptcha(WIDTH, HEIGHT);
+ captcha.setBackground(BACKGROUND);
+ captcha.setFont(FONT);
return captcha;
}
/**
* 鎵洸骞叉壈楠岃瘉鐮�
*/
- @Bean(name = "ShearCaptcha")
- public ShearCaptcha getShearCaptcha() {
- ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(width, height);
- captcha.setBackground(background);
- captcha.setFont(font);
+ @Lazy
+ @Bean
+ public ShearCaptcha shearCaptcha() {
+ ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(WIDTH, HEIGHT);
+ captcha.setBackground(BACKGROUND);
+ captcha.setFont(FONT);
return captcha;
}
--
Gitblit v1.9.3