From 08b52ba6e8930958456ed58a1d39805caa7fe014 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Wed, 12 Jul 2023 20:24:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 2 --
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 1 -
screen-common/src/main/java/com/moral/util/MybatisPLUSUtils.java | 1 -
pom.xml | 2 +-
screen-api/src/main/java/com/moral/api/controller/BulletinController.java | 1 -
5 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9107a7b..4360a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.code.kaptcha</groupId>
+ <groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
<version>2.3.2</version>
</dependency>
diff --git a/screen-api/src/main/java/com/moral/api/controller/AqiController.java b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
index 3f6071e..2cc538b 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AqiController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -30,7 +30,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
-import sun.security.util.Resources_sv;
@RestController
@RequestMapping("/aqi")
diff --git a/screen-api/src/main/java/com/moral/api/controller/BulletinController.java b/screen-api/src/main/java/com/moral/api/controller/BulletinController.java
index 00e2a2c..bb92852 100644
--- a/screen-api/src/main/java/com/moral/api/controller/BulletinController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/BulletinController.java
@@ -5,7 +5,6 @@
import com.moral.api.config.properties.SpecialCitiesProperties;
import com.moral.api.service.CityAqiDailyService;
import com.moral.constant.ResultMessage;
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.CrossOrigin;
diff --git a/screen-common/src/main/java/com/moral/util/MybatisPLUSUtils.java b/screen-common/src/main/java/com/moral/util/MybatisPLUSUtils.java
index fb73ff5..e7094c6 100644
--- a/screen-common/src/main/java/com/moral/util/MybatisPLUSUtils.java
+++ b/screen-common/src/main/java/com/moral/util/MybatisPLUSUtils.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.conditions.segments.NormalSegmentList;
import com.moral.constant.SeparateTableType;
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 1cd516c..a747d6e 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -22,8 +22,6 @@
import com.moral.constant.RedisConstants;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
-import com.sun.javafx.collections.MappingChange;
-
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
--
Gitblit v1.8.0