From 9ba61037a4ad13d454f43b0a25992b4fd311e4fe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 30 三月 2022 23:04:51 +0800
Subject: [PATCH] update 优化代码与注释
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java | 3 +++
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 7 +++----
ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java | 9 ++++++++-
ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java | 26 +++++++++++++-------------
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 3 +++
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 3 +++
ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java | 5 +++++
7 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index e3cb9c5..2aec92d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -32,7 +32,7 @@
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
- private static String[] parsePatterns = {
+ private static final String[] PARSE_PATTERNS = {
"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
@@ -107,7 +107,7 @@
return null;
}
try {
- return parseDate(str.toString(), parsePatterns);
+ return parseDate(str.toString(), PARSE_PATTERNS);
} catch (ParseException e) {
return null;
}
@@ -124,8 +124,7 @@
/**
* 璁＄畻鐩稿樊澶╂暟
*/
- public static int differentDaysByMillisecond(Date date1, Date date2)
- {
+ public static int differentDaysByMillisecond(Date date1, Date date2) {
return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
}
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 3d4bc9e..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
@@ -18,10 +18,10 @@
@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);
/**
* 鍦嗗湀骞叉壈楠岃瘉鐮�
@@ -29,9 +29,9 @@
@Lazy
@Bean
public CircleCaptcha circleCaptcha() {
- CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(width, height);
- captcha.setBackground(background);
- captcha.setFont(font);
+ CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(WIDTH, HEIGHT);
+ captcha.setBackground(BACKGROUND);
+ captcha.setFont(FONT);
return captcha;
}
@@ -41,9 +41,9 @@
@Lazy
@Bean
public LineCaptcha lineCaptcha() {
- LineCaptcha captcha = CaptchaUtil.createLineCaptcha(width, height);
- captcha.setBackground(background);
- captcha.setFont(font);
+ LineCaptcha captcha = CaptchaUtil.createLineCaptcha(WIDTH, HEIGHT);
+ captcha.setBackground(BACKGROUND);
+ captcha.setFont(FONT);
return captcha;
}
@@ -53,9 +53,9 @@
@Lazy
@Bean
public ShearCaptcha shearCaptcha() {
- ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(width, height);
- captcha.setBackground(background);
- captcha.setFont(font);
+ ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(WIDTH, HEIGHT);
+ captcha.setBackground(BACKGROUND);
+ captcha.setFont(FONT);
return captcha;
}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index 1a1d04a..b6c2248 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -5,6 +5,8 @@
import com.ruoyi.generator.config.GenConfig;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.commons.lang3.RegExUtils;
import java.util.Arrays;
@@ -14,6 +16,7 @@
*
* @author ruoyi
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class GenUtils {
/**
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
index a81bd51..67769a8 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
@@ -1,6 +1,8 @@
package com.ruoyi.generator.util;
import com.ruoyi.common.constant.Constants;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.velocity.app.Velocity;
import java.util.Properties;
@@ -10,6 +12,7 @@
*
* @author ruoyi
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class VelocityInitializer {
/**
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 7464970..d8eeb6d 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -11,6 +11,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.velocity.VelocityContext;
import java.util.*;
@@ -20,6 +22,7 @@
*
* @author ruoyi
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class VelocityUtils {
/**
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java
index c6661e7..981c23e 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java
@@ -12,11 +12,14 @@
*/
public interface IOssStrategy {
+ /**
+ * 鍒涘缓瀛樺偍妗�
+ */
void createBucket();
/**
* 鑾峰彇鏈嶅姟鍟嗙被鍨�
- * @return
+ * @return 瀵硅薄瀛樺偍鏈嶅姟鍟嗘灇涓�
*/
OssEnumd getServiceType();
@@ -25,6 +28,7 @@
*
* @param data 鏂囦欢瀛楄妭鏁扮粍
* @param path 鏂囦欢璺緞锛屽寘鍚枃浠跺悕
+ * @param contentType 鏂囦欢绫诲瀷
* @return 杩斿洖http鍦板潃
*/
UploadResult upload(byte[] data, String path, String contentType);
@@ -41,6 +45,7 @@
*
* @param data 鏂囦欢瀛楄妭鏁扮粍
* @param suffix 鍚庣紑
+ * @param contentType 鏂囦欢绫诲瀷
* @return 杩斿洖http鍦板潃
*/
UploadResult uploadSuffix(byte[] data, String suffix, String contentType);
@@ -50,6 +55,7 @@
*
* @param inputStream 瀛楄妭娴�
* @param path 鏂囦欢璺緞锛屽寘鍚枃浠跺悕
+ * @param contentType 鏂囦欢绫诲瀷
* @return 杩斿洖http鍦板潃
*/
UploadResult upload(InputStream inputStream, String path, String contentType);
@@ -59,6 +65,7 @@
*
* @param inputStream 瀛楄妭娴�
* @param suffix 鍚庣紑
+ * @param contentType 鏂囦欢绫诲瀷
* @return 杩斿洖http鍦板潃
*/
UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType);
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java
index e4928cd..ae17c19 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java
@@ -60,5 +60,10 @@
@Override
public abstract UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType);
+ /**
+ * 鑾峰彇鍩熷悕璁块棶閾炬帴
+ *
+ * @return 鍩熷悕璁块棶閾炬帴
+ */
public abstract String getEndpointLink();
}
--
Gitblit v1.9.3