diff --git a/accompany-admin/accompany-admin-service/pom.xml b/accompany-admin/accompany-admin-service/pom.xml index 777ecfc14..7655ab859 100644 --- a/accompany-admin/accompany-admin-service/pom.xml +++ b/accompany-admin/accompany-admin-service/pom.xml @@ -62,11 +62,6 @@ org.springframework spring-tx - - org.apache.tomcat.embed - tomcat-embed-core - compile - diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java index 460de8bb9..ff672d7b6 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java @@ -26,7 +26,7 @@ import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.cxf.common.util.CollectionUtils; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java index 687b5a472..1a52dcca6 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java @@ -24,7 +24,7 @@ import com.accompany.core.exception.AdminServiceException; import com.accompany.core.service.common.JedisLockService; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/impl/PrizeDateExcludeUserServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/impl/PrizeDateExcludeUserServiceImpl.java index a8f237e61..cc18e46c9 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/impl/PrizeDateExcludeUserServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/impl/PrizeDateExcludeUserServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java index 070427c2a..e3681d7c5 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java @@ -43,7 +43,7 @@ import com.github.pagehelper.PageInfo; import com.google.gson.Gson; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java index a5ca94ea6..fb2fc4470 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java @@ -42,7 +42,7 @@ import com.xuanyin.flowteam.mapper.FlowTeamMemberInviteUserMapper; import com.xuanyin.flowteam.model.FlowTeamGroup; import com.xuanyin.flowteam.model.FlowTeamInfo; import com.xuanyin.flowteam.model.FlowTeamMemberInviteUser; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/EncrytcUtil.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/EncrytcUtil.java index 70bd1dee2..d5fabf85d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/EncrytcUtil.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/EncrytcUtil.java @@ -1,12 +1,10 @@ package com.accompany.admin.util; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; - import java.io.IOException; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Base64; /** * @author laocy @@ -39,9 +37,8 @@ public class EncrytcUtil { * @param str 需要加密的字符串 * @return base64加密后的结果 */ - public static String encodeBase64String(String str) { - BASE64Encoder encoder = new BASE64Encoder(); - return encoder.encode(str.getBytes()); + public static String encodeBase64String(String str) { + return Base64.getEncoder().encodeToString(str.getBytes()); } /** @@ -50,9 +47,8 @@ public class EncrytcUtil { * @return base64解密后的结果 * @throws IOException */ - public static String decodeBase64String(String str) throws IOException { - BASE64Decoder encoder = new BASE64Decoder(); - return new String(encoder.decodeBuffer(str)); + public static String decodeBase64String(String str) { + return new String(Base64.getDecoder().decode(str)); } private static String encode(String str, String method) { diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/blinddate/BlindDateAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/blinddate/BlindDateAdminController.java index 7ceceabd4..33634951a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/blinddate/BlindDateAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/blinddate/BlindDateAdminController.java @@ -23,7 +23,7 @@ import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java index c738504ea..997aa4a26 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java @@ -3,7 +3,7 @@ package com.accompany.admin.interceptor; import com.accompany.admin.common.AdminConstants; import com.accompany.common.utils.IPUtils; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java index 5127ddcbc..0ae4cea52 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java @@ -3,7 +3,7 @@ package com.accompany.admin.interceptor; import cn.dev33.satoken.stp.StpUtil; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderController.java b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderController.java index eb68dcff7..a2d36b4db 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderController.java +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderController.java @@ -29,7 +29,7 @@ import io.swagger.annotations.ApiOperation; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderMemberController.java b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderMemberController.java index 05f0b1044..9032d3d48 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderMemberController.java +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamLeaderMemberController.java @@ -27,7 +27,7 @@ import com.xuanyin.flowteam.model.FlowTeamMember; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamMemberController.java b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamMemberController.java index 8982acea2..938965b99 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamMemberController.java +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/member/FlowTeamMemberController.java @@ -20,7 +20,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/EncryptUtil.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/EncryptUtil.java index e2342f0ec..dc38e9b68 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/EncryptUtil.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/EncryptUtil.java @@ -1,12 +1,10 @@ package com.accompany.common.utils; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; - import java.io.IOException; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Base64; /** * @author laocy @@ -39,9 +37,8 @@ public class EncryptUtil { * @param str 需要加密的字符串 * @return base64加密后的结果 */ - public static String encodeBase64String(String str) { - BASE64Encoder encoder = new BASE64Encoder(); - return encoder.encode(str.getBytes()); + public static String encodeBase64String(String str) { + return Base64.getEncoder().encodeToString(str.getBytes()); } /** @@ -50,9 +47,8 @@ public class EncryptUtil { * @return base64解密后的结果 * @throws IOException */ - public static String decodeBase64String(String str) throws IOException { - BASE64Decoder encoder = new BASE64Decoder(); - return new String(encoder.decodeBuffer(str)); + public static String decodeBase64String(String str) throws IOException { + return new String(Base64.getDecoder().decode(str)); } private static String encode(String str, String method) { diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/PicMoonAddTextMarkUtils.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/PicMoonAddTextMarkUtils.java index 5796c985a..e21e878f8 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/PicMoonAddTextMarkUtils.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/PicMoonAddTextMarkUtils.java @@ -3,11 +3,12 @@ package com.accompany.common.utils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.ImmutablePair; import org.springframework.core.io.ClassPathResource; -import sun.font.FontDesignMetrics; import javax.imageio.ImageIO; import javax.imageio.stream.ImageOutputStream; import java.awt.*; +import java.awt.font.FontRenderContext; +import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.io.*; @@ -69,12 +70,9 @@ public class PicMoonAddTextMarkUtils { public static int getTextWidth(Font fontS, String content) { - FontDesignMetrics metrics = FontDesignMetrics.getMetrics(fontS); - int width = 0; - for (int i = 0; i < content.length(); i++) { - width += metrics.charWidth(content.charAt(i)); - } - return width; + FontRenderContext frc = new FontRenderContext(new AffineTransform(), true, true); + Rectangle rec = fontS.getStringBounds(content, frc).getBounds(); + return (int) rec.getWidth(); } private static Font loadIconFont() throws IOException { diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/PicAddTextAnchorFansMpMarkUtils.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/PicAddTextAnchorFansMpMarkUtils.java index 367d94d3a..3296f4737 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/PicAddTextAnchorFansMpMarkUtils.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/PicAddTextAnchorFansMpMarkUtils.java @@ -4,7 +4,6 @@ import com.accompany.common.constant.Constant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.ImmutablePair; import org.springframework.core.io.ClassPathResource; -import sun.font.FontDesignMetrics; import javax.imageio.ImageIO; import javax.imageio.stream.ImageOutputStream; @@ -38,9 +37,6 @@ public class PicAddTextAnchorFansMpMarkUtils { //等级基准长度9 public static final int LEN_LEVEL = 14; - - public static String OS_SYSTEM = System.getProperty("os.name"); - /** * @param srcImgPath 源图片路径 * @param tarImgPath 保存的图片路径 @@ -148,12 +144,7 @@ public class PicAddTextAnchorFansMpMarkUtils { } public static int getTextWidth(Font fontS, String content) { - FontDesignMetrics metrics = FontDesignMetrics.getMetrics(fontS); - int width = 0; - for (int i = 0; i < content.length(); i++) { - width += metrics.charWidth(content.charAt(i)); - } - return width; + return PicAddTextMarkUtils.getTextWidth(fontS, content); } private static Font loadIconFont() throws IOException { diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/PicAddTextMarkUtils.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/PicAddTextMarkUtils.java index c4a54b0f4..7e7ac4eda 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/PicAddTextMarkUtils.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/PicAddTextMarkUtils.java @@ -2,12 +2,11 @@ package com.accompany.common.utils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.springframework.core.io.ClassPathResource; -import sun.font.FontDesignMetrics; import javax.imageio.ImageIO; -import javax.imageio.stream.ImageOutputStream; import java.awt.*; +import java.awt.font.FontRenderContext; +import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.io.*; @@ -72,57 +71,8 @@ public class PicAddTextMarkUtils { public static int getTextWidth(Font fontS, String content) { - FontDesignMetrics metrics = FontDesignMetrics.getMetrics(fontS); - int width = 0; - for (int i = 0; i < content.length(); i++) { - width += metrics.charWidth(content.charAt(i)); - } - return width; - } - - private static Font loadIconFont() throws IOException { - Font font = null; - ClassPathResource resource = new ClassPathResource("fonts/SourceHanSansCN-Regular.otf"); - InputStream inputStream = resource.getInputStream(); - try { - font = Font.createFont(Font.TRUETYPE_FONT, inputStream); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - try { - inputStream.close(); - } catch (Exception ignored) { - } - assert font != null; - return font.deriveFont(22f); - } - - public static void main(String[] args) throws Exception { - testAddTextToPic(); - } - - public static void testAddTextToPic() throws Exception { - try (InputStream input = FileUtils.downloadFileInputStream("http://img.uat.lecheng163.com/mppptest.png")) { - InputStream uploadStream = null; - FileOutputStream downloadFile = null; - try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); ImageOutputStream imOut = ImageIO.createImageOutputStream(baos);) { - Font loadIconFont = loadIconFont(); - BufferedImage bufImg = PicAddTextMarkUtils.addTextToPic(input, "王者荣耀", loadIconFont); - if (bufImg == null) return; - ImageIO.write(bufImg, "png", imOut); - uploadStream = new ByteArrayInputStream(baos.toByteArray()); - int index; - byte[] bytes = new byte[1024]; - downloadFile = new FileOutputStream("C:\\Users\\demo\\Desktop\\2022-03\\mp\\mp.png"); - while ((index = uploadStream.read(bytes)) != -1) { - downloadFile.write(bytes, 0, index); - downloadFile.flush(); - } - } finally { - if (downloadFile != null) downloadFile.close(); - if (uploadStream != null) uploadStream.close(); - } - } - System.out.println("结束运行....."); + FontRenderContext frc = new FontRenderContext(new AffineTransform(), true, true); + Rectangle rec = fontS.getStringBounds(content, frc).getBounds(); + return (int) rec.getWidth(); } } diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/MyCardService.java b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/MyCardService.java index e20b4384a..00d06dc53 100644 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/MyCardService.java +++ b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/MyCardService.java @@ -18,10 +18,10 @@ import com.alibaba.fastjson.JSONObject; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.validation.constraints.NotNull; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/impl/TencentSmsServiceImpl.java b/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/impl/TencentSmsServiceImpl.java index 485933e73..d6fc2d706 100644 --- a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/impl/TencentSmsServiceImpl.java +++ b/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/impl/TencentSmsServiceImpl.java @@ -15,10 +15,10 @@ import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; import com.tencentcloudapi.sms.v20210111.models.SendStatus; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Nullable; import java.util.Map; /** diff --git a/accompany-business/accompany-business-festival-activity/fastival-activity-mq/src/main/java/com/accompany/mq/consumer/ActUserTaskConsumer.java b/accompany-business/accompany-business-festival-activity/fastival-activity-mq/src/main/java/com/accompany/mq/consumer/ActUserTaskConsumer.java index 96519dfd7..94c78bc0f 100644 --- a/accompany-business/accompany-business-festival-activity/fastival-activity-mq/src/main/java/com/accompany/mq/consumer/ActUserTaskConsumer.java +++ b/accompany-business/accompany-business-festival-activity/fastival-activity-mq/src/main/java/com/accompany/mq/consumer/ActUserTaskConsumer.java @@ -24,7 +24,7 @@ import com.accompany.mq.producer.MQMessageProducer; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/listener/ActTaskListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/listener/ActTaskListener.java index 7791e5331..71fcaf49b 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/listener/ActTaskListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/listener/ActTaskListener.java @@ -15,7 +15,7 @@ import com.accompany.mq.model.ActUserTaskMqMessage; import com.accompany.mq.producer.MQMessageProducer; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/strategy/IActRewardStrategy.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/strategy/IActRewardStrategy.java index 6b87fda13..4031bc005 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/strategy/IActRewardStrategy.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/strategy/IActRewardStrategy.java @@ -23,9 +23,9 @@ import com.accompany.core.service.user.UsersBaseService; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; +import javax.validation.constraints.NotNull; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java index 2d22c8dc9..fa49ae1e7 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java @@ -14,7 +14,7 @@ import com.accompany.core.service.user.UsersBaseService; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java index 84980e0c7..1c405f3ca 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java @@ -8,7 +8,7 @@ import com.accompany.core.base.SpringContextHolder; import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java index 4c14204a9..e079e0b0a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java @@ -25,7 +25,7 @@ import com.accompany.core.service.base.BaseService; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.json.JSONException; import org.json.JSONObject; import org.springframework.beans.BeanUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunAntiHandleService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunAntiHandleService.java index e5bf4e90a..ced8e75d0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunAntiHandleService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunAntiHandleService.java @@ -15,7 +15,7 @@ import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.service.common.JedisService; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java index 4b1992906..e62eec0d2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java @@ -45,7 +45,7 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.script.Script; import org.elasticsearch.search.sort.*; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java index 4917bd6f3..619f90908 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java @@ -3309,10 +3309,6 @@ public class RoomService extends BaseService { if (micUidList.contains(uid)) { user.setInMic(true); } - UserVipInfoVO userVipInfo = user.getUserVipInfoVO(); - if (userVipInfo != null) { - user.setEnterHide(userVipInfo.getEnterHide()); - } onlineUsers.add(user); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/SingleBroadcastPopularityServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/SingleBroadcastPopularityServiceImpl.java index 717a12b35..7b5cabf20 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/SingleBroadcastPopularityServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/SingleBroadcastPopularityServiceImpl.java @@ -39,7 +39,7 @@ import com.google.gson.reflect.TypeToken; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java index dab058fbf..eb32d5903 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java @@ -21,7 +21,7 @@ import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserLimitServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserLimitServiceImpl.java index 2827c5b2d..dbfb75805 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserLimitServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserLimitServiceImpl.java @@ -5,7 +5,8 @@ import com.accompany.business.constant.withdraw.WithdrawUserLimitConstant; import com.accompany.business.model.withdraw.WithdrawUserLimit; import com.accompany.business.mybatismapper.withdraw.WithdrawUserLimitMapper; import com.accompany.business.service.withdraw.WithdrawUserLimitService; -import com.accompany.common.exception.ApiException; +import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.ServiceException; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -30,7 +31,7 @@ public class WithdrawUserLimitServiceImpl extends ServiceImpl 1.0.0 UTF-8 - 1.8 - 1.8 + 11 + 11 ${basedir}/target 3.9.0 @@ -76,7 +76,6 @@ 3.1.2 1.0.4 3.16.8 - true 3.2.1 8.12.43 2.7.0 @@ -185,24 +184,6 @@ ${servlet-api.version} - - org.quartz-scheduler - quartz - ${quartz.version} - - - com.zaxxer - HikariCP-java7 - - - - - - org.quartz-scheduler - quartz-jobs - ${quartz.version} - - commons-lang commons-lang @@ -836,27 +817,6 @@ joda-time - - org.quartz-scheduler - quartz-jobs - ${quartz.version} - - - - org.jetbrains.kotlin - kotlin-reflect - - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - - - - com.fasterxml.jackson.module - jackson-module-kotlin - - tech.sud.mgp.auth sud-mgp-auth-java @@ -933,6 +893,7 @@ com.belerweb pinyin4j + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 48bf0a770..20e8bcdf2 100644 --- a/pom.xml +++ b/pom.xml @@ -31,10 +31,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.8.1 - 1.8 - 1.8 + 11 + 11 UTF-8 256m 1024m