修改公共类

amos-boot-biz-common/src/main/java/org/amos/boot/biz/common/utils/CommonResponseUtil.java

@@ -8,46 +8,46 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
  * @author DELL
  */
 public class CommonResponseUtil {
-    public static ResponseModel success() {
-        ResponseModel res = new ResponseModel();
+    public static ResponseModel<?> success() {
+        ResponseModel<?> res = new ResponseModel();
         res.setDevMessage(CommonConstant.RESULT_SUCCESS);
         res.setStatus(HttpStatus.OK.value());
         return res;
     }
 
-    public static ResponseModel success(Object obj) {
-        ResponseModel res = new ResponseModel();
+    public static ResponseModel<Object> success(Object obj) {
+        ResponseModel<Object> res = new ResponseModel<Object>();
         res.setResult(obj);
         res.setDevMessage(CommonConstant.RESULT_SUCCESS);
         res.setStatus(HttpStatus.OK.value());
         return res;
     }
 
-    public static ResponseModel success(Object obj, String message) {
-        ResponseModel res = new ResponseModel();
+    public static ResponseModel<Object> success(Object obj, String message) {
+        ResponseModel<Object> res = new ResponseModel<Object>();
         res.setResult(obj);
         res.setDevMessage(message);
         res.setStatus(HttpStatus.OK.value());
         return res;
     }
 
-    public static ResponseModel failure() {
-        ResponseModel res = new ResponseModel();
+    public static ResponseModel<?> failure() {
+        ResponseModel<?> res = new ResponseModel();
         res.setDevMessage(CommonConstant.RESULT_FAILURE);
         res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
         return res;
     }
 
-    public static ResponseModel failure(String message) {
-        ResponseModel res = new ResponseModel();
+    public static ResponseModel<?> failure(String message) {
+        ResponseModel<?> res = new ResponseModel();
         res.setDevMessage(CommonConstant.RESULT_FAILURE);
         res.setMessage(message);
         res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
         return res;
     }
 
-    public static ResponseModel failure(Object obj, String message) {
-        ResponseModel res = new ResponseModel();
+    public static ResponseModel<Object> failure(Object obj, String message) {
+        ResponseModel<Object> res = new ResponseModel<Object>();
         res.setResult(obj);
         res.setDevMessage(CommonConstant.RESULT_FAILURE);
         res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());

amos-boot-biz-common/src/main/java/org/amos/boot/biz/common/utils/RedisUtils.java

@@ -2,11 +2,9 @@ package org.amos.boot.biz.common.utils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import java.util.List;
-import java.util.Map;
+import java.util.List;import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -15,7 +13,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class RedisUtils {
     @Autowired
-    private RedisTemplate redisTemplate;
+    private RedisTemplate<String, Object> redisTemplate;
 
     /**
      * 指定缓存失效时间