Merge branch 'dev' into 'test'

Dev

See merge request !3

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/ToolController.java

@@ -10,8 +10,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
  * 工具
  * 工具
- * @menu 工具类
+ *
  * @author lixian
  * @author lixian
+ * @menu 工具类
  * @description
  * @description
  * @date 2020/6/18 17:57
  * @date 2020/6/18 17:57
  **/
  **/
@@ -24,6 +25,7 @@ public class ToolController {
 
 
     /**
     /**
      * 加密
      * 加密
+     *
      * @param plain 明文
      * @param plain 明文
      * @return
      * @return
      */
      */
@@ -33,7 +35,19 @@ public class ToolController {
     }
     }
 
 
     /**
     /**
+     * 解密
+     *
+     * @param cipher 密文
+     * @return
+     */
+    @GetMapping( value = "decrypt" )
+    public String decrypt( String cipher ) {
+        return EncryptStringAes.decryptAes(cipher, signKeyConfigBean.getKey());
+    }
+
+    /**
      * 获取时间戳
      * 获取时间戳
+     *
      * @return
      * @return
      */
      */
     @GetMapping( value = "timestamp" )
     @GetMapping( value = "timestamp" )

domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java

@@ -36,7 +36,6 @@ import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.ViolationInfo
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.YearCheckInfoRes;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.YearCheckInfoRes;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
@@ -44,7 +43,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Objects;
 import java.util.Objects;
-import java.util.UUID;
 
 
 /**
 /**
  * 客户绑定服务实现类
  * 客户绑定服务实现类
@@ -53,7 +51,6 @@ import java.util.UUID;
  * @time：2020/6/18 16:12
  * @time：2020/6/18 16:12
  **/
  **/
 @Service
 @Service
-@EnableScheduling
 @Slf4j
 @Slf4j
 public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> implements IBindService {
 public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> implements IBindService {
 
 
@@ -309,14 +306,6 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
     }
     }
 
 
 
 
-//    @Scheduled(cron = "0 0/30 * * * ?")
-//    public void clearPast() {
-//        DateTime now = DateTime.now();
-//        log.info("开始清除,已过期且无效的绑定信息.当前时间:" + now);
-//        Date lastMonth = DateUtil.offsetDay(now, -30);
-//        Integer count = mapper.clearPast(lastMonth);
-//        log.info("清除完毕,共清除过期且无效的绑定信息:" + count);
-
 }
 }