修改对象存储、短信配置模块

blade-core-oss/src/main/java/org/springblade/core/oss/config/QiniuConfiguration.java

@@ -1,80 +1,88 @@
-/**
- * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springblade.core.oss.config;
-
-import com.qiniu.storage.BucketManager;
-import com.qiniu.storage.Region;
-import com.qiniu.storage.UploadManager;
-import com.qiniu.util.Auth;
-import lombok.AllArgsConstructor;
-import org.springblade.core.oss.QiniuTemplate;
-import org.springblade.core.oss.props.OssProperties;
-import org.springblade.core.oss.rule.OssRule;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-
-/**
- * Qiniu配置类
- *
- * @author Chill
- */
-@AllArgsConstructor
-@AutoConfiguration(after = OssConfiguration.class)
-@ConditionalOnClass({Auth.class, UploadManager.class, BucketManager.class})
-@EnableConfigurationProperties(OssProperties.class)
-@ConditionalOnProperty(value = "oss.name", havingValue = "qiniu")
-public class QiniuConfiguration {
-
-	private final OssProperties ossProperties;
-	private final OssRule ossRule;
-
-	@Bean
-	@ConditionalOnMissingBean(com.qiniu.storage.Configuration.class)
-	public com.qiniu.storage.Configuration qnConfiguration() {
-		return new com.qiniu.storage.Configuration(Region.autoRegion());
-	}
-
-	@Bean
-	@ConditionalOnMissingBean(Auth.class)
-	public Auth auth() {
-		return Auth.create(ossProperties.getAccessKey(), ossProperties.getSecretKey());
-	}
-
-	@Bean
-	@ConditionalOnBean(com.qiniu.storage.Configuration.class)
-	public UploadManager uploadManager(com.qiniu.storage.Configuration cfg) {
-		return new UploadManager(cfg);
-	}
-
-	@Bean
-	@ConditionalOnBean(com.qiniu.storage.Configuration.class)
-	public BucketManager bucketManager(com.qiniu.storage.Configuration cfg) {
-		return new BucketManager(Auth.create(ossProperties.getAccessKey(), ossProperties.getSecretKey()), cfg);
-	}
-
-	@Bean
-	@ConditionalOnBean({Auth.class, UploadManager.class, BucketManager.class})
-	@ConditionalOnMissingBean(QiniuTemplate.class)
-	public QiniuTemplate qiniuTemplate(Auth auth, UploadManager uploadManager, BucketManager bucketManager) {
-		return new QiniuTemplate(auth, uploadManager, bucketManager, ossProperties, ossRule);
-	}
-
-}
+///**
+// * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+// * <p>
+// * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+// * you may not use this file except in compliance with the License.
+// * You may obtain a copy of the License at
+// * <p>
+// * http://www.gnu.org/licenses/lgpl.html
+// * <p>
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package org.springblade.core.oss.config;
+//
+//import com.qiniu.storage.BucketManager;
+//import com.qiniu.storage.Region;
+//import com.qiniu.storage.UploadManager;
+//import com.qiniu.util.Auth;
+//import lombok.AllArgsConstructor;
+//import org.springblade.core.oss.QiniuTemplate;
+//import org.springblade.core.oss.props.OssProperties;
+//import org.springblade.core.oss.rule.OssRule;
+//import org.springframework.boot.autoconfigure.AutoConfiguration;
+//import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.boot.context.properties.EnableConfigurationProperties;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * Qiniu配置类
+// *
+// * @author Chill
+// */
+//@Configuration(
+//	proxyBeanMethods = false
+//)
+//@AutoConfigureAfter({OssConfiguration.class})
+//@ConditionalOnClass({Auth.class, UploadManager.class, BucketManager.class})
+//@EnableConfigurationProperties({OssProperties.class})
+//@ConditionalOnProperty(
+//	value = {"oss.name"},
+//	havingValue = "qiniu"
+//)
+//@AllArgsConstructor
+//public class QiniuConfiguration {
+//
+//	private final OssProperties ossProperties;
+//	private final OssRule ossRule;
+//
+//	@Bean
+//	@ConditionalOnMissingBean(com.qiniu.storage.Configuration.class)
+//	public com.qiniu.storage.Configuration qnConfiguration() {
+//		return new com.qiniu.storage.Configuration(Region.autoRegion());
+//	}
+//
+//	@Bean
+//	@ConditionalOnMissingBean(Auth.class)
+//	public Auth auth() {
+//		return Auth.create(ossProperties.getAccessKey(), ossProperties.getSecretKey());
+//	}
+//
+//	@Bean
+//	@ConditionalOnBean(com.qiniu.storage.Configuration.class)
+//	public UploadManager uploadManager(com.qiniu.storage.Configuration cfg) {
+//		return new UploadManager(cfg);
+//	}
+//
+//	@Bean
+//	@ConditionalOnBean(com.qiniu.storage.Configuration.class)
+//	public BucketManager bucketManager(com.qiniu.storage.Configuration cfg) {
+//		return new BucketManager(Auth.create(ossProperties.getAccessKey(), ossProperties.getSecretKey()), cfg);
+//	}
+//
+//	@Bean
+//	@ConditionalOnBean({Auth.class, UploadManager.class, BucketManager.class})
+//	@ConditionalOnMissingBean(QiniuTemplate.class)
+//	public QiniuTemplate qiniuTemplate(Auth auth, UploadManager uploadManager, BucketManager bucketManager) {
+//		return new QiniuTemplate(auth, uploadManager, bucketManager, ossProperties, ossRule);
+//	}
+//
+//}

blade-core-sms/src/main/java/org/springblade/core/sms/AliSmsTemplate.java

@@ -17,6 +17,7 @@ import org.springframework.http.HttpStatus;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Author pangqijun
@@ -68,7 +69,7 @@ public class AliSmsTemplate implements SmsTemplate {
 		if (temp && StringUtil.isNotBlank(smsData.getKey())) {
 			String id = StringUtil.randomUUID();
 			String value = (String)smsData.getParams().get(smsData.getKey());
-			this.redisUtil.set(this.cacheKey(phone, id), value, 30L);
+			this.redisUtil.set(this.cacheKey(phone, id), value, 30L, TimeUnit.MINUTES);
 			smsCode.setId(id).setValue(value);
 		} else {
 			smsCode.setSuccess(Boolean.FALSE);

blade-core-sms/src/main/java/org/springblade/core/sms/HuaweiSmsTemplate.java

@@ -15,6 +15,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Author pangqijun
@@ -69,7 +70,7 @@ public class HuaweiSmsTemplate implements SmsTemplate {
         if (temp && StringUtil.isNotBlank(smsData.getKey())) {
             String id = StringUtil.randomUUID();
             String value = (String)smsData.getParams().get(smsData.getKey());
-			this.redisUtil.set(this.cacheKey(phone, id), value, 30L);
+			this.redisUtil.set(this.cacheKey(phone, id), value, 30L, TimeUnit.MINUTES);
             smsCode.setId(id).setValue(value);
         } else {
             smsCode.setSuccess(Boolean.FALSE);

blade-core-sms/src/main/java/org/springblade/core/sms/QiniuSmsTemplate.java

@@ -13,6 +13,7 @@ import org.springframework.http.HttpStatus;
 
 import java.time.Duration;
 import java.util.Collection;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Author pangqijun
@@ -42,7 +43,7 @@ public class QiniuSmsTemplate implements SmsTemplate {
 		if (temp && StringUtil.isNotBlank(smsData.getKey())) {
 			String id = StringUtil.randomUUID();
 			String value = (String)smsData.getParams().get(smsData.getKey());
-			this.redisUtil.set(this.cacheKey(phone, id), value, 30L);
+			this.redisUtil.set(this.cacheKey(phone, id), value, 30L, TimeUnit.MINUTES);
 			smsCode.setId(id).setValue(value);
 		} else {
 			smsCode.setSuccess(Boolean.FALSE);

blade-core-sms/src/main/java/org/springblade/core/sms/SmsTemplate.java

@@ -4,10 +4,13 @@ import org.springblade.core.sms.model.SmsCode;
 import org.springblade.core.sms.model.SmsData;
 import org.springblade.core.sms.model.SmsInfo;
 import org.springblade.core.sms.model.SmsResponse;
+import org.springblade.core.tool.utils.RedisUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.util.StringUtils;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Author pangqijun
@@ -15,6 +18,7 @@ import java.util.Collections;
  * Description smsTemplate
  */
 public interface SmsTemplate {
+
 	default String cacheKey(String phone, String id) {
 		return "blade:sms::captcha:" + phone + ":" + id;
 	}

blade-core-sms/src/main/java/org/springblade/core/sms/TencentSmsTemplate.java

@@ -15,6 +15,7 @@ import org.springframework.http.HttpStatus;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Collection;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Author pangqijun
@@ -48,7 +49,7 @@ public class TencentSmsTemplate implements SmsTemplate {
 		if (temp && StringUtil.isNotBlank(smsData.getKey())) {
 			String id = StringUtil.randomUUID();
 			String value = (String)smsData.getParams().get(smsData.getKey());
-			this.redisUtil.set(this.cacheKey(phone, id), value, 30L);
+			this.redisUtil.set(this.cacheKey(phone, id), value, 30L, TimeUnit.MINUTES);
 			smsCode.setId(id).setValue(value);
 		} else {
 			smsCode.setSuccess(Boolean.FALSE);

blade-core-sms/src/main/java/org/springblade/core/sms/YunpianSmsTemplate.java

@@ -15,6 +15,7 @@ import org.springblade.core.tool.utils.StringUtil;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Author pangqijun
@@ -43,13 +44,12 @@ public class YunpianSmsTemplate implements SmsTemplate {
 		boolean temp = this.sendSingle(smsData, phone);
 		if (temp && StringUtil.isNotBlank(smsData.getKey())) {
 			String id = StringUtil.randomUUID();
-			String value = (String)smsData.getParams().get(smsData.getKey());
-			this.redisUtil.set(this.cacheKey(phone, id), value, 30L);
+			String value = smsData.getParams().get(smsData.getKey());
+			this.redisUtil.set(this.cacheKey(phone, id), value, 30L, TimeUnit.MINUTES);
 			smsCode.setId(id).setValue(value);
 		} else {
 			smsCode.setSuccess(Boolean.FALSE);
 		}
-
 		return smsCode;
 	}
 
@@ -58,7 +58,8 @@ public class YunpianSmsTemplate implements SmsTemplate {
 		String id = smsCode.getId();
 		String value = smsCode.getValue();
 		String phone = smsCode.getPhone();
-		String cache = (String)this.redisUtil.get(this.cacheKey(phone, id));		if (StringUtil.isNotBlank(value) && StringUtil.equalsIgnoreCase(cache, value)) {
+		String cache = (String)this.redisUtil.get(this.cacheKey(phone, id));
+		if (StringUtil.isNotBlank(value) && StringUtil.equalsIgnoreCase(cache, value)) {
 			this.redisUtil.del(this.cacheKey(phone, id));
 			return true;
 		} else {

blade-core-sms/src/main/java/org/springblade/core/sms/model/SmsCode.java

@@ -17,6 +17,10 @@ public class SmsCode implements Serializable {
 	private String phone;
 	private String id;
 
+	public SmsCode() {
+		this.success = Boolean.TRUE;
+	}
+
 	@JsonIgnore
 	private String value;
 

blade-core-tool/src/main/java/org/springblade/core/tool/utils/RedisUtil.java

@@ -19,7 +19,6 @@ public class RedisUtil {
 
 	private RedisTemplate<String, Object> redisTemplate;
 
-	//=============================common============================
 
 	/**
 	 * 指定缓存失效时间
@@ -80,8 +79,6 @@ public class RedisUtil {
 		}
 	}
 
-	//============================String=============================
-
 	/**
 	 * 普通缓存获取
 	 *
@@ -183,8 +180,6 @@ public class RedisUtil {
 		return redisTemplate.opsForValue().increment(key, -delta);
 	}
 
-	//================================Map=================================
-
 	/**
 	 * HashGet
 	 *
@@ -329,7 +324,6 @@ public class RedisUtil {
 		return redisTemplate.opsForHash().increment(key, item, -by);
 	}
 
-	//============================set=============================
 
 	/**
 	 * 根据key获取Set中的所有值