diff --git a/ebike-gateway/src/main/java/com/cdzy/gateway/filters/CustomCipherTextFilter.java b/ebike-gateway/src/main/java/com/cdzy/gateway/filters/CustomCipherTextFilter.java
index 81c3011e..990b8d2c 100644
--- a/ebike-gateway/src/main/java/com/cdzy/gateway/filters/CustomCipherTextFilter.java
+++ b/ebike-gateway/src/main/java/com/cdzy/gateway/filters/CustomCipherTextFilter.java
@@ -136,8 +136,6 @@ public class CustomCipherTextFilter implements GlobalFilter, Ordered {
 //                                log.error("密文过滤器加解密错误", e);
 //                                return Mono.empty();
                     return chain.filter(exchange);
-                } finally {
-
                 }
             }
         }
diff --git a/ebike-gather/src/main/java/org/cdzy/gather/config/MqttConfig.java b/ebike-gather/src/main/java/org/cdzy/gather/config/MqttConfig.java
index e2710237..4230a77a 100644
--- a/ebike-gather/src/main/java/org/cdzy/gather/config/MqttConfig.java
+++ b/ebike-gather/src/main/java/org/cdzy/gather/config/MqttConfig.java
@@ -33,13 +33,13 @@ public class MqttConfig {
 
     // 连接池参数
     @Getter
-    private static int poolMaxTotal = 20;
+    private static final int poolMaxTotal = 20;
 
     @Getter
-    private static int poolMaxIdle = 10;
+    private static final int poolMaxIdle = 10;
 
     @Getter
-    private static int poolMinIdle = 5;
+    private static final int poolMinIdle = 5;
 
     @Value("${mqtt.host}")
     public void setHost(String host) {
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeUsersSever.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeUsersSever.java
index 1a3d0a37..29363b77 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeUsersSever.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeUsersSever.java
@@ -21,11 +21,7 @@ public class EbikeUsersSever {
         queryWrapper.eq("phone", username);
 //        queryWrapper.eq("password", password);
         long l = ebikeUsersMapper.selectCountByQuery(queryWrapper);
-        if (l > 0) {
-            return true;
-        } else{
-            return false;
-        }
+        return l > 0;
     }
 
     public EbikeUsers getUserInfo (String username, String password){
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentEnterRecordsDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentEnterRecordsDto.java
index 6e42e898..9000773b 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentEnterRecordsDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentEnterRecordsDto.java
@@ -22,7 +22,7 @@ public class ReqEbikeComponentEnterRecordsDto {
     private String region;
     /**
      * 部件类型
-     */;
+     */
     private String componentType;
     /**
      * 状态
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentOutRecordsDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentOutRecordsDto.java
index f5dc41d1..3e629639 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentOutRecordsDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentOutRecordsDto.java
@@ -22,7 +22,7 @@ public class ReqEbikeComponentOutRecordsDto {
     private String region;
     /**
      * 部件类型
-     */;
+     */
     private String componentType;
 
     /**
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentProductionDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentProductionDto.java
index 7ba20616..75df028b 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentProductionDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeComponentProductionDto.java
@@ -22,7 +22,7 @@ public class ReqEbikeComponentProductionDto {
     private String region;
     /**
      * 部件类型
-     */;
+     */
     private String componentType;
     /**
      * 供应商
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/utils/RedisUtil.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/utils/RedisUtil.java
index 74b714e4..adff8c36 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/utils/RedisUtil.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/utils/RedisUtil.java
@@ -400,7 +400,7 @@ public class RedisUtil {
      * @param areaId areaId
      */
     public String getPolygonFromWKT(Long suffixId,String areaId,String key) {
-        return "POLYGON ((" + (String)redisTemplate.opsForHash().get(key + suffixId, "vertices"+areaId)+"))";
+        return "POLYGON ((" + redisTemplate.opsForHash().get(key + suffixId, "vertices"+areaId) +"))";
     }
 
     /**
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/uitls/RedisUtil.java b/ebike-orders/src/main/java/com/cdzy/orders/uitls/RedisUtil.java
index 2ec1dda5..09cd5adf 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/uitls/RedisUtil.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/uitls/RedisUtil.java
@@ -407,7 +407,7 @@ public class RedisUtil {
      * @param areaId areaId
      */
     public String getPolygonFromWKT(Long orgId, String areaId, String key) {
-        return "POLYGON ((" + (String) redisTemplate.opsForHash().get(key + orgId, "vertices" + areaId) + "))";
+        return "POLYGON ((" + redisTemplate.opsForHash().get(key + orgId, "vertices" + areaId) + "))";
     }
 
     /**
@@ -417,7 +417,7 @@ public class RedisUtil {
      * @param areaId areaId
      */
     public String getPolygonFromWKT(String areaId, String key) {
-        return "POLYGON ((" + (String) redisTemplate.opsForHash().get(key, "vertices" + areaId) + "))";
+        return "POLYGON ((" + redisTemplate.opsForHash().get(key, "vertices" + areaId) + "))";
     }
 
     /**
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java
index c0f786e7..73486f1d 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java
@@ -80,7 +80,6 @@ public class ResApplyRefundDto {
      * 骑行设备编号
      */
     private String ebikeCode;
-    ;
 
     /**
      * 骑行开始时间
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java
index 29d5f97d..125c7040 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java
@@ -89,7 +89,7 @@ public class ResCloseRefundDto {
     /**
      * 骑行设备编号
      */
-    private String ebikeCode;;
+    private String ebikeCode;
 
     /**
      * 骑行开始时间
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java
index d0431baa..ab78b9fd 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java
@@ -84,7 +84,7 @@ public class ResHandleRefundDto {
     /**
      * 骑行设备编号
      */
-    private String ebikeCode;;
+    private String ebikeCode;
 
     /**
      * 骑行开始时间
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java
index 5c44aa7a..ce1ae4f5 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java
@@ -110,7 +110,6 @@ public class ResProcessedRefundDto {
      * 骑行设备编号
      */
     private String ebikeCode;
-    ;
 
     /**
      * 骑行开始时间
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
index f3712e1c..92c67e91 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
@@ -36,7 +36,7 @@ public class EbikePaymentServiceImpl extends ServiceImpl<EbikePaymentMapper, Ebi
     public List<EbikePayment> getNoPayOrderByDuration(int duration) {
         // trade_state 等于 NOTPAY未支付的， 并且创建时间未超过duration分钟的订单
         String timeFilter = String.format("%s(%s, %s(%s))<%s()", ADDTIME, EBIKE_PAYMENT.CREATE_TIME.getName(), SEC_TO_TIME
-                , String.valueOf(duration * 60), NOW);
+                , duration * 60, NOW);
         QueryWrapper query = QueryWrapper.create()
                 .where(EBIKE_PAYMENT.TRADE_STATE.eq(Transaction.TradeStateEnum.NOTPAY.ordinal()))
                 .and(timeFilter);
@@ -47,7 +47,7 @@ public class EbikePaymentServiceImpl extends ServiceImpl<EbikePaymentMapper, Ebi
     public List<EbikePayment> getExpireOrderByDuration(int duration) {
         // trade_state 等于 NOTPAY未支付的， 并且创建时间超过duration分钟的订单
         String timeFilter = String.format("%s(%s, %s(%s))>=%s()", ADDTIME, EBIKE_PAYMENT.CREATE_TIME.getName(), SEC_TO_TIME
-                , String.valueOf(duration * 60), NOW);
+                , duration * 60, NOW);
         QueryWrapper query = QueryWrapper.create()
                 .where(EBIKE_PAYMENT.TRADE_STATE.eq(Transaction.TradeStateEnum.NOTPAY.ordinal()))
                 .and(timeFilter);
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
index 6f27d95a..dfbabb50 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
@@ -50,7 +50,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
     public List<EbikeRefund> getNoSuccessRefundOrderByDuration(int duration) {
         // trade_state 等于 PROCESSING正在退款中的， 并且创建时间超过duration分钟的订单
         String timeFilter = String.format("%s(%s, %s(%s))>=%s()", ADDTIME, EBIKE_REFUND.CREATE_TIME.getName(), SEC_TO_TIME
-                , String.valueOf(duration * 60), NOW);
+                , duration * 60, NOW);
         QueryWrapper query = QueryWrapper.create()
                 .where(EBIKE_REFUND.STATUS.eq(Status.PROCESSING.ordinal()))
                 .and(timeFilter);