diff --git a/README.md b/README.md index 3817f49..45d053e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# alita-bjy-uygur +# demo diff --git a/pom.xml b/pom.xml index 0b7b96a..ca03792 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ 2.4.2 - com.newyetai - demo + com.senmesh + s-file 0.0.1 jar diff --git a/src/main/java/com/newyetai/commonexport/service/ExportService.java b/src/main/java/com/newyetai/commonexport/service/ExportService.java deleted file mode 100644 index 13558d3..0000000 --- a/src/main/java/com/newyetai/commonexport/service/ExportService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.newyetai.commonexport.service; - -import com.newyetai.commonexport.dto.CommonExportDynamicDTO; -import com.newyetai.commonexport.dto.CommonExportMapDTO; -import com.newyetai.commonexport.dto.CommonExportPropertiesDTO; -import com.newyetai.component.file.entity.FileRecord; - -import java.util.List; - -public interface ExportService { - - /** - * 公共导出方法 - * - * @param commonExportPropertiesDTO 导出实体 - * @return FileRecord - */ - FileRecord export(CommonExportPropertiesDTO commonExportPropertiesDTO); - - - FileRecord export(CommonExportMapDTO commonExportMapDTO); - -} diff --git a/src/main/java/com/newyetai/component/notice/util/NoticeUtils.java b/src/main/java/com/newyetai/component/notice/util/NoticeUtils.java deleted file mode 100644 index 25aa789..0000000 --- a/src/main/java/com/newyetai/component/notice/util/NoticeUtils.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.newyetai.component.notice.util; - -import com.newyetai.component.notice.dto.NoticeMsgDTO; -import com.newyetai.component.notice.service.AsyncNoticeHandler; -import com.newyetai.mq.util.MqSendUtils; - -public class NoticeUtils { - - /** - * 发送异步通知 - * @param msg - */ - public static void sendAsyncNotice(NoticeMsgDTO msg){ - MqSendUtils.send(AsyncNoticeHandler.ROUTING_KEY, msg); - } - -} diff --git a/src/main/java/com/newyetai/config/controller/AnonConfigController.java b/src/main/java/com/newyetai/config/controller/AnonConfigController.java deleted file mode 100644 index 766386a..0000000 --- a/src/main/java/com/newyetai/config/controller/AnonConfigController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.newyetai.config.controller; - -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.config.dao.ConfigMapper; -import com.newyetai.config.dto.*; -import com.newyetai.config.service.ConfigService; -import com.newyetai.tkmybatis.pojo.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 配置操作 - * - * @author on 2019-11-05 - */ -@RestController -@RequestMapping("anon/config") -public class AnonConfigController { - - @Autowired - private ConfigService configService; - - - @GetMapping("/code/{configCode}") - public AlitaResult getAppVersion(@PathVariable("configCode") String configCode) { - ConfigDTO configDto = configService.getConfigDto(configCode, CommonConstants.PLATFORM_ORG_ID, Boolean.TRUE); - return AlitaResult.success(configDto); - } - - -} diff --git a/src/main/java/com/newyetai/sdk/ai/service/service/AiProvider.java b/src/main/java/com/newyetai/sdk/ai/service/service/AiProvider.java deleted file mode 100644 index 69a8685..0000000 --- a/src/main/java/com/newyetai/sdk/ai/service/service/AiProvider.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.newyetai.sdk.ai.service.service; - -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.ai.config.AiProperties; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.util.HttpUtils; -import com.newyetai.sdk.deepseek.config.DeepSeekProperties; -import com.newyetai.sdk.deepseek.service.DeepSeekProvider; -import com.newyetai.sdk.xf.config.XfProperties; -import com.newyetai.sdk.xf.model.ChatReq; -import com.newyetai.sdk.xf.model.ChatRes; -import com.newyetai.sdk.xf.service.XfSparkProvider; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class AiProvider { - - private static AiProperties aiProperties; - - @Autowired - private DeepSeekProvider deepSeekProvider; - @Autowired - private XfSparkProvider xfSparkProvider; - - private AiProvider(AiProperties aiProperties) { - AiProvider.aiProperties = aiProperties; - } - - public static AlitaResult httpChat(ChatReq req) { - if (aiProperties.getChatProvider().equals(XfProperties.PREFIX)) { - return XfSparkProvider.httpChat(req); - } else { - req.setModel("deepseek-chat"); - return DeepSeekProvider.httpChat(req); - } - } - -} diff --git a/src/main/java/com/newyetai/usercenter/service/AuthService.java b/src/main/java/com/newyetai/usercenter/service/AuthService.java deleted file mode 100644 index 9d74fb3..0000000 --- a/src/main/java/com/newyetai/usercenter/service/AuthService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.newyetai.usercenter.service; - -public interface AuthService { -} diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserBankCardFourVerificationMapper.java b/src/main/java/com/newyetai/usercenter/user/dao/UserBankCardFourVerificationMapper.java deleted file mode 100644 index 3b72d7e..0000000 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserBankCardFourVerificationMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.newyetai.usercenter.user.dao; - -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.dto.UserBankAccountDTO; -import com.newyetai.usercenter.user.dto.UserBankCardFourVerificationDTO; -import com.newyetai.usercenter.user.dto.UserBankCardFourVerificationQueryDTO; -import com.newyetai.usercenter.user.dto.UserBankCardThreeVerificationDTO; -import com.newyetai.usercenter.user.dto.UserBankCardThreeVerificationQueryDTO; -import com.newyetai.usercenter.user.entity.UserBankCardFourVerification; -import com.newyetai.usercenter.user.entity.UserBankCardThreeVerification; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - * @author czy - * @date 2021-06-23 - */ -public interface UserBankCardFourVerificationMapper extends MyMapper { - - - /** - * 查询 - * - * @param userBankCardFourVerificationQueryDTO - * @return - * @author sr on 2021-08-04 - */ - List listUserBankCardFourVerificationDTO( - @Param("param") UserBankCardFourVerificationQueryDTO userBankCardFourVerificationQueryDTO); - -} diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserExtensionMapper.java b/src/main/java/com/newyetai/usercenter/user/dao/UserExtensionMapper.java deleted file mode 100644 index fa6f284..0000000 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserExtensionMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.newyetai.usercenter.user.dao; - -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.dto.UserDTO; -import com.newyetai.usercenter.user.dto.UserExtendStatusDTO; -import com.newyetai.usercenter.user.dto.UserExtensionDTO; -import com.newyetai.usercenter.user.dto.UserQueryDTO; -import com.newyetai.usercenter.user.entity.UserExtension; -import java.util.List; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - * 用户扩展信息 - * - * @author czy on 2021-06-15 - */ -public interface UserExtensionMapper extends MyMapper { - - @Select("select * from uc_user_extension where deleted = 0 and user_id = #{userId}") - UserExtensionDTO getByUserId(@Param("userId") Long userId); - -} diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserRealNameTwoVerificationMapper.java b/src/main/java/com/newyetai/usercenter/user/dao/UserRealNameTwoVerificationMapper.java deleted file mode 100644 index fd22dc8..0000000 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserRealNameTwoVerificationMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.newyetai.usercenter.user.dao; - -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.entity.UserRealNameTwoVerification; - -/** - * @author fzp - * @date 2021年7月14日10:24:46 - */ -public interface UserRealNameTwoVerificationMapper extends MyMapper { - -} diff --git a/src/main/java/com/newyetai/usercenter/websocket/service/impl/WebsocketNoticeSendProvider.java b/src/main/java/com/newyetai/usercenter/websocket/service/impl/WebsocketNoticeSendProvider.java deleted file mode 100644 index 63957ca..0000000 --- a/src/main/java/com/newyetai/usercenter/websocket/service/impl/WebsocketNoticeSendProvider.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.newyetai.usercenter.websocket.service.impl; - -import com.newyetai.component.chat.dto.ChatMsgDTO; -import com.newyetai.component.notice.dto.NoticeMsgDTO; -import org.springframework.stereotype.Service; - -import com.newyetai.component.notice.service.INoticeSendProvider; -import com.newyetai.usercenter.websocket.util.WebSocketUtils; - -@Service -public class WebsocketNoticeSendProvider implements INoticeSendProvider { - - @Override - public void send(NoticeMsgDTO msg) { - WebSocketUtils.send(msg.getReceiverId(), msg.getType(), msg); - } - - -} diff --git a/src/main/java/com/newyetai/DemoApplication.java b/src/main/java/com/senmesh/SFileApplication.java similarity index 72% rename from src/main/java/com/newyetai/DemoApplication.java rename to src/main/java/com/senmesh/SFileApplication.java index 7541eb0..838ddf6 100644 --- a/src/main/java/com/newyetai/DemoApplication.java +++ b/src/main/java/com/senmesh/SFileApplication.java @@ -1,4 +1,4 @@ -package com.newyetai; +package com.senmesh; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -9,13 +9,13 @@ import org.springframework.scheduling.annotation.EnableScheduling; /** * @author sr on 2020-04-16 */ -@SpringBootApplication(scanBasePackages = {"com.newyetai"}) +@SpringBootApplication(scanBasePackages = {"com.senmesh"}) @EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true) @EnableScheduling -public class DemoApplication { +public class SFileApplication { public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); + SpringApplication.run(SFileApplication.class, args); } diff --git a/src/main/java/com/newyetai/codegenerator/config/CodeConfiguration.java b/src/main/java/com/senmesh/codegenerator/config/CodeConfiguration.java similarity index 63% rename from src/main/java/com/newyetai/codegenerator/config/CodeConfiguration.java rename to src/main/java/com/senmesh/codegenerator/config/CodeConfiguration.java index 34a6c27..122ea41 100644 --- a/src/main/java/com/newyetai/codegenerator/config/CodeConfiguration.java +++ b/src/main/java/com/senmesh/codegenerator/config/CodeConfiguration.java @@ -1,29 +1,19 @@ -package com.newyetai.codegenerator.config; - -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; +package com.senmesh.codegenerator.config; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import com.newyetai.codegenerator.service.CodeService; -import com.newyetai.codegenerator.service.SnowflakeIdWorker; -import com.newyetai.codegenerator.service.generator.SnowFlakeCodeGenerator; -import com.newyetai.codegenerator.service.impl.CodeServiceImpl; -import com.newyetai.codegenerator.util.CodeUtils; -import com.newyetai.common.CommonConfiguration; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.RequestUtils; +import com.senmesh.codegenerator.service.CodeService; +import com.senmesh.codegenerator.service.SnowflakeIdWorker; +import com.senmesh.codegenerator.service.generator.SnowFlakeCodeGenerator; +import com.senmesh.codegenerator.service.impl.CodeServiceImpl; +import com.senmesh.codegenerator.util.CodeUtils; +import com.senmesh.common.CommonConfiguration; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.RequestUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/codegenerator/constant/CodeConstants.java b/src/main/java/com/senmesh/codegenerator/constant/CodeConstants.java similarity index 93% rename from src/main/java/com/newyetai/codegenerator/constant/CodeConstants.java rename to src/main/java/com/senmesh/codegenerator/constant/CodeConstants.java index f336d76..12357fb 100644 --- a/src/main/java/com/newyetai/codegenerator/constant/CodeConstants.java +++ b/src/main/java/com/senmesh/codegenerator/constant/CodeConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.codegenerator.constant; +package com.senmesh.codegenerator.constant; /** * 编号常量类 diff --git a/src/main/java/com/newyetai/codegenerator/constant/DateFormatterEnum.java b/src/main/java/com/senmesh/codegenerator/constant/DateFormatterEnum.java similarity index 94% rename from src/main/java/com/newyetai/codegenerator/constant/DateFormatterEnum.java rename to src/main/java/com/senmesh/codegenerator/constant/DateFormatterEnum.java index 4b638f0..9255ff6 100644 --- a/src/main/java/com/newyetai/codegenerator/constant/DateFormatterEnum.java +++ b/src/main/java/com/senmesh/codegenerator/constant/DateFormatterEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.codegenerator.constant; +package com.senmesh.codegenerator.constant; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/com/newyetai/codegenerator/exception/CodeGeneratorException.java b/src/main/java/com/senmesh/codegenerator/exception/CodeGeneratorException.java similarity index 91% rename from src/main/java/com/newyetai/codegenerator/exception/CodeGeneratorException.java rename to src/main/java/com/senmesh/codegenerator/exception/CodeGeneratorException.java index 70221c5..ac122b6 100644 --- a/src/main/java/com/newyetai/codegenerator/exception/CodeGeneratorException.java +++ b/src/main/java/com/senmesh/codegenerator/exception/CodeGeneratorException.java @@ -1,4 +1,4 @@ -package com.newyetai.codegenerator.exception; +package com.senmesh.codegenerator.exception; /** * 编号生成器异常 diff --git a/src/main/java/com/newyetai/codegenerator/pojo/CodeParam.java b/src/main/java/com/senmesh/codegenerator/pojo/CodeParam.java similarity index 77% rename from src/main/java/com/newyetai/codegenerator/pojo/CodeParam.java rename to src/main/java/com/senmesh/codegenerator/pojo/CodeParam.java index ea67bac..64e5818 100644 --- a/src/main/java/com/newyetai/codegenerator/pojo/CodeParam.java +++ b/src/main/java/com/senmesh/codegenerator/pojo/CodeParam.java @@ -1,6 +1,6 @@ -package com.newyetai.codegenerator.pojo; +package com.senmesh.codegenerator.pojo; -import com.newyetai.codegenerator.constant.CodeConstants; +import com.senmesh.codegenerator.constant.CodeConstants; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/codegenerator/service/CodeGenerator.java b/src/main/java/com/senmesh/codegenerator/service/CodeGenerator.java similarity index 89% rename from src/main/java/com/newyetai/codegenerator/service/CodeGenerator.java rename to src/main/java/com/senmesh/codegenerator/service/CodeGenerator.java index c023518..6deb748 100644 --- a/src/main/java/com/newyetai/codegenerator/service/CodeGenerator.java +++ b/src/main/java/com/senmesh/codegenerator/service/CodeGenerator.java @@ -1,8 +1,8 @@ -package com.newyetai.codegenerator.service; +package com.senmesh.codegenerator.service; import java.util.List; -import com.newyetai.codegenerator.pojo.CodeParam; +import com.senmesh.codegenerator.pojo.CodeParam; /** * 编号生成器 默认一套实现，如需重定义中间时间format和id长度，重写规则 重写规则，注意去发号器对应的数据库表（leaf_alloc）中添加对应type+时间（biz_tag）的记录 diff --git a/src/main/java/com/newyetai/codegenerator/service/CodeService.java b/src/main/java/com/senmesh/codegenerator/service/CodeService.java similarity index 85% rename from src/main/java/com/newyetai/codegenerator/service/CodeService.java rename to src/main/java/com/senmesh/codegenerator/service/CodeService.java index 6fb3649..9e609b6 100644 --- a/src/main/java/com/newyetai/codegenerator/service/CodeService.java +++ b/src/main/java/com/senmesh/codegenerator/service/CodeService.java @@ -1,8 +1,8 @@ -package com.newyetai.codegenerator.service; +package com.senmesh.codegenerator.service; import java.util.List; -import com.newyetai.codegenerator.pojo.CodeParam; +import com.senmesh.codegenerator.pojo.CodeParam; /** * 编号service(根据类型分发不同的生成器) diff --git a/src/main/java/com/newyetai/codegenerator/service/SnowflakeIdWorker.java b/src/main/java/com/senmesh/codegenerator/service/SnowflakeIdWorker.java similarity index 99% rename from src/main/java/com/newyetai/codegenerator/service/SnowflakeIdWorker.java rename to src/main/java/com/senmesh/codegenerator/service/SnowflakeIdWorker.java index 434212d..387f95f 100644 --- a/src/main/java/com/newyetai/codegenerator/service/SnowflakeIdWorker.java +++ b/src/main/java/com/senmesh/codegenerator/service/SnowflakeIdWorker.java @@ -1,4 +1,4 @@ -package com.newyetai.codegenerator.service; +package com.senmesh.codegenerator.service; /** * Twitter_Snowflake
diff --git a/src/main/java/com/newyetai/codegenerator/service/generator/SnowFlakeCodeGenerator.java b/src/main/java/com/senmesh/codegenerator/service/generator/SnowFlakeCodeGenerator.java similarity index 76% rename from src/main/java/com/newyetai/codegenerator/service/generator/SnowFlakeCodeGenerator.java rename to src/main/java/com/senmesh/codegenerator/service/generator/SnowFlakeCodeGenerator.java index b11beb2..89c2b63 100644 --- a/src/main/java/com/newyetai/codegenerator/service/generator/SnowFlakeCodeGenerator.java +++ b/src/main/java/com/senmesh/codegenerator/service/generator/SnowFlakeCodeGenerator.java @@ -1,12 +1,12 @@ -package com.newyetai.codegenerator.service.generator; +package com.senmesh.codegenerator.service.generator; import java.util.List; import com.google.common.collect.Lists; -import com.newyetai.codegenerator.constant.CodeConstants; -import com.newyetai.codegenerator.pojo.CodeParam; -import com.newyetai.codegenerator.service.CodeGenerator; -import com.newyetai.codegenerator.service.SnowflakeIdWorker; +import com.senmesh.codegenerator.constant.CodeConstants; +import com.senmesh.codegenerator.pojo.CodeParam; +import com.senmesh.codegenerator.service.CodeGenerator; +import com.senmesh.codegenerator.service.SnowflakeIdWorker; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/codegenerator/service/impl/CodeServiceImpl.java b/src/main/java/com/senmesh/codegenerator/service/impl/CodeServiceImpl.java similarity index 81% rename from src/main/java/com/newyetai/codegenerator/service/impl/CodeServiceImpl.java rename to src/main/java/com/senmesh/codegenerator/service/impl/CodeServiceImpl.java index 6a3e8d1..b7d980f 100644 --- a/src/main/java/com/newyetai/codegenerator/service/impl/CodeServiceImpl.java +++ b/src/main/java/com/senmesh/codegenerator/service/impl/CodeServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.codegenerator.service.impl; +package com.senmesh.codegenerator.service.impl; import java.util.List; import java.util.Map; @@ -6,10 +6,10 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import com.google.common.collect.Maps; -import com.newyetai.codegenerator.constant.CodeConstants; -import com.newyetai.codegenerator.pojo.CodeParam; -import com.newyetai.codegenerator.service.CodeGenerator; -import com.newyetai.codegenerator.service.CodeService; +import com.senmesh.codegenerator.constant.CodeConstants; +import com.senmesh.codegenerator.pojo.CodeParam; +import com.senmesh.codegenerator.service.CodeGenerator; +import com.senmesh.codegenerator.service.CodeService; /** * 编号service实现类 diff --git a/src/main/java/com/newyetai/codegenerator/util/CodeUtils.java b/src/main/java/com/senmesh/codegenerator/util/CodeUtils.java similarity index 82% rename from src/main/java/com/newyetai/codegenerator/util/CodeUtils.java rename to src/main/java/com/senmesh/codegenerator/util/CodeUtils.java index ffed798..aee77a7 100644 --- a/src/main/java/com/newyetai/codegenerator/util/CodeUtils.java +++ b/src/main/java/com/senmesh/codegenerator/util/CodeUtils.java @@ -1,10 +1,10 @@ -package com.newyetai.codegenerator.util; +package com.senmesh.codegenerator.util; import java.util.List; -import com.newyetai.codegenerator.pojo.CodeParam; -import com.newyetai.codegenerator.service.CodeService; -import com.newyetai.component.constants.CodeTypeEnum; +import com.senmesh.codegenerator.pojo.CodeParam; +import com.senmesh.codegenerator.service.CodeService; +import com.senmesh.component.constants.CodeTypeEnum; /** * 发号器工具类 diff --git a/src/main/java/com/newyetai/codesetting/constant/CodeSettingConstants.java b/src/main/java/com/senmesh/codesetting/constant/CodeSettingConstants.java similarity index 94% rename from src/main/java/com/newyetai/codesetting/constant/CodeSettingConstants.java rename to src/main/java/com/senmesh/codesetting/constant/CodeSettingConstants.java index 006a6ff..52ab057 100644 --- a/src/main/java/com/newyetai/codesetting/constant/CodeSettingConstants.java +++ b/src/main/java/com/senmesh/codesetting/constant/CodeSettingConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.codesetting.constant; +package com.senmesh.codesetting.constant; public interface CodeSettingConstants { /** diff --git a/src/main/java/com/newyetai/codesetting/controller/CodeSettingController.java b/src/main/java/com/senmesh/codesetting/controller/CodeSettingController.java similarity index 81% rename from src/main/java/com/newyetai/codesetting/controller/CodeSettingController.java rename to src/main/java/com/senmesh/codesetting/controller/CodeSettingController.java index a05d327..7978f62 100644 --- a/src/main/java/com/newyetai/codesetting/controller/CodeSettingController.java +++ b/src/main/java/com/senmesh/codesetting/controller/CodeSettingController.java @@ -1,12 +1,12 @@ -package com.newyetai.codesetting.controller; +package com.senmesh.codesetting.controller; -import com.newyetai.codesetting.dto.CodeSettingDTO; -import com.newyetai.codesetting.dto.CodeSettingOperatorDTO; -import com.newyetai.codesetting.dto.CodeSettingPageQueryDTO; -import com.newyetai.codesetting.dto.CodeSettingQueryDTO; -import com.newyetai.codesetting.service.CodeSettingService; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.codesetting.dto.CodeSettingDTO; +import com.senmesh.codesetting.dto.CodeSettingOperatorDTO; +import com.senmesh.codesetting.dto.CodeSettingPageQueryDTO; +import com.senmesh.codesetting.dto.CodeSettingQueryDTO; +import com.senmesh.codesetting.service.CodeSettingService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/codesetting/convert/CodeSettingConvert.java b/src/main/java/com/senmesh/codesetting/convert/CodeSettingConvert.java similarity index 68% rename from src/main/java/com/newyetai/codesetting/convert/CodeSettingConvert.java rename to src/main/java/com/senmesh/codesetting/convert/CodeSettingConvert.java index 8ebc5fb..efcba09 100644 --- a/src/main/java/com/newyetai/codesetting/convert/CodeSettingConvert.java +++ b/src/main/java/com/senmesh/codesetting/convert/CodeSettingConvert.java @@ -1,8 +1,8 @@ -package com.newyetai.codesetting.convert; +package com.senmesh.codesetting.convert; -import com.newyetai.codesetting.dto.CodeSettingDTO; -import com.newyetai.codesetting.dto.CodeSettingOperatorDTO; -import com.newyetai.codesetting.entity.CodeSetting; +import com.senmesh.codesetting.dto.CodeSettingDTO; +import com.senmesh.codesetting.dto.CodeSettingOperatorDTO; +import com.senmesh.codesetting.entity.CodeSetting; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/src/main/java/com/newyetai/codesetting/dao/CodeSettingMapper.java b/src/main/java/com/senmesh/codesetting/dao/CodeSettingMapper.java similarity index 69% rename from src/main/java/com/newyetai/codesetting/dao/CodeSettingMapper.java rename to src/main/java/com/senmesh/codesetting/dao/CodeSettingMapper.java index 33df0b1..c3b05f5 100644 --- a/src/main/java/com/newyetai/codesetting/dao/CodeSettingMapper.java +++ b/src/main/java/com/senmesh/codesetting/dao/CodeSettingMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.codesetting.dao; +package com.senmesh.codesetting.dao; -import com.newyetai.codesetting.dto.CodeSettingDTO; -import com.newyetai.codesetting.dto.CodeSettingPageQueryDTO; -import com.newyetai.codesetting.dto.CodeSettingQueryDTO; -import com.newyetai.codesetting.entity.CodeSetting; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.codesetting.dto.CodeSettingDTO; +import com.senmesh.codesetting.dto.CodeSettingPageQueryDTO; +import com.senmesh.codesetting.dto.CodeSettingQueryDTO; +import com.senmesh.codesetting.entity.CodeSetting; +import com.senmesh.tkmybatis.mybatis.MyMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/newyetai/codesetting/dto/CodeSettingDTO.java b/src/main/java/com/senmesh/codesetting/dto/CodeSettingDTO.java similarity index 87% rename from src/main/java/com/newyetai/codesetting/dto/CodeSettingDTO.java rename to src/main/java/com/senmesh/codesetting/dto/CodeSettingDTO.java index b53d11c..01ba47e 100644 --- a/src/main/java/com/newyetai/codesetting/dto/CodeSettingDTO.java +++ b/src/main/java/com/senmesh/codesetting/dto/CodeSettingDTO.java @@ -1,7 +1,6 @@ -package com.newyetai.codesetting.dto; +package com.senmesh.codesetting.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.component.action.dto.ActionDetailDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/codesetting/dto/CodeSettingOperatorDTO.java b/src/main/java/com/senmesh/codesetting/dto/CodeSettingOperatorDTO.java similarity index 97% rename from src/main/java/com/newyetai/codesetting/dto/CodeSettingOperatorDTO.java rename to src/main/java/com/senmesh/codesetting/dto/CodeSettingOperatorDTO.java index a316768..a6d40e3 100644 --- a/src/main/java/com/newyetai/codesetting/dto/CodeSettingOperatorDTO.java +++ b/src/main/java/com/senmesh/codesetting/dto/CodeSettingOperatorDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.codesetting.dto; +package com.senmesh.codesetting.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/codesetting/dto/CodeSettingPageQueryDTO.java b/src/main/java/com/senmesh/codesetting/dto/CodeSettingPageQueryDTO.java similarity index 94% rename from src/main/java/com/newyetai/codesetting/dto/CodeSettingPageQueryDTO.java rename to src/main/java/com/senmesh/codesetting/dto/CodeSettingPageQueryDTO.java index 0c4376d..8bdd0a0 100644 --- a/src/main/java/com/newyetai/codesetting/dto/CodeSettingPageQueryDTO.java +++ b/src/main/java/com/senmesh/codesetting/dto/CodeSettingPageQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.codesetting.dto; +package com.senmesh.codesetting.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/codesetting/dto/CodeSettingQueryDTO.java b/src/main/java/com/senmesh/codesetting/dto/CodeSettingQueryDTO.java similarity index 98% rename from src/main/java/com/newyetai/codesetting/dto/CodeSettingQueryDTO.java rename to src/main/java/com/senmesh/codesetting/dto/CodeSettingQueryDTO.java index caead13..cb8d028 100644 --- a/src/main/java/com/newyetai/codesetting/dto/CodeSettingQueryDTO.java +++ b/src/main/java/com/senmesh/codesetting/dto/CodeSettingQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.codesetting.dto; +package com.senmesh.codesetting.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/newyetai/codesetting/entity/CodeSetting.java b/src/main/java/com/senmesh/codesetting/entity/CodeSetting.java similarity index 92% rename from src/main/java/com/newyetai/codesetting/entity/CodeSetting.java rename to src/main/java/com/senmesh/codesetting/entity/CodeSetting.java index d3511b4..c4a7a88 100644 --- a/src/main/java/com/newyetai/codesetting/entity/CodeSetting.java +++ b/src/main/java/com/senmesh/codesetting/entity/CodeSetting.java @@ -1,7 +1,7 @@ -package com.newyetai.codesetting.entity; +package com.senmesh.codesetting.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/codesetting/mapper/CodeSettingMapper.xml b/src/main/java/com/senmesh/codesetting/mapper/CodeSettingMapper.xml similarity index 90% rename from src/main/java/com/newyetai/codesetting/mapper/CodeSettingMapper.xml rename to src/main/java/com/senmesh/codesetting/mapper/CodeSettingMapper.xml index f0a6569..06e597a 100644 --- a/src/main/java/com/newyetai/codesetting/mapper/CodeSettingMapper.xml +++ b/src/main/java/com/senmesh/codesetting/mapper/CodeSettingMapper.xml @@ -1,14 +1,14 @@ - + - SELECT t.* - SELECT t.* diff --git a/src/main/java/com/newyetai/codesetting/service/CodeSettingService.java b/src/main/java/com/senmesh/codesetting/service/CodeSettingService.java similarity index 81% rename from src/main/java/com/newyetai/codesetting/service/CodeSettingService.java rename to src/main/java/com/senmesh/codesetting/service/CodeSettingService.java index b66f8b5..ee325f4 100644 --- a/src/main/java/com/newyetai/codesetting/service/CodeSettingService.java +++ b/src/main/java/com/senmesh/codesetting/service/CodeSettingService.java @@ -1,10 +1,9 @@ -package com.newyetai.codesetting.service; +package com.senmesh.codesetting.service; -import com.newyetai.codesetting.dto.CodeSettingDTO; -import com.newyetai.codesetting.dto.CodeSettingOperatorDTO; -import com.newyetai.codesetting.dto.CodeSettingPageQueryDTO; -import com.newyetai.codesetting.dto.CodeSettingQueryDTO; -import com.newyetai.codesetting.entity.CodeSetting; +import com.senmesh.codesetting.dto.CodeSettingDTO; +import com.senmesh.codesetting.dto.CodeSettingOperatorDTO; +import com.senmesh.codesetting.dto.CodeSettingPageQueryDTO; +import com.senmesh.codesetting.dto.CodeSettingQueryDTO; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; @@ -84,7 +83,7 @@ public interface CodeSettingService { * @param orgType * @return */ - List queryCode(String codeSettingType, String orgType); + List queryCode(String codeSettingType, String orgType); /** * 根据code查询 diff --git a/src/main/java/com/newyetai/codesetting/service/impl/CodeSettingServiceImpl.java b/src/main/java/com/senmesh/codesetting/service/impl/CodeSettingServiceImpl.java similarity index 83% rename from src/main/java/com/newyetai/codesetting/service/impl/CodeSettingServiceImpl.java rename to src/main/java/com/senmesh/codesetting/service/impl/CodeSettingServiceImpl.java index eaf0aff..b554198 100644 --- a/src/main/java/com/newyetai/codesetting/service/impl/CodeSettingServiceImpl.java +++ b/src/main/java/com/senmesh/codesetting/service/impl/CodeSettingServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.codesetting.service.impl; +package com.senmesh.codesetting.service.impl; import java.util.List; import java.util.Objects; @@ -10,18 +10,18 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.springframework.stereotype.Service; -import com.newyetai.codesetting.convert.CodeSettingConvert; -import com.newyetai.codesetting.dao.CodeSettingMapper; -import com.newyetai.codesetting.dto.CodeSettingDTO; -import com.newyetai.codesetting.dto.CodeSettingOperatorDTO; -import com.newyetai.codesetting.dto.CodeSettingPageQueryDTO; -import com.newyetai.codesetting.dto.CodeSettingQueryDTO; -import com.newyetai.codesetting.entity.CodeSetting; -import com.newyetai.codesetting.service.CodeSettingService; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.config.dao.ConfigMapper; +import com.senmesh.codesetting.convert.CodeSettingConvert; +import com.senmesh.codesetting.dao.CodeSettingMapper; +import com.senmesh.codesetting.dto.CodeSettingDTO; +import com.senmesh.codesetting.dto.CodeSettingOperatorDTO; +import com.senmesh.codesetting.dto.CodeSettingPageQueryDTO; +import com.senmesh.codesetting.dto.CodeSettingQueryDTO; +import com.senmesh.codesetting.entity.CodeSetting; +import com.senmesh.codesetting.service.CodeSettingService; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.config.dao.ConfigMapper; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/AlitaResult.java b/src/main/java/com/senmesh/common/AlitaResult.java similarity index 98% rename from src/main/java/com/newyetai/common/AlitaResult.java rename to src/main/java/com/senmesh/common/AlitaResult.java index 74054a0..070873a 100644 --- a/src/main/java/com/newyetai/common/AlitaResult.java +++ b/src/main/java/com/senmesh/common/AlitaResult.java @@ -1,12 +1,11 @@ -package com.newyetai.common; +package com.senmesh.common; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.constant.SdkConstants; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/common/CommonConfiguration.java b/src/main/java/com/senmesh/common/CommonConfiguration.java similarity index 78% rename from src/main/java/com/newyetai/common/CommonConfiguration.java rename to src/main/java/com/senmesh/common/CommonConfiguration.java index 9e0b823..b32c203 100644 --- a/src/main/java/com/newyetai/common/CommonConfiguration.java +++ b/src/main/java/com/senmesh/common/CommonConfiguration.java @@ -1,4 +1,4 @@ -package com.newyetai.common; +package com.senmesh.common; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -10,18 +10,18 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StringDeserializer; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.newyetai.common.cache.DefaultCacheProvider; -import com.newyetai.common.cache.ICacheProvider; -import com.newyetai.common.log.ILogProvider; -import com.newyetai.common.log.provider.Slf4jLogProvider; -import com.newyetai.common.log.util.LogUtils; -import com.newyetai.common.service.IMockProvider; -import com.newyetai.common.service.IMockProvider.DefaultMockProvider; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.MockUtils; -import com.newyetai.component.file.service.IFileStorage; -import com.newyetai.component.file.service.storage.LocalFileStorage; -import com.newyetai.component.file.util.FileStorageUtils; +import com.senmesh.common.cache.DefaultCacheProvider; +import com.senmesh.common.cache.ICacheProvider; +import com.senmesh.common.log.ILogProvider; +import com.senmesh.common.log.provider.Slf4jLogProvider; +import com.senmesh.common.log.util.LogUtils; +import com.senmesh.common.service.IMockProvider; +import com.senmesh.common.service.IMockProvider.DefaultMockProvider; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.MockUtils; +import com.senmesh.component.file.service.IFileStorage; +import com.senmesh.component.file.service.storage.LocalFileStorage; +import com.senmesh.component.file.util.FileStorageUtils; import lombok.var; diff --git a/src/main/java/com/newyetai/common/CoreConfiguration.java b/src/main/java/com/senmesh/common/CoreConfiguration.java similarity index 76% rename from src/main/java/com/newyetai/common/CoreConfiguration.java rename to src/main/java/com/senmesh/common/CoreConfiguration.java index fb67569..987eb5b 100644 --- a/src/main/java/com/newyetai/common/CoreConfiguration.java +++ b/src/main/java/com/senmesh/common/CoreConfiguration.java @@ -1,13 +1,13 @@ -package com.newyetai.common; +package com.senmesh.common; import org.jasypt.encryption.StringEncryptor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.newyetai.common.trace.DefaultTracer; -import com.newyetai.common.trace.ITracer; -import com.newyetai.common.util.JasyptUtils; +import com.senmesh.common.trace.DefaultTracer; +import com.senmesh.common.trace.ITracer; +import com.senmesh.common.util.JasyptUtils; @Configuration public class CoreConfiguration { diff --git a/src/main/java/com/newyetai/common/actuate/health/dto/HealthDTO.java b/src/main/java/com/senmesh/common/actuate/health/dto/HealthDTO.java similarity index 86% rename from src/main/java/com/newyetai/common/actuate/health/dto/HealthDTO.java rename to src/main/java/com/senmesh/common/actuate/health/dto/HealthDTO.java index 575c69c..5964987 100644 --- a/src/main/java/com/newyetai/common/actuate/health/dto/HealthDTO.java +++ b/src/main/java/com/senmesh/common/actuate/health/dto/HealthDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.actuate.health.dto; +package com.senmesh.common.actuate.health.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/common/annotation/AlitaStopWatch.java b/src/main/java/com/senmesh/common/annotation/AlitaStopWatch.java similarity index 88% rename from src/main/java/com/newyetai/common/annotation/AlitaStopWatch.java rename to src/main/java/com/senmesh/common/annotation/AlitaStopWatch.java index 6941de3..3a21d98 100644 --- a/src/main/java/com/newyetai/common/annotation/AlitaStopWatch.java +++ b/src/main/java/com/senmesh/common/annotation/AlitaStopWatch.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation; +package com.senmesh.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/com/newyetai/common/annotation/CheckAndMock.java b/src/main/java/com/senmesh/common/annotation/CheckAndMock.java similarity index 91% rename from src/main/java/com/newyetai/common/annotation/CheckAndMock.java rename to src/main/java/com/senmesh/common/annotation/CheckAndMock.java index ddbadeb..0a1f4b3 100644 --- a/src/main/java/com/newyetai/common/annotation/CheckAndMock.java +++ b/src/main/java/com/senmesh/common/annotation/CheckAndMock.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation; +package com.senmesh.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.newyetai.common.constant.ProjectProfileEnum; +import com.senmesh.common.constant.ProjectProfileEnum; /** * 校验并mock diff --git a/src/main/java/com/newyetai/common/annotation/CheckJob.java b/src/main/java/com/senmesh/common/annotation/CheckJob.java similarity index 93% rename from src/main/java/com/newyetai/common/annotation/CheckJob.java rename to src/main/java/com/senmesh/common/annotation/CheckJob.java index a7a6058..76ad1b9 100644 --- a/src/main/java/com/newyetai/common/annotation/CheckJob.java +++ b/src/main/java/com/senmesh/common/annotation/CheckJob.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation; +package com.senmesh.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/com/newyetai/common/annotation/ICheckAndMockPropertity.java b/src/main/java/com/senmesh/common/annotation/ICheckAndMockPropertity.java similarity index 91% rename from src/main/java/com/newyetai/common/annotation/ICheckAndMockPropertity.java rename to src/main/java/com/senmesh/common/annotation/ICheckAndMockPropertity.java index 805f4f3..f317fab 100644 --- a/src/main/java/com/newyetai/common/annotation/ICheckAndMockPropertity.java +++ b/src/main/java/com/senmesh/common/annotation/ICheckAndMockPropertity.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation; +package com.senmesh.common.annotation; /** * 需要校验后mock的配置 diff --git a/src/main/java/com/newyetai/common/annotation/Mask.java b/src/main/java/com/senmesh/common/annotation/Mask.java similarity index 91% rename from src/main/java/com/newyetai/common/annotation/Mask.java rename to src/main/java/com/senmesh/common/annotation/Mask.java index 682ccdb..5e01afd 100644 --- a/src/main/java/com/newyetai/common/annotation/Mask.java +++ b/src/main/java/com/senmesh/common/annotation/Mask.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation; +package com.senmesh.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/newyetai/common/annotation/MaskAnontationIntrospector.java b/src/main/java/com/senmesh/common/annotation/MaskAnontationIntrospector.java similarity index 95% rename from src/main/java/com/newyetai/common/annotation/MaskAnontationIntrospector.java rename to src/main/java/com/senmesh/common/annotation/MaskAnontationIntrospector.java index 4ac8670..07a74e7 100644 --- a/src/main/java/com/newyetai/common/annotation/MaskAnontationIntrospector.java +++ b/src/main/java/com/senmesh/common/annotation/MaskAnontationIntrospector.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation; +package com.senmesh.common.annotation; import com.fasterxml.jackson.databind.introspect.Annotated; import com.fasterxml.jackson.databind.introspect.AnnotatedMember; diff --git a/src/main/java/com/newyetai/common/annotation/MaskSerializer.java b/src/main/java/com/senmesh/common/annotation/MaskSerializer.java similarity index 95% rename from src/main/java/com/newyetai/common/annotation/MaskSerializer.java rename to src/main/java/com/senmesh/common/annotation/MaskSerializer.java index 456c5bf..fa00f9d 100644 --- a/src/main/java/com/newyetai/common/annotation/MaskSerializer.java +++ b/src/main/java/com/senmesh/common/annotation/MaskSerializer.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation; +package com.senmesh.common.annotation; import java.io.IOException; diff --git a/src/main/java/com/newyetai/common/annotation/aspect/AlitaStopWatchAspect.java b/src/main/java/com/senmesh/common/annotation/aspect/AlitaStopWatchAspect.java similarity index 86% rename from src/main/java/com/newyetai/common/annotation/aspect/AlitaStopWatchAspect.java rename to src/main/java/com/senmesh/common/annotation/aspect/AlitaStopWatchAspect.java index c27cedc..a4e7dbc 100644 --- a/src/main/java/com/newyetai/common/annotation/aspect/AlitaStopWatchAspect.java +++ b/src/main/java/com/senmesh/common/annotation/aspect/AlitaStopWatchAspect.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation.aspect; +package com.senmesh.common.annotation.aspect; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -6,9 +6,9 @@ import org.aspectj.lang.annotation.Aspect; import org.springframework.stereotype.Component; import org.springframework.util.StopWatch; -import com.newyetai.common.annotation.AlitaStopWatch; -import com.newyetai.common.exception.util.DevopsUtils; -import com.newyetai.common.util.EnvironmentUtils; +import com.senmesh.common.annotation.AlitaStopWatch; +import com.senmesh.common.exception.util.DevopsUtils; +import com.senmesh.common.util.EnvironmentUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/annotation/aspect/CheckAndMockAspect.java b/src/main/java/com/senmesh/common/annotation/aspect/CheckAndMockAspect.java similarity index 91% rename from src/main/java/com/newyetai/common/annotation/aspect/CheckAndMockAspect.java rename to src/main/java/com/senmesh/common/annotation/aspect/CheckAndMockAspect.java index cceccc7..1389299 100644 --- a/src/main/java/com/newyetai/common/annotation/aspect/CheckAndMockAspect.java +++ b/src/main/java/com/senmesh/common/annotation/aspect/CheckAndMockAspect.java @@ -1,11 +1,11 @@ -package com.newyetai.common.annotation.aspect; +package com.senmesh.common.annotation.aspect; -import com.newyetai.common.annotation.CheckAndMock; -import com.newyetai.common.annotation.ICheckAndMockPropertity; -import com.newyetai.common.cache.ICacheProvider; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.constant.ProjectProfileEnum; -import com.newyetai.common.util.SpringContextHolder; +import com.senmesh.common.annotation.CheckAndMock; +import com.senmesh.common.annotation.ICheckAndMockPropertity; +import com.senmesh.common.cache.ICacheProvider; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.constant.ProjectProfileEnum; +import com.senmesh.common.util.SpringContextHolder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/common/annotation/aspect/CheckJobAspect.java b/src/main/java/com/senmesh/common/annotation/aspect/CheckJobAspect.java similarity index 88% rename from src/main/java/com/newyetai/common/annotation/aspect/CheckJobAspect.java rename to src/main/java/com/senmesh/common/annotation/aspect/CheckJobAspect.java index adff889..b4bd8ff 100644 --- a/src/main/java/com/newyetai/common/annotation/aspect/CheckJobAspect.java +++ b/src/main/java/com/senmesh/common/annotation/aspect/CheckJobAspect.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation.aspect; +package com.senmesh.common.annotation.aspect; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; -import com.newyetai.common.annotation.CheckJob; -import com.newyetai.common.constant.CommonConstants; +import com.senmesh.common.annotation.CheckJob; +import com.senmesh.common.constant.CommonConstants; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpper.java b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpper.java similarity index 92% rename from src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpper.java rename to src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpper.java index a9acfdb..3e87d65 100644 --- a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpper.java +++ b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpper.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation.trimAndUpper; +package com.senmesh.common.annotation.trimAndUpper; import java.lang.annotation.*; diff --git a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperAnontationIntrospector.java b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperAnontationIntrospector.java similarity index 93% rename from src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperAnontationIntrospector.java rename to src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperAnontationIntrospector.java index 95b88f3..da7f744 100644 --- a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperAnontationIntrospector.java +++ b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperAnontationIntrospector.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation.trimAndUpper; +package com.senmesh.common.annotation.trimAndUpper; import com.fasterxml.jackson.databind.AnnotationIntrospector; import com.fasterxml.jackson.databind.introspect.Annotated; diff --git a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperConfig.java b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperConfig.java similarity index 98% rename from src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperConfig.java rename to src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperConfig.java index 821912c..ecd4836 100644 --- a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperConfig.java +++ b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation.trimAndUpper; +package com.senmesh.common.annotation.trimAndUpper; import com.fasterxml.jackson.databind.AnnotationIntrospector; import com.fasterxml.jackson.databind.DeserializationConfig; diff --git a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperDeserializer.java b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperDeserializer.java similarity index 94% rename from src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperDeserializer.java rename to src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperDeserializer.java index 78e910b..fd8a108 100644 --- a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperDeserializer.java +++ b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperDeserializer.java @@ -1,4 +1,4 @@ -package com.newyetai.common.annotation.trimAndUpper; +package com.senmesh.common.annotation.trimAndUpper; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.deser.ContextualDeserializer; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.google.common.collect.Maps; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper.ExecuteType; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper.ExecuteType; import java.io.IOException; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperFormatterFactory.java b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperFormatterFactory.java similarity index 94% rename from src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperFormatterFactory.java rename to src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperFormatterFactory.java index 2af7c78..dc0520c 100644 --- a/src/main/java/com/newyetai/common/annotation/trimAndUpper/TrimAndUpperFormatterFactory.java +++ b/src/main/java/com/senmesh/common/annotation/trimAndUpper/TrimAndUpperFormatterFactory.java @@ -1,8 +1,8 @@ -package com.newyetai.common.annotation.trimAndUpper; +package com.senmesh.common.annotation.trimAndUpper; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper.ExecuteType; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper.ExecuteType; import org.apache.commons.lang3.StringUtils; import org.springframework.format.AnnotationFormatterFactory; import org.springframework.format.Formatter; diff --git a/src/main/java/com/newyetai/common/cache/DefaultCacheProvider.java b/src/main/java/com/senmesh/common/cache/DefaultCacheProvider.java similarity index 95% rename from src/main/java/com/newyetai/common/cache/DefaultCacheProvider.java rename to src/main/java/com/senmesh/common/cache/DefaultCacheProvider.java index 288b023..88f804c 100644 --- a/src/main/java/com/newyetai/common/cache/DefaultCacheProvider.java +++ b/src/main/java/com/senmesh/common/cache/DefaultCacheProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.common.cache; +package com.senmesh.common.cache; import java.util.Map; diff --git a/src/main/java/com/newyetai/common/cache/ICacheProvider.java b/src/main/java/com/senmesh/common/cache/ICacheProvider.java similarity index 87% rename from src/main/java/com/newyetai/common/cache/ICacheProvider.java rename to src/main/java/com/senmesh/common/cache/ICacheProvider.java index 83a28cc..dbd469d 100644 --- a/src/main/java/com/newyetai/common/cache/ICacheProvider.java +++ b/src/main/java/com/senmesh/common/cache/ICacheProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.common.cache; +package com.senmesh.common.cache; /** * @author sr on 2020-07-07 diff --git a/src/main/java/com/newyetai/common/cache/RedisCacheProvier.java b/src/main/java/com/senmesh/common/cache/RedisCacheProvier.java similarity index 96% rename from src/main/java/com/newyetai/common/cache/RedisCacheProvier.java rename to src/main/java/com/senmesh/common/cache/RedisCacheProvier.java index 20da121..89bb416 100644 --- a/src/main/java/com/newyetai/common/cache/RedisCacheProvier.java +++ b/src/main/java/com/senmesh/common/cache/RedisCacheProvier.java @@ -1,4 +1,4 @@ -package com.newyetai.common.cache; +package com.senmesh.common.cache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/src/main/java/com/newyetai/common/constant/AuthStatusEnum.java b/src/main/java/com/senmesh/common/constant/AuthStatusEnum.java similarity index 81% rename from src/main/java/com/newyetai/common/constant/AuthStatusEnum.java rename to src/main/java/com/senmesh/common/constant/AuthStatusEnum.java index 8700dbe..9cb50d8 100644 --- a/src/main/java/com/newyetai/common/constant/AuthStatusEnum.java +++ b/src/main/java/com/senmesh/common/constant/AuthStatusEnum.java @@ -1,8 +1,4 @@ -package com.newyetai.common.constant; - -import com.google.common.collect.Maps; -import java.util.Map; -import javax.validation.constraints.NotNull; +package com.senmesh.common.constant; /** * 系统枚举 diff --git a/src/main/java/com/newyetai/common/constant/CacheConstants.java b/src/main/java/com/senmesh/common/constant/CacheConstants.java similarity index 77% rename from src/main/java/com/newyetai/common/constant/CacheConstants.java rename to src/main/java/com/senmesh/common/constant/CacheConstants.java index 83bf196..b7141f0 100644 --- a/src/main/java/com/newyetai/common/constant/CacheConstants.java +++ b/src/main/java/com/senmesh/common/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; /** * 缓存常量 diff --git a/src/main/java/com/newyetai/common/constant/CommonConstants.java b/src/main/java/com/senmesh/common/constant/CommonConstants.java similarity index 97% rename from src/main/java/com/newyetai/common/constant/CommonConstants.java rename to src/main/java/com/senmesh/common/constant/CommonConstants.java index 3040eb5..980532c 100644 --- a/src/main/java/com/newyetai/common/constant/CommonConstants.java +++ b/src/main/java/com/senmesh/common/constant/CommonConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; /** * 公共常量 diff --git a/src/main/java/com/newyetai/common/constant/CommonMqConstants.java b/src/main/java/com/senmesh/common/constant/CommonMqConstants.java similarity index 52% rename from src/main/java/com/newyetai/common/constant/CommonMqConstants.java rename to src/main/java/com/senmesh/common/constant/CommonMqConstants.java index 7a7ca69..ebc6c1e 100644 --- a/src/main/java/com/newyetai/common/constant/CommonMqConstants.java +++ b/src/main/java/com/senmesh/common/constant/CommonMqConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; public interface CommonMqConstants { diff --git a/src/main/java/com/newyetai/common/constant/CookieConstants.java b/src/main/java/com/senmesh/common/constant/CookieConstants.java similarity index 90% rename from src/main/java/com/newyetai/common/constant/CookieConstants.java rename to src/main/java/com/senmesh/common/constant/CookieConstants.java index 7c3767e..58d2fb8 100644 --- a/src/main/java/com/newyetai/common/constant/CookieConstants.java +++ b/src/main/java/com/senmesh/common/constant/CookieConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; /** * @author Jerry.li diff --git a/src/main/java/com/newyetai/common/constant/ExceptionMsgs.java b/src/main/java/com/senmesh/common/constant/ExceptionMsgs.java similarity index 89% rename from src/main/java/com/newyetai/common/constant/ExceptionMsgs.java rename to src/main/java/com/senmesh/common/constant/ExceptionMsgs.java index 77c6579..0bc12a7 100644 --- a/src/main/java/com/newyetai/common/constant/ExceptionMsgs.java +++ b/src/main/java/com/senmesh/common/constant/ExceptionMsgs.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; /** * 异常错误信息 diff --git a/src/main/java/com/newyetai/common/constant/ExceptionRecordConstants.java b/src/main/java/com/senmesh/common/constant/ExceptionRecordConstants.java similarity index 79% rename from src/main/java/com/newyetai/common/constant/ExceptionRecordConstants.java rename to src/main/java/com/senmesh/common/constant/ExceptionRecordConstants.java index 3195e4c..0862123 100644 --- a/src/main/java/com/newyetai/common/constant/ExceptionRecordConstants.java +++ b/src/main/java/com/senmesh/common/constant/ExceptionRecordConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; public interface ExceptionRecordConstants { diff --git a/src/main/java/com/newyetai/common/constant/GenderEnum.java b/src/main/java/com/senmesh/common/constant/GenderEnum.java similarity index 95% rename from src/main/java/com/newyetai/common/constant/GenderEnum.java rename to src/main/java/com/senmesh/common/constant/GenderEnum.java index 4363507..34a627b 100644 --- a/src/main/java/com/newyetai/common/constant/GenderEnum.java +++ b/src/main/java/com/senmesh/common/constant/GenderEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; /** * 性别枚举 diff --git a/src/main/java/com/newyetai/common/constant/ProjectProfileEnum.java b/src/main/java/com/senmesh/common/constant/ProjectProfileEnum.java similarity index 91% rename from src/main/java/com/newyetai/common/constant/ProjectProfileEnum.java rename to src/main/java/com/senmesh/common/constant/ProjectProfileEnum.java index 3f65e7e..f2b6aed 100644 --- a/src/main/java/com/newyetai/common/constant/ProjectProfileEnum.java +++ b/src/main/java/com/senmesh/common/constant/ProjectProfileEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; /** * 项目环境枚举 diff --git a/src/main/java/com/newyetai/common/constant/TradeAccountTypeConstants.java b/src/main/java/com/senmesh/common/constant/TradeAccountTypeConstants.java similarity index 98% rename from src/main/java/com/newyetai/common/constant/TradeAccountTypeConstants.java rename to src/main/java/com/senmesh/common/constant/TradeAccountTypeConstants.java index 49782e9..900ff35 100644 --- a/src/main/java/com/newyetai/common/constant/TradeAccountTypeConstants.java +++ b/src/main/java/com/senmesh/common/constant/TradeAccountTypeConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.common.constant; +package com.senmesh.common.constant; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/newyetai/common/controller/TestController.java b/src/main/java/com/senmesh/common/controller/TestController.java similarity index 76% rename from src/main/java/com/newyetai/common/controller/TestController.java rename to src/main/java/com/senmesh/common/controller/TestController.java index 1a6d6d0..5969375 100644 --- a/src/main/java/com/newyetai/common/controller/TestController.java +++ b/src/main/java/com/senmesh/common/controller/TestController.java @@ -1,4 +1,4 @@ -package com.newyetai.common.controller; +package com.senmesh.common.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -6,11 +6,11 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.commonexport.service.ExportService; -import com.newyetai.usercenter.user.dto.UserDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.commonexport.service.ExportService; +import com.senmesh.usercenter.user.dto.UserDTO; @RestController public class TestController { diff --git a/src/main/java/com/newyetai/common/dto/BaseDTO.java b/src/main/java/com/senmesh/common/dto/BaseDTO.java similarity index 94% rename from src/main/java/com/newyetai/common/dto/BaseDTO.java rename to src/main/java/com/senmesh/common/dto/BaseDTO.java index ea5cd75..3b86a1f 100644 --- a/src/main/java/com/newyetai/common/dto/BaseDTO.java +++ b/src/main/java/com/senmesh/common/dto/BaseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import java.io.Serializable; import java.util.Date; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat.Shape; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/common/dto/BaseOperateDTO.java b/src/main/java/com/senmesh/common/dto/BaseOperateDTO.java similarity index 90% rename from src/main/java/com/newyetai/common/dto/BaseOperateDTO.java rename to src/main/java/com/senmesh/common/dto/BaseOperateDTO.java index 17d9563..e64732f 100644 --- a/src/main/java/com/newyetai/common/dto/BaseOperateDTO.java +++ b/src/main/java/com/senmesh/common/dto/BaseOperateDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.util.UserContextHolder; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/common/dto/ButtonDTO.java b/src/main/java/com/senmesh/common/dto/ButtonDTO.java similarity index 85% rename from src/main/java/com/newyetai/common/dto/ButtonDTO.java rename to src/main/java/com/senmesh/common/dto/ButtonDTO.java index db20b20..038cd1d 100644 --- a/src/main/java/com/newyetai/common/dto/ButtonDTO.java +++ b/src/main/java/com/senmesh/common/dto/ButtonDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/common/dto/CasTokenDTO.java b/src/main/java/com/senmesh/common/dto/CasTokenDTO.java similarity index 93% rename from src/main/java/com/newyetai/common/dto/CasTokenDTO.java rename to src/main/java/com/senmesh/common/dto/CasTokenDTO.java index d280daa..a5e6704 100644 --- a/src/main/java/com/newyetai/common/dto/CasTokenDTO.java +++ b/src/main/java/com/senmesh/common/dto/CasTokenDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/common/dto/ColumnDTO.java b/src/main/java/com/senmesh/common/dto/ColumnDTO.java similarity index 95% rename from src/main/java/com/newyetai/common/dto/ColumnDTO.java rename to src/main/java/com/senmesh/common/dto/ColumnDTO.java index e115301..9e24d3c 100644 --- a/src/main/java/com/newyetai/common/dto/ColumnDTO.java +++ b/src/main/java/com/senmesh/common/dto/ColumnDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/common/dto/DisplayedComponentDTO.java b/src/main/java/com/senmesh/common/dto/DisplayedComponentDTO.java similarity index 94% rename from src/main/java/com/newyetai/common/dto/DisplayedComponentDTO.java rename to src/main/java/com/senmesh/common/dto/DisplayedComponentDTO.java index 798375d..c7272c4 100644 --- a/src/main/java/com/newyetai/common/dto/DisplayedComponentDTO.java +++ b/src/main/java/com/senmesh/common/dto/DisplayedComponentDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/common/dto/ExceptionRecordDTO.java b/src/main/java/com/senmesh/common/dto/ExceptionRecordDTO.java similarity index 93% rename from src/main/java/com/newyetai/common/dto/ExceptionRecordDTO.java rename to src/main/java/com/senmesh/common/dto/ExceptionRecordDTO.java index 04d3512..241826b 100644 --- a/src/main/java/com/newyetai/common/dto/ExceptionRecordDTO.java +++ b/src/main/java/com/senmesh/common/dto/ExceptionRecordDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/common/dto/ExportHeadDetailInfoDTO.java b/src/main/java/com/senmesh/common/dto/ExportHeadDetailInfoDTO.java similarity index 93% rename from src/main/java/com/newyetai/common/dto/ExportHeadDetailInfoDTO.java rename to src/main/java/com/senmesh/common/dto/ExportHeadDetailInfoDTO.java index c2a45b6..8d471f7 100644 --- a/src/main/java/com/newyetai/common/dto/ExportHeadDetailInfoDTO.java +++ b/src/main/java/com/senmesh/common/dto/ExportHeadDetailInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/common/dto/ExportHeadInfoDTO.java b/src/main/java/com/senmesh/common/dto/ExportHeadInfoDTO.java similarity index 97% rename from src/main/java/com/newyetai/common/dto/ExportHeadInfoDTO.java rename to src/main/java/com/senmesh/common/dto/ExportHeadInfoDTO.java index beac722..d86a99c 100644 --- a/src/main/java/com/newyetai/common/dto/ExportHeadInfoDTO.java +++ b/src/main/java/com/senmesh/common/dto/ExportHeadInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import org.apache.commons.compress.utils.Lists; diff --git a/src/main/java/com/newyetai/common/dto/IBaseDTO.java b/src/main/java/com/senmesh/common/dto/IBaseDTO.java similarity index 76% rename from src/main/java/com/newyetai/common/dto/IBaseDTO.java rename to src/main/java/com/senmesh/common/dto/IBaseDTO.java index 716037c..3b74441 100644 --- a/src/main/java/com/newyetai/common/dto/IBaseDTO.java +++ b/src/main/java/com/senmesh/common/dto/IBaseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; /** * 基础对象 diff --git a/src/main/java/com/newyetai/common/dto/IDisplayed.java b/src/main/java/com/senmesh/common/dto/IDisplayed.java similarity index 90% rename from src/main/java/com/newyetai/common/dto/IDisplayed.java rename to src/main/java/com/senmesh/common/dto/IDisplayed.java index 609a5ad..edbfef9 100644 --- a/src/main/java/com/newyetai/common/dto/IDisplayed.java +++ b/src/main/java/com/senmesh/common/dto/IDisplayed.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; /** * 展示信息 diff --git a/src/main/java/com/newyetai/common/dto/IOperateDTO.java b/src/main/java/com/senmesh/common/dto/IOperateDTO.java similarity index 91% rename from src/main/java/com/newyetai/common/dto/IOperateDTO.java rename to src/main/java/com/senmesh/common/dto/IOperateDTO.java index e2058df..384591c 100644 --- a/src/main/java/com/newyetai/common/dto/IOperateDTO.java +++ b/src/main/java/com/senmesh/common/dto/IOperateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; /** * 操作对象 diff --git a/src/main/java/com/newyetai/common/dto/IPage.java b/src/main/java/com/senmesh/common/dto/IPage.java similarity index 94% rename from src/main/java/com/newyetai/common/dto/IPage.java rename to src/main/java/com/senmesh/common/dto/IPage.java index 62adb43..f85b882 100644 --- a/src/main/java/com/newyetai/common/dto/IPage.java +++ b/src/main/java/com/senmesh/common/dto/IPage.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import java.util.List; diff --git a/src/main/java/com/newyetai/common/dto/MessageDTO.java b/src/main/java/com/senmesh/common/dto/MessageDTO.java similarity index 94% rename from src/main/java/com/newyetai/common/dto/MessageDTO.java rename to src/main/java/com/senmesh/common/dto/MessageDTO.java index 7f69b2c..7818a6d 100644 --- a/src/main/java/com/newyetai/common/dto/MessageDTO.java +++ b/src/main/java/com/senmesh/common/dto/MessageDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/common/dto/OrgBaseDTO.java b/src/main/java/com/senmesh/common/dto/OrgBaseDTO.java similarity index 92% rename from src/main/java/com/newyetai/common/dto/OrgBaseDTO.java rename to src/main/java/com/senmesh/common/dto/OrgBaseDTO.java index 11b43b0..5422f70 100644 --- a/src/main/java/com/newyetai/common/dto/OrgBaseDTO.java +++ b/src/main/java/com/senmesh/common/dto/OrgBaseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/newyetai/common/dto/PageQueryDTO.java b/src/main/java/com/senmesh/common/dto/PageQueryDTO.java similarity index 96% rename from src/main/java/com/newyetai/common/dto/PageQueryDTO.java rename to src/main/java/com/senmesh/common/dto/PageQueryDTO.java index 0e8df7f..4bba060 100644 --- a/src/main/java/com/newyetai/common/dto/PageQueryDTO.java +++ b/src/main/java/com/senmesh/common/dto/PageQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.common.dto; +package com.senmesh.common.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.tkmybatis.pojo.Page; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/common/easyexcel/DynamicExportTemplateCellWriteHandler.java b/src/main/java/com/senmesh/common/easyexcel/DynamicExportTemplateCellWriteHandler.java similarity index 97% rename from src/main/java/com/newyetai/common/easyexcel/DynamicExportTemplateCellWriteHandler.java rename to src/main/java/com/senmesh/common/easyexcel/DynamicExportTemplateCellWriteHandler.java index fd90a43..5e2c63f 100644 --- a/src/main/java/com/newyetai/common/easyexcel/DynamicExportTemplateCellWriteHandler.java +++ b/src/main/java/com/senmesh/common/easyexcel/DynamicExportTemplateCellWriteHandler.java @@ -1,16 +1,15 @@ -package com.newyetai.common.easyexcel; +package com.senmesh.common.easyexcel; import com.google.common.collect.Maps; import com.alibaba.excel.metadata.Head; -import com.alibaba.excel.metadata.data.CellData; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.write.handler.AbstractCellWriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; -import com.newyetai.common.dto.ExportHeadDetailInfoDTO; -import com.newyetai.common.dto.ExportHeadInfoDTO; +import com.senmesh.common.dto.ExportHeadDetailInfoDTO; +import com.senmesh.common.dto.ExportHeadInfoDTO; import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.BorderStyle; diff --git a/src/main/java/com/newyetai/common/easyexcel/ExcelUtil.java b/src/main/java/com/senmesh/common/easyexcel/ExcelUtil.java similarity index 94% rename from src/main/java/com/newyetai/common/easyexcel/ExcelUtil.java rename to src/main/java/com/senmesh/common/easyexcel/ExcelUtil.java index fee3b3b..3f86999 100644 --- a/src/main/java/com/newyetai/common/easyexcel/ExcelUtil.java +++ b/src/main/java/com/senmesh/common/easyexcel/ExcelUtil.java @@ -1,11 +1,11 @@ -package com.newyetai.common.easyexcel; +package com.senmesh.common.easyexcel; import com.google.common.collect.Lists; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; -import com.newyetai.common.dto.ExportHeadDetailInfoDTO; -import com.newyetai.common.dto.ExportHeadInfoDTO; +import com.senmesh.common.dto.ExportHeadDetailInfoDTO; +import com.senmesh.common.dto.ExportHeadInfoDTO; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/src/main/java/com/newyetai/common/easyexcel/ImportDataContext.java b/src/main/java/com/senmesh/common/easyexcel/ImportDataContext.java similarity index 96% rename from src/main/java/com/newyetai/common/easyexcel/ImportDataContext.java rename to src/main/java/com/senmesh/common/easyexcel/ImportDataContext.java index 931a605..a9d36fa 100644 --- a/src/main/java/com/newyetai/common/easyexcel/ImportDataContext.java +++ b/src/main/java/com/senmesh/common/easyexcel/ImportDataContext.java @@ -1,4 +1,4 @@ -package com.newyetai.common.easyexcel; +package com.senmesh.common.easyexcel; import com.google.common.collect.Maps; diff --git a/src/main/java/com/newyetai/common/entity/BaseEntity.java b/src/main/java/com/senmesh/common/entity/BaseEntity.java similarity index 95% rename from src/main/java/com/newyetai/common/entity/BaseEntity.java rename to src/main/java/com/senmesh/common/entity/BaseEntity.java index 4673504..de5cc2b 100644 --- a/src/main/java/com/newyetai/common/entity/BaseEntity.java +++ b/src/main/java/com/senmesh/common/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.newyetai.common.entity; +package com.senmesh.common.entity; import java.io.Serializable; import java.util.Date; @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.dto.IBaseDTO; +import com.senmesh.common.dto.IBaseDTO; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/common/entity/OrgBaseEntity.java b/src/main/java/com/senmesh/common/entity/OrgBaseEntity.java similarity index 93% rename from src/main/java/com/newyetai/common/entity/OrgBaseEntity.java rename to src/main/java/com/senmesh/common/entity/OrgBaseEntity.java index 173e640..f250c31 100644 --- a/src/main/java/com/newyetai/common/entity/OrgBaseEntity.java +++ b/src/main/java/com/senmesh/common/entity/OrgBaseEntity.java @@ -1,4 +1,4 @@ -package com.newyetai.common.entity; +package com.senmesh.common.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/common/exception/AlitaException.java b/src/main/java/com/senmesh/common/exception/AlitaException.java similarity index 92% rename from src/main/java/com/newyetai/common/exception/AlitaException.java rename to src/main/java/com/senmesh/common/exception/AlitaException.java index 1cff84a..7d6b75b 100644 --- a/src/main/java/com/newyetai/common/exception/AlitaException.java +++ b/src/main/java/com/senmesh/common/exception/AlitaException.java @@ -1,4 +1,4 @@ -package com.newyetai.common.exception; +package com.senmesh.common.exception; /** diff --git a/src/main/java/com/newyetai/common/exception/BusinessException.java b/src/main/java/com/senmesh/common/exception/BusinessException.java similarity index 92% rename from src/main/java/com/newyetai/common/exception/BusinessException.java rename to src/main/java/com/senmesh/common/exception/BusinessException.java index ffc72ab..99d286c 100644 --- a/src/main/java/com/newyetai/common/exception/BusinessException.java +++ b/src/main/java/com/senmesh/common/exception/BusinessException.java @@ -1,4 +1,4 @@ -package com.newyetai.common.exception; +package com.senmesh.common.exception; /** * 业务异常 diff --git a/src/main/java/com/newyetai/common/exception/ChangeTokenException.java b/src/main/java/com/senmesh/common/exception/ChangeTokenException.java similarity index 77% rename from src/main/java/com/newyetai/common/exception/ChangeTokenException.java rename to src/main/java/com/senmesh/common/exception/ChangeTokenException.java index 92983fe..837ae5c 100644 --- a/src/main/java/com/newyetai/common/exception/ChangeTokenException.java +++ b/src/main/java/com/senmesh/common/exception/ChangeTokenException.java @@ -1,7 +1,7 @@ -package com.newyetai.common.exception; +package com.senmesh.common.exception; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.dto.CasTokenDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.dto.CasTokenDTO; /** * 更新token diff --git a/src/main/java/com/newyetai/common/exception/DevopsException.java b/src/main/java/com/senmesh/common/exception/DevopsException.java similarity index 81% rename from src/main/java/com/newyetai/common/exception/DevopsException.java rename to src/main/java/com/senmesh/common/exception/DevopsException.java index 378266e..7266039 100644 --- a/src/main/java/com/newyetai/common/exception/DevopsException.java +++ b/src/main/java/com/senmesh/common/exception/DevopsException.java @@ -1,6 +1,6 @@ -package com.newyetai.common.exception; +package com.senmesh.common.exception; -import com.newyetai.common.exception.util.DevopsUtils; +import com.senmesh.common.exception.util.DevopsUtils; /** * 运维业务异常 diff --git a/src/main/java/com/newyetai/common/exception/ExistException.java b/src/main/java/com/senmesh/common/exception/ExistException.java similarity index 90% rename from src/main/java/com/newyetai/common/exception/ExistException.java rename to src/main/java/com/senmesh/common/exception/ExistException.java index 3fc21f7..1483ff8 100644 --- a/src/main/java/com/newyetai/common/exception/ExistException.java +++ b/src/main/java/com/senmesh/common/exception/ExistException.java @@ -1,4 +1,4 @@ -package com.newyetai.common.exception; +package com.senmesh.common.exception; /** * 已存在业务异常 diff --git a/src/main/java/com/newyetai/common/exception/IDevopsProvider.java b/src/main/java/com/senmesh/common/exception/IDevopsProvider.java similarity index 63% rename from src/main/java/com/newyetai/common/exception/IDevopsProvider.java rename to src/main/java/com/senmesh/common/exception/IDevopsProvider.java index 3d2d219..e8f2cad 100644 --- a/src/main/java/com/newyetai/common/exception/IDevopsProvider.java +++ b/src/main/java/com/senmesh/common/exception/IDevopsProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.common.exception; +package com.senmesh.common.exception; public interface IDevopsProvider { diff --git a/src/main/java/com/newyetai/common/exception/NoneLoginException.java b/src/main/java/com/senmesh/common/exception/NoneLoginException.java similarity index 91% rename from src/main/java/com/newyetai/common/exception/NoneLoginException.java rename to src/main/java/com/senmesh/common/exception/NoneLoginException.java index 3ffd182..977a62c 100644 --- a/src/main/java/com/newyetai/common/exception/NoneLoginException.java +++ b/src/main/java/com/senmesh/common/exception/NoneLoginException.java @@ -1,4 +1,4 @@ -package com.newyetai.common.exception; +package com.senmesh.common.exception; /** * 用户未登录异常 diff --git a/src/main/java/com/newyetai/common/exception/WithResultException.java b/src/main/java/com/senmesh/common/exception/WithResultException.java similarity index 87% rename from src/main/java/com/newyetai/common/exception/WithResultException.java rename to src/main/java/com/senmesh/common/exception/WithResultException.java index f7e28ab..92e7098 100644 --- a/src/main/java/com/newyetai/common/exception/WithResultException.java +++ b/src/main/java/com/senmesh/common/exception/WithResultException.java @@ -1,6 +1,6 @@ -package com.newyetai.common.exception; +package com.senmesh.common.exception; -import com.newyetai.common.AlitaResult; +import com.senmesh.common.AlitaResult; /** * 更新token diff --git a/src/main/java/com/newyetai/common/exception/controller/ExceptionLogController.java b/src/main/java/com/senmesh/common/exception/controller/ExceptionLogController.java similarity index 88% rename from src/main/java/com/newyetai/common/exception/controller/ExceptionLogController.java rename to src/main/java/com/senmesh/common/exception/controller/ExceptionLogController.java index 99e0d08..b014bd6 100644 --- a/src/main/java/com/newyetai/common/exception/controller/ExceptionLogController.java +++ b/src/main/java/com/senmesh/common/exception/controller/ExceptionLogController.java @@ -1,6 +1,6 @@ -package com.newyetai.common.exception.controller; +package com.senmesh.common.exception.controller; -import com.newyetai.common.exception.dao.ExceptionLogMapper; +import com.senmesh.common.exception.dao.ExceptionLogMapper; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/newyetai/common/exception/dao/ExceptionLogMapper.java b/src/main/java/com/senmesh/common/exception/dao/ExceptionLogMapper.java similarity index 64% rename from src/main/java/com/newyetai/common/exception/dao/ExceptionLogMapper.java rename to src/main/java/com/senmesh/common/exception/dao/ExceptionLogMapper.java index 18bf335..affb262 100644 --- a/src/main/java/com/newyetai/common/exception/dao/ExceptionLogMapper.java +++ b/src/main/java/com/senmesh/common/exception/dao/ExceptionLogMapper.java @@ -1,7 +1,7 @@ -package com.newyetai.common.exception.dao; +package com.senmesh.common.exception.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.common.exception.entity.ExceptionLog; +import com.senmesh.common.exception.entity.ExceptionLog; /** * 异常日志 diff --git a/src/main/java/com/newyetai/common/exception/entity/ExceptionLog.java b/src/main/java/com/senmesh/common/exception/entity/ExceptionLog.java similarity index 94% rename from src/main/java/com/newyetai/common/exception/entity/ExceptionLog.java rename to src/main/java/com/senmesh/common/exception/entity/ExceptionLog.java index 158e4d5..3505452 100644 --- a/src/main/java/com/newyetai/common/exception/entity/ExceptionLog.java +++ b/src/main/java/com/senmesh/common/exception/entity/ExceptionLog.java @@ -1,4 +1,4 @@ -package com.newyetai.common.exception.entity; +package com.senmesh.common.exception.entity; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/newyetai/common/exception/handle/GlobalControllerExceptionHandler.java b/src/main/java/com/senmesh/common/exception/handle/GlobalControllerExceptionHandler.java similarity index 91% rename from src/main/java/com/newyetai/common/exception/handle/GlobalControllerExceptionHandler.java rename to src/main/java/com/senmesh/common/exception/handle/GlobalControllerExceptionHandler.java index b2b4d87..98cbd1c 100644 --- a/src/main/java/com/newyetai/common/exception/handle/GlobalControllerExceptionHandler.java +++ b/src/main/java/com/senmesh/common/exception/handle/GlobalControllerExceptionHandler.java @@ -1,6 +1,6 @@ -package com.newyetai.common.exception.handle; +package com.senmesh.common.exception.handle; -import com.newyetai.common.util.EnvironmentUtils; +import com.senmesh.common.util.EnvironmentUtils; import java.util.List; import java.util.Set; import java.util.StringJoiner; @@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RestControllerAdvice; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.NoneLoginException; -import com.newyetai.common.exception.WithResultException; -import com.newyetai.common.log.dto.ExceptionLogDTO; -import com.newyetai.common.log.util.LogUtils; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.common.util.TracerUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.NoneLoginException; +import com.senmesh.common.exception.WithResultException; +import com.senmesh.common.log.dto.ExceptionLogDTO; +import com.senmesh.common.log.util.LogUtils; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.common.util.TracerUtils; /** * 全局异常处理 diff --git a/src/main/java/com/newyetai/common/exception/util/Assert.java b/src/main/java/com/senmesh/common/exception/util/Assert.java similarity index 93% rename from src/main/java/com/newyetai/common/exception/util/Assert.java rename to src/main/java/com/senmesh/common/exception/util/Assert.java index 828cddd..ae7dd6f 100644 --- a/src/main/java/com/newyetai/common/exception/util/Assert.java +++ b/src/main/java/com/senmesh/common/exception/util/Assert.java @@ -1,9 +1,9 @@ -package com.newyetai.common.exception.util; +package com.senmesh.common.exception.util; import com.google.common.base.Supplier; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.util.JsonUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/exception/util/DevopsUtils.java b/src/main/java/com/senmesh/common/exception/util/DevopsUtils.java similarity index 86% rename from src/main/java/com/newyetai/common/exception/util/DevopsUtils.java rename to src/main/java/com/senmesh/common/exception/util/DevopsUtils.java index 04cf682..e7374da 100644 --- a/src/main/java/com/newyetai/common/exception/util/DevopsUtils.java +++ b/src/main/java/com/senmesh/common/exception/util/DevopsUtils.java @@ -1,9 +1,9 @@ -package com.newyetai.common.exception.util; +package com.senmesh.common.exception.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.IDevopsProvider; +import com.senmesh.common.exception.IDevopsProvider; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/exception/util/ExceptionUtils.java b/src/main/java/com/senmesh/common/exception/util/ExceptionUtils.java similarity index 90% rename from src/main/java/com/newyetai/common/exception/util/ExceptionUtils.java rename to src/main/java/com/senmesh/common/exception/util/ExceptionUtils.java index b83de79..8349a5f 100644 --- a/src/main/java/com/newyetai/common/exception/util/ExceptionUtils.java +++ b/src/main/java/com/senmesh/common/exception/util/ExceptionUtils.java @@ -1,6 +1,6 @@ -package com.newyetai.common.exception.util; +package com.senmesh.common.exception.util; -import com.newyetai.common.exception.BusinessException; +import com.senmesh.common.exception.BusinessException; import lombok.extern.slf4j.Slf4j; /** diff --git a/src/main/java/com/newyetai/common/exception/util/UUIDUtils.java b/src/main/java/com/senmesh/common/exception/util/UUIDUtils.java similarity index 71% rename from src/main/java/com/newyetai/common/exception/util/UUIDUtils.java rename to src/main/java/com/senmesh/common/exception/util/UUIDUtils.java index 804f6d0..487dc3b 100644 --- a/src/main/java/com/newyetai/common/exception/util/UUIDUtils.java +++ b/src/main/java/com/senmesh/common/exception/util/UUIDUtils.java @@ -1,8 +1,6 @@ -package com.newyetai.common.exception.util; +package com.senmesh.common.exception.util; -import java.util.UUID; - -import com.newyetai.common.util.RandomUtils; +import com.senmesh.common.util.RandomUtils; /** * uuid工具类 diff --git a/src/main/java/com/newyetai/common/freemarker/constant/BusinessModelFileEnum.java b/src/main/java/com/senmesh/common/freemarker/constant/BusinessModelFileEnum.java similarity index 97% rename from src/main/java/com/newyetai/common/freemarker/constant/BusinessModelFileEnum.java rename to src/main/java/com/senmesh/common/freemarker/constant/BusinessModelFileEnum.java index 11d86f3..4e624f6 100644 --- a/src/main/java/com/newyetai/common/freemarker/constant/BusinessModelFileEnum.java +++ b/src/main/java/com/senmesh/common/freemarker/constant/BusinessModelFileEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.common.freemarker.constant; +package com.senmesh.common.freemarker.constant; /** * @author sr on 2020-04-13 diff --git a/src/main/java/com/newyetai/common/freemarker/constant/FreemarkerConstants.java b/src/main/java/com/senmesh/common/freemarker/constant/FreemarkerConstants.java similarity index 75% rename from src/main/java/com/newyetai/common/freemarker/constant/FreemarkerConstants.java rename to src/main/java/com/senmesh/common/freemarker/constant/FreemarkerConstants.java index 270998a..3d57701 100644 --- a/src/main/java/com/newyetai/common/freemarker/constant/FreemarkerConstants.java +++ b/src/main/java/com/senmesh/common/freemarker/constant/FreemarkerConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.common.freemarker.constant; +package com.senmesh.common.freemarker.constant; /** * @author sr on 2020-04-10 diff --git a/src/main/java/com/newyetai/common/freemarker/dto/BusinessModelCreateDTO.java b/src/main/java/com/senmesh/common/freemarker/dto/BusinessModelCreateDTO.java similarity index 95% rename from src/main/java/com/newyetai/common/freemarker/dto/BusinessModelCreateDTO.java rename to src/main/java/com/senmesh/common/freemarker/dto/BusinessModelCreateDTO.java index 1a65f21..745d5e2 100644 --- a/src/main/java/com/newyetai/common/freemarker/dto/BusinessModelCreateDTO.java +++ b/src/main/java/com/senmesh/common/freemarker/dto/BusinessModelCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.freemarker.dto; +package com.senmesh.common.freemarker.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/common/freemarker/util/CodeGenerateUtils.java b/src/main/java/com/senmesh/common/freemarker/util/CodeGenerateUtils.java similarity index 90% rename from src/main/java/com/newyetai/common/freemarker/util/CodeGenerateUtils.java rename to src/main/java/com/senmesh/common/freemarker/util/CodeGenerateUtils.java index 0f06279..68194a9 100644 --- a/src/main/java/com/newyetai/common/freemarker/util/CodeGenerateUtils.java +++ b/src/main/java/com/senmesh/common/freemarker/util/CodeGenerateUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.freemarker.util; +package com.senmesh.common.freemarker.util; import java.io.BufferedWriter; import java.io.File; @@ -10,11 +10,11 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.freemarker.constant.BusinessModelFileEnum; -import com.newyetai.common.freemarker.constant.FreemarkerConstants; -import com.newyetai.common.freemarker.dto.BusinessModelCreateDTO; -import com.newyetai.common.util.StrUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.freemarker.constant.BusinessModelFileEnum; +import com.senmesh.common.freemarker.constant.FreemarkerConstants; +import com.senmesh.common.freemarker.dto.BusinessModelCreateDTO; +import com.senmesh.common.util.StrUtils; import freemarker.template.Template; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/freemarker/util/FreeMarkerTemplateUtils.java b/src/main/java/com/senmesh/common/freemarker/util/FreeMarkerTemplateUtils.java similarity index 97% rename from src/main/java/com/newyetai/common/freemarker/util/FreeMarkerTemplateUtils.java rename to src/main/java/com/senmesh/common/freemarker/util/FreeMarkerTemplateUtils.java index e3e732b..2d98537 100644 --- a/src/main/java/com/newyetai/common/freemarker/util/FreeMarkerTemplateUtils.java +++ b/src/main/java/com/senmesh/common/freemarker/util/FreeMarkerTemplateUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.freemarker.util; +package com.senmesh.common.freemarker.util; import java.io.IOException; import java.io.StringWriter; diff --git a/src/main/java/com/newyetai/common/function/TransactionAfterCommit.java b/src/main/java/com/senmesh/common/function/TransactionAfterCommit.java similarity index 96% rename from src/main/java/com/newyetai/common/function/TransactionAfterCommit.java rename to src/main/java/com/senmesh/common/function/TransactionAfterCommit.java index 0e72dfb..deb6237 100644 --- a/src/main/java/com/newyetai/common/function/TransactionAfterCommit.java +++ b/src/main/java/com/senmesh/common/function/TransactionAfterCommit.java @@ -1,4 +1,4 @@ -package com.newyetai.common.function; +package com.senmesh.common.function; import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationManager; diff --git a/src/main/java/com/newyetai/common/functions/SFunction.java b/src/main/java/com/senmesh/common/functions/SFunction.java similarity index 94% rename from src/main/java/com/newyetai/common/functions/SFunction.java rename to src/main/java/com/senmesh/common/functions/SFunction.java index 4678050..0a48a34 100644 --- a/src/main/java/com/newyetai/common/functions/SFunction.java +++ b/src/main/java/com/senmesh/common/functions/SFunction.java @@ -1,4 +1,4 @@ -package com.newyetai.common.functions; +package com.senmesh.common.functions; import java.io.Serializable; import java.lang.invoke.SerializedLambda; diff --git a/src/main/java/com/newyetai/common/log/ILogProvider.java b/src/main/java/com/senmesh/common/log/ILogProvider.java similarity index 78% rename from src/main/java/com/newyetai/common/log/ILogProvider.java rename to src/main/java/com/senmesh/common/log/ILogProvider.java index 52023fb..d87c6e8 100644 --- a/src/main/java/com/newyetai/common/log/ILogProvider.java +++ b/src/main/java/com/senmesh/common/log/ILogProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.common.log; +package com.senmesh.common.log; /** * 日志提供者 diff --git a/src/main/java/com/newyetai/common/log/aspect/ControllerLogAspect.java b/src/main/java/com/senmesh/common/log/aspect/ControllerLogAspect.java similarity index 92% rename from src/main/java/com/newyetai/common/log/aspect/ControllerLogAspect.java rename to src/main/java/com/senmesh/common/log/aspect/ControllerLogAspect.java index 7748b1d..950608a 100644 --- a/src/main/java/com/newyetai/common/log/aspect/ControllerLogAspect.java +++ b/src/main/java/com/senmesh/common/log/aspect/ControllerLogAspect.java @@ -1,15 +1,15 @@ -package com.newyetai.common.log.aspect; +package com.senmesh.common.log.aspect; import com.google.common.collect.Lists; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.dto.IOperateDTO; -import com.newyetai.common.log.dto.OperationLogDTO; -import com.newyetai.common.log.util.LogUtils; -import com.newyetai.common.util.*; -import com.newyetai.security.config.SecurityProperties; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.dto.IOperateDTO; +import com.senmesh.common.log.dto.OperationLogDTO; +import com.senmesh.common.log.util.LogUtils; +import com.senmesh.common.util.*; +import com.senmesh.security.config.SecurityProperties; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.dto.IUserDetail; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/common/log/dto/ExceptionLogDTO.java b/src/main/java/com/senmesh/common/log/dto/ExceptionLogDTO.java similarity index 97% rename from src/main/java/com/newyetai/common/log/dto/ExceptionLogDTO.java rename to src/main/java/com/senmesh/common/log/dto/ExceptionLogDTO.java index 3946007..1909fbd 100644 --- a/src/main/java/com/newyetai/common/log/dto/ExceptionLogDTO.java +++ b/src/main/java/com/senmesh/common/log/dto/ExceptionLogDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.log.dto; +package com.senmesh.common.log.dto; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/newyetai/common/log/dto/OperationLogDTO.java b/src/main/java/com/senmesh/common/log/dto/OperationLogDTO.java similarity index 96% rename from src/main/java/com/newyetai/common/log/dto/OperationLogDTO.java rename to src/main/java/com/senmesh/common/log/dto/OperationLogDTO.java index 4dad37a..6e9d2e9 100644 --- a/src/main/java/com/newyetai/common/log/dto/OperationLogDTO.java +++ b/src/main/java/com/senmesh/common/log/dto/OperationLogDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.common.log.dto; +package com.senmesh.common.log.dto; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/newyetai/common/log/provider/Slf4jLogProvider.java b/src/main/java/com/senmesh/common/log/provider/Slf4jLogProvider.java similarity index 74% rename from src/main/java/com/newyetai/common/log/provider/Slf4jLogProvider.java rename to src/main/java/com/senmesh/common/log/provider/Slf4jLogProvider.java index f8a8de5..1900e51 100644 --- a/src/main/java/com/newyetai/common/log/provider/Slf4jLogProvider.java +++ b/src/main/java/com/senmesh/common/log/provider/Slf4jLogProvider.java @@ -1,7 +1,7 @@ -package com.newyetai.common.log.provider; +package com.senmesh.common.log.provider; -import com.newyetai.common.log.ILogProvider; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.log.ILogProvider; +import com.senmesh.common.util.JsonUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/log/util/LogUtils.java b/src/main/java/com/senmesh/common/log/util/LogUtils.java similarity index 73% rename from src/main/java/com/newyetai/common/log/util/LogUtils.java rename to src/main/java/com/senmesh/common/log/util/LogUtils.java index 8301b55..a1e31c6 100644 --- a/src/main/java/com/newyetai/common/log/util/LogUtils.java +++ b/src/main/java/com/senmesh/common/log/util/LogUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.common.log.util; +package com.senmesh.common.log.util; -import com.newyetai.common.log.ILogProvider; -import com.newyetai.common.log.provider.Slf4jLogProvider; +import com.senmesh.common.log.ILogProvider; +import com.senmesh.common.log.provider.Slf4jLogProvider; /** * @author sr on 2020-10-29 diff --git a/src/main/java/com/newyetai/common/sensitive/SensitiveInfoUtils.java b/src/main/java/com/senmesh/common/sensitive/SensitiveInfoUtils.java similarity index 99% rename from src/main/java/com/newyetai/common/sensitive/SensitiveInfoUtils.java rename to src/main/java/com/senmesh/common/sensitive/SensitiveInfoUtils.java index 17a565f..2d281d4 100644 --- a/src/main/java/com/newyetai/common/sensitive/SensitiveInfoUtils.java +++ b/src/main/java/com/senmesh/common/sensitive/SensitiveInfoUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.sensitive; +package com.senmesh.common.sensitive; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/common/sensitive/SensitiveType.java b/src/main/java/com/senmesh/common/sensitive/SensitiveType.java similarity index 93% rename from src/main/java/com/newyetai/common/sensitive/SensitiveType.java rename to src/main/java/com/senmesh/common/sensitive/SensitiveType.java index 27e254e..2915507 100644 --- a/src/main/java/com/newyetai/common/sensitive/SensitiveType.java +++ b/src/main/java/com/senmesh/common/sensitive/SensitiveType.java @@ -1,4 +1,4 @@ -package com.newyetai.common.sensitive; +package com.senmesh.common.sensitive; /** diff --git a/src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfo.java b/src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfo.java similarity index 89% rename from src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfo.java rename to src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfo.java index 7df1f56..a255017 100644 --- a/src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfo.java +++ b/src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfo.java @@ -1,8 +1,8 @@ -package com.newyetai.common.sensitive.jackson; +package com.senmesh.common.sensitive.jackson; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.newyetai.common.sensitive.SensitiveType; +import com.senmesh.common.sensitive.SensitiveType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfoObjectSerialize.java b/src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfoObjectSerialize.java similarity index 96% rename from src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfoObjectSerialize.java rename to src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfoObjectSerialize.java index 5dbc2af..53676f2 100644 --- a/src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfoObjectSerialize.java +++ b/src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfoObjectSerialize.java @@ -1,4 +1,4 @@ -package com.newyetai.common.sensitive.jackson; +package com.senmesh.common.sensitive.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.newyetai.common.sensitive.SensitiveType; +import com.senmesh.common.sensitive.SensitiveType; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfoSerialize.java b/src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfoSerialize.java similarity index 96% rename from src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfoSerialize.java rename to src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfoSerialize.java index a50b705..7ae1753 100644 --- a/src/main/java/com/newyetai/common/sensitive/jackson/SensitiveInfoSerialize.java +++ b/src/main/java/com/senmesh/common/sensitive/jackson/SensitiveInfoSerialize.java @@ -1,4 +1,4 @@ -package com.newyetai.common.sensitive.jackson; +package com.senmesh.common.sensitive.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.newyetai.common.sensitive.SensitiveInfoUtils; -import com.newyetai.common.sensitive.SensitiveType; +import com.senmesh.common.sensitive.SensitiveInfoUtils; +import com.senmesh.common.sensitive.SensitiveType; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/common/sensitive/service/AbstractSensitiveService.java b/src/main/java/com/senmesh/common/sensitive/service/AbstractSensitiveService.java similarity index 94% rename from src/main/java/com/newyetai/common/sensitive/service/AbstractSensitiveService.java rename to src/main/java/com/senmesh/common/sensitive/service/AbstractSensitiveService.java index cde5ce3..0a38589 100644 --- a/src/main/java/com/newyetai/common/sensitive/service/AbstractSensitiveService.java +++ b/src/main/java/com/senmesh/common/sensitive/service/AbstractSensitiveService.java @@ -1,6 +1,6 @@ -package com.newyetai.common.sensitive.service; +package com.senmesh.common.sensitive.service; -import com.newyetai.common.sensitive.SensitiveInfoUtils; +import com.senmesh.common.sensitive.SensitiveInfoUtils; /** * 默认脱敏工具抽象类 diff --git a/src/main/java/com/newyetai/common/sensitive/service/SensitiveService.java b/src/main/java/com/senmesh/common/sensitive/service/SensitiveService.java similarity index 97% rename from src/main/java/com/newyetai/common/sensitive/service/SensitiveService.java rename to src/main/java/com/senmesh/common/sensitive/service/SensitiveService.java index 08a7656..33396fa 100644 --- a/src/main/java/com/newyetai/common/sensitive/service/SensitiveService.java +++ b/src/main/java/com/senmesh/common/sensitive/service/SensitiveService.java @@ -1,4 +1,4 @@ -package com.newyetai.common.sensitive.service; +package com.senmesh.common.sensitive.service; /** * 脱敏服务 diff --git a/src/main/java/com/newyetai/common/sensitive/service/SensitiveServiceUtils.java b/src/main/java/com/senmesh/common/sensitive/service/SensitiveServiceUtils.java similarity index 94% rename from src/main/java/com/newyetai/common/sensitive/service/SensitiveServiceUtils.java rename to src/main/java/com/senmesh/common/sensitive/service/SensitiveServiceUtils.java index 05ec278..f9a847c 100644 --- a/src/main/java/com/newyetai/common/sensitive/service/SensitiveServiceUtils.java +++ b/src/main/java/com/senmesh/common/sensitive/service/SensitiveServiceUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.sensitive.service; +package com.senmesh.common.sensitive.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/newyetai/common/service/IMockProvider.java b/src/main/java/com/senmesh/common/service/IMockProvider.java similarity index 93% rename from src/main/java/com/newyetai/common/service/IMockProvider.java rename to src/main/java/com/senmesh/common/service/IMockProvider.java index b029280..5d61cff 100644 --- a/src/main/java/com/newyetai/common/service/IMockProvider.java +++ b/src/main/java/com/senmesh/common/service/IMockProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.common.service; +package com.senmesh.common.service; public interface IMockProvider{ diff --git a/src/main/java/com/newyetai/common/trace/DefaultTracer.java b/src/main/java/com/senmesh/common/trace/DefaultTracer.java similarity index 63% rename from src/main/java/com/newyetai/common/trace/DefaultTracer.java rename to src/main/java/com/senmesh/common/trace/DefaultTracer.java index f1fe43e..c286f98 100644 --- a/src/main/java/com/newyetai/common/trace/DefaultTracer.java +++ b/src/main/java/com/senmesh/common/trace/DefaultTracer.java @@ -1,6 +1,6 @@ -package com.newyetai.common.trace; +package com.senmesh.common.trace; -import com.newyetai.common.util.RandomUtils; +import com.senmesh.common.util.RandomUtils; public class DefaultTracer implements ITracer{ diff --git a/src/main/java/com/newyetai/common/trace/ITracer.java b/src/main/java/com/senmesh/common/trace/ITracer.java similarity index 82% rename from src/main/java/com/newyetai/common/trace/ITracer.java rename to src/main/java/com/senmesh/common/trace/ITracer.java index a6e6944..48856b0 100644 --- a/src/main/java/com/newyetai/common/trace/ITracer.java +++ b/src/main/java/com/senmesh/common/trace/ITracer.java @@ -1,4 +1,4 @@ -package com.newyetai.common.trace; +package com.senmesh.common.trace; public interface ITracer { diff --git a/src/main/java/com/newyetai/common/util/AESUtils.java b/src/main/java/com/senmesh/common/util/AESUtils.java similarity index 97% rename from src/main/java/com/newyetai/common/util/AESUtils.java rename to src/main/java/com/senmesh/common/util/AESUtils.java index 586a757..f450716 100644 --- a/src/main/java/com/newyetai/common/util/AESUtils.java +++ b/src/main/java/com/senmesh/common/util/AESUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.nio.charset.StandardCharsets; import java.security.Security; diff --git a/src/main/java/com/newyetai/common/util/BaseDtoUtils.java b/src/main/java/com/senmesh/common/util/BaseDtoUtils.java similarity index 85% rename from src/main/java/com/newyetai/common/util/BaseDtoUtils.java rename to src/main/java/com/senmesh/common/util/BaseDtoUtils.java index a736b07..29f16f4 100644 --- a/src/main/java/com/newyetai/common/util/BaseDtoUtils.java +++ b/src/main/java/com/senmesh/common/util/BaseDtoUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.entity.BaseEntity; /** * 基础dto工具类 diff --git a/src/main/java/com/newyetai/common/util/BigDecimalUtils.java b/src/main/java/com/senmesh/common/util/BigDecimalUtils.java similarity index 94% rename from src/main/java/com/newyetai/common/util/BigDecimalUtils.java rename to src/main/java/com/senmesh/common/util/BigDecimalUtils.java index d3c5ed0..bfd30f0 100644 --- a/src/main/java/com/newyetai/common/util/BigDecimalUtils.java +++ b/src/main/java/com/senmesh/common/util/BigDecimalUtils.java @@ -1,6 +1,6 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; -import com.newyetai.common.exception.util.Assert; +import com.senmesh.common.exception.util.Assert; import java.math.BigDecimal; import java.math.RoundingMode; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/util/CookieUtils.java b/src/main/java/com/senmesh/common/util/CookieUtils.java similarity index 95% rename from src/main/java/com/newyetai/common/util/CookieUtils.java rename to src/main/java/com/senmesh/common/util/CookieUtils.java index 7c34081..ba10734 100644 --- a/src/main/java/com/newyetai/common/util/CookieUtils.java +++ b/src/main/java/com/senmesh/common/util/CookieUtils.java @@ -1,11 +1,11 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import com.google.common.base.Strings; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.constant.CookieConstants; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.constant.CookieConstants; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/newyetai/common/util/DateUtils.java b/src/main/java/com/senmesh/common/util/DateUtils.java similarity index 99% rename from src/main/java/com/newyetai/common/util/DateUtils.java rename to src/main/java/com/senmesh/common/util/DateUtils.java index 6fba5a9..dabc8d6 100644 --- a/src/main/java/com/newyetai/common/util/DateUtils.java +++ b/src/main/java/com/senmesh/common/util/DateUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import lombok.extern.slf4j.Slf4j; import net.bytebuddy.dynamic.scaffold.MethodGraph.Linked; diff --git a/src/main/java/com/newyetai/common/util/DisplayedComponentUtils.java b/src/main/java/com/senmesh/common/util/DisplayedComponentUtils.java similarity index 88% rename from src/main/java/com/newyetai/common/util/DisplayedComponentUtils.java rename to src/main/java/com/senmesh/common/util/DisplayedComponentUtils.java index 26bb44f..9c472d3 100644 --- a/src/main/java/com/newyetai/common/util/DisplayedComponentUtils.java +++ b/src/main/java/com/senmesh/common/util/DisplayedComponentUtils.java @@ -1,12 +1,12 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import com.newyetai.common.dto.ColumnDTO; -import com.newyetai.common.dto.DisplayedComponentDTO; -import com.newyetai.common.dto.MessageDTO; +import com.senmesh.common.dto.ColumnDTO; +import com.senmesh.common.dto.DisplayedComponentDTO; +import com.senmesh.common.dto.MessageDTO; /** * @author sr on 2020-04-22 diff --git a/src/main/java/com/newyetai/common/util/EnumUtil.java b/src/main/java/com/senmesh/common/util/EnumUtil.java similarity index 91% rename from src/main/java/com/newyetai/common/util/EnumUtil.java rename to src/main/java/com/senmesh/common/util/EnumUtil.java index bbe44e4..a6c88aa 100644 --- a/src/main/java/com/newyetai/common/util/EnumUtil.java +++ b/src/main/java/com/senmesh/common/util/EnumUtil.java @@ -1,6 +1,6 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; -import com.newyetai.common.functions.SFunction; +import com.senmesh.common.functions.SFunction; import java.lang.invoke.SerializedLambda; import java.util.Arrays; diff --git a/src/main/java/com/newyetai/common/util/EnvironmentUtils.java b/src/main/java/com/senmesh/common/util/EnvironmentUtils.java similarity index 91% rename from src/main/java/com/newyetai/common/util/EnvironmentUtils.java rename to src/main/java/com/senmesh/common/util/EnvironmentUtils.java index aefcf19..d55b734 100644 --- a/src/main/java/com/newyetai/common/util/EnvironmentUtils.java +++ b/src/main/java/com/senmesh/common/util/EnvironmentUtils.java @@ -1,9 +1,9 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import org.springframework.core.env.Environment; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; /** * 环境变量工具类 diff --git a/src/main/java/com/newyetai/common/util/IdcardUtils.java b/src/main/java/com/senmesh/common/util/IdcardUtils.java similarity index 97% rename from src/main/java/com/newyetai/common/util/IdcardUtils.java rename to src/main/java/com/senmesh/common/util/IdcardUtils.java index d1431c4..dc43ff1 100644 --- a/src/main/java/com/newyetai/common/util/IdcardUtils.java +++ b/src/main/java/com/senmesh/common/util/IdcardUtils.java @@ -1,6 +1,4 @@ -package com.newyetai.common.util; - -import com.newyetai.common.exception.BusinessException; +package com.senmesh.common.util; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/common/util/JasyptUtils.java b/src/main/java/com/senmesh/common/util/JasyptUtils.java similarity index 92% rename from src/main/java/com/newyetai/common/util/JasyptUtils.java rename to src/main/java/com/senmesh/common/util/JasyptUtils.java index 6ddfe92..3491bbb 100644 --- a/src/main/java/com/newyetai/common/util/JasyptUtils.java +++ b/src/main/java/com/senmesh/common/util/JasyptUtils.java @@ -1,8 +1,8 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import org.jasypt.encryption.StringEncryptor; -import com.newyetai.common.exception.util.Assert; +import com.senmesh.common.exception.util.Assert; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/util/JsonUtils.java b/src/main/java/com/senmesh/common/util/JsonUtils.java similarity index 97% rename from src/main/java/com/newyetai/common/util/JsonUtils.java rename to src/main/java/com/senmesh/common/util/JsonUtils.java index 9ae49ee..cb92a1a 100644 --- a/src/main/java/com/newyetai/common/util/JsonUtils.java +++ b/src/main/java/com/senmesh/common/util/JsonUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.text.SimpleDateFormat; import java.util.LinkedHashMap; @@ -10,8 +10,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; -import com.newyetai.common.annotation.MaskAnontationIntrospector; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.annotation.MaskAnontationIntrospector; /** * json 工具类 diff --git a/src/main/java/com/newyetai/common/util/ListUtil.java b/src/main/java/com/senmesh/common/util/ListUtil.java similarity index 97% rename from src/main/java/com/newyetai/common/util/ListUtil.java rename to src/main/java/com/senmesh/common/util/ListUtil.java index de54304..6072b5d 100644 --- a/src/main/java/com/newyetai/common/util/ListUtil.java +++ b/src/main/java/com/senmesh/common/util/ListUtil.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/src/main/java/com/newyetai/common/util/MockUtils.java b/src/main/java/com/senmesh/common/util/MockUtils.java similarity index 83% rename from src/main/java/com/newyetai/common/util/MockUtils.java rename to src/main/java/com/senmesh/common/util/MockUtils.java index ee64b62..de703f2 100644 --- a/src/main/java/com/newyetai/common/util/MockUtils.java +++ b/src/main/java/com/senmesh/common/util/MockUtils.java @@ -1,6 +1,6 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; -import com.newyetai.common.service.IMockProvider; +import com.senmesh.common.service.IMockProvider; public class MockUtils { diff --git a/src/main/java/com/newyetai/common/util/ParameterizedTypeImpl.java b/src/main/java/com/senmesh/common/util/ParameterizedTypeImpl.java similarity index 97% rename from src/main/java/com/newyetai/common/util/ParameterizedTypeImpl.java rename to src/main/java/com/senmesh/common/util/ParameterizedTypeImpl.java index 9f079a6..cc026e5 100644 --- a/src/main/java/com/newyetai/common/util/ParameterizedTypeImpl.java +++ b/src/main/java/com/senmesh/common/util/ParameterizedTypeImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/main/java/com/newyetai/common/util/ProductConfig.java b/src/main/java/com/senmesh/common/util/ProductConfig.java similarity index 95% rename from src/main/java/com/newyetai/common/util/ProductConfig.java rename to src/main/java/com/senmesh/common/util/ProductConfig.java index 932ed29..4ef663e 100644 --- a/src/main/java/com/newyetai/common/util/ProductConfig.java +++ b/src/main/java/com/senmesh/common/util/ProductConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/common/util/RandomUtils.java b/src/main/java/com/senmesh/common/util/RandomUtils.java similarity index 96% rename from src/main/java/com/newyetai/common/util/RandomUtils.java rename to src/main/java/com/senmesh/common/util/RandomUtils.java index 3071ff8..60a0714 100644 --- a/src/main/java/com/newyetai/common/util/RandomUtils.java +++ b/src/main/java/com/senmesh/common/util/RandomUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.util.UUID; diff --git a/src/main/java/com/newyetai/common/util/ReflectionUtils.java b/src/main/java/com/senmesh/common/util/ReflectionUtils.java similarity index 97% rename from src/main/java/com/newyetai/common/util/ReflectionUtils.java rename to src/main/java/com/senmesh/common/util/ReflectionUtils.java index 74d46e0..22c91c3 100644 --- a/src/main/java/com/newyetai/common/util/ReflectionUtils.java +++ b/src/main/java/com/senmesh/common/util/ReflectionUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/util/RequestUtils.java b/src/main/java/com/senmesh/common/util/RequestUtils.java similarity index 99% rename from src/main/java/com/newyetai/common/util/RequestUtils.java rename to src/main/java/com/senmesh/common/util/RequestUtils.java index 897b767..7126708 100644 --- a/src/main/java/com/newyetai/common/util/RequestUtils.java +++ b/src/main/java/com/senmesh/common/util/RequestUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/src/main/java/com/newyetai/common/util/ResponseUtils.java b/src/main/java/com/senmesh/common/util/ResponseUtils.java similarity index 94% rename from src/main/java/com/newyetai/common/util/ResponseUtils.java rename to src/main/java/com/senmesh/common/util/ResponseUtils.java index 59ac99a..1aed807 100644 --- a/src/main/java/com/newyetai/common/util/ResponseUtils.java +++ b/src/main/java/com/senmesh/common/util/ResponseUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/main/java/com/newyetai/common/util/SensitiveWordUtils.java b/src/main/java/com/senmesh/common/util/SensitiveWordUtils.java similarity index 92% rename from src/main/java/com/newyetai/common/util/SensitiveWordUtils.java rename to src/main/java/com/senmesh/common/util/SensitiveWordUtils.java index 4387247..820193d 100644 --- a/src/main/java/com/newyetai/common/util/SensitiveWordUtils.java +++ b/src/main/java/com/senmesh/common/util/SensitiveWordUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.io.BufferedReader; import java.io.File; @@ -8,10 +8,9 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; import org.springframework.core.io.ClassPathResource; -import com.newyetai.common.constant.CommonConstants; +import com.senmesh.common.constant.CommonConstants; import toolgood.words.IllegalWordsSearch; import toolgood.words.IllegalWordsSearchResult; diff --git a/src/main/java/com/newyetai/common/util/SpringContextHolder.java b/src/main/java/com/senmesh/common/util/SpringContextHolder.java similarity index 98% rename from src/main/java/com/newyetai/common/util/SpringContextHolder.java rename to src/main/java/com/senmesh/common/util/SpringContextHolder.java index bd5af8d..4ee8181 100644 --- a/src/main/java/com/newyetai/common/util/SpringContextHolder.java +++ b/src/main/java/com/senmesh/common/util/SpringContextHolder.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.io.Serializable; import java.util.Optional; diff --git a/src/main/java/com/newyetai/common/util/StrUtils.java b/src/main/java/com/senmesh/common/util/StrUtils.java similarity index 96% rename from src/main/java/com/newyetai/common/util/StrUtils.java rename to src/main/java/com/senmesh/common/util/StrUtils.java index 673b1cf..612f6ca 100644 --- a/src/main/java/com/newyetai/common/util/StrUtils.java +++ b/src/main/java/com/senmesh/common/util/StrUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.util.Map; import java.util.Map.Entry; @@ -7,8 +7,8 @@ import org.apache.commons.lang3.StringUtils; import java.util.TreeMap; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; /** * @author sr on 2021-02-03 diff --git a/src/main/java/com/newyetai/common/util/TracerUtils.java b/src/main/java/com/senmesh/common/util/TracerUtils.java similarity index 88% rename from src/main/java/com/newyetai/common/util/TracerUtils.java rename to src/main/java/com/senmesh/common/util/TracerUtils.java index 8e52e71..1369ae8 100644 --- a/src/main/java/com/newyetai/common/util/TracerUtils.java +++ b/src/main/java/com/senmesh/common/util/TracerUtils.java @@ -1,9 +1,9 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.newyetai.common.trace.ITracer; +import com.senmesh.common.trace.ITracer; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/util/TreeHelper.java b/src/main/java/com/senmesh/common/util/TreeHelper.java similarity index 98% rename from src/main/java/com/newyetai/common/util/TreeHelper.java rename to src/main/java/com/senmesh/common/util/TreeHelper.java index 158eb2b..5788962 100644 --- a/src/main/java/com/newyetai/common/util/TreeHelper.java +++ b/src/main/java/com/senmesh/common/util/TreeHelper.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import com.google.common.base.Objects; import com.google.common.collect.Lists; diff --git a/src/main/java/com/newyetai/common/util/TreeNode.java b/src/main/java/com/senmesh/common/util/TreeNode.java similarity index 93% rename from src/main/java/com/newyetai/common/util/TreeNode.java rename to src/main/java/com/senmesh/common/util/TreeNode.java index af0ce91..97fe256 100644 --- a/src/main/java/com/newyetai/common/util/TreeNode.java +++ b/src/main/java/com/senmesh/common/util/TreeNode.java @@ -1,4 +1,4 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/common/util/UserContextHolder.java b/src/main/java/com/senmesh/common/util/UserContextHolder.java similarity index 93% rename from src/main/java/com/newyetai/common/util/UserContextHolder.java rename to src/main/java/com/senmesh/common/util/UserContextHolder.java index 83a6653..fb3d865 100644 --- a/src/main/java/com/newyetai/common/util/UserContextHolder.java +++ b/src/main/java/com/senmesh/common/util/UserContextHolder.java @@ -1,10 +1,10 @@ -package com.newyetai.common.util; +package com.senmesh.common.util; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.NoneLoginException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.user.constant.UserTypeEnum; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.NoneLoginException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.user.constant.UserTypeEnum; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/common/validate/EnumValidator.java b/src/main/java/com/senmesh/common/validate/EnumValidator.java similarity index 89% rename from src/main/java/com/newyetai/common/validate/EnumValidator.java rename to src/main/java/com/senmesh/common/validate/EnumValidator.java index f483028..040edae 100644 --- a/src/main/java/com/newyetai/common/validate/EnumValidator.java +++ b/src/main/java/com/senmesh/common/validate/EnumValidator.java @@ -1,6 +1,6 @@ -package com.newyetai.common.validate; +package com.senmesh.common.validate; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/src/main/java/com/newyetai/common/validate/EnumValidatorAdapter.java b/src/main/java/com/senmesh/common/validate/EnumValidatorAdapter.java similarity index 90% rename from src/main/java/com/newyetai/common/validate/EnumValidatorAdapter.java rename to src/main/java/com/senmesh/common/validate/EnumValidatorAdapter.java index 99ef1e7..0ee9210 100644 --- a/src/main/java/com/newyetai/common/validate/EnumValidatorAdapter.java +++ b/src/main/java/com/senmesh/common/validate/EnumValidatorAdapter.java @@ -1,7 +1,7 @@ -package com.newyetai.common.validate; +package com.senmesh.common.validate; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/com/newyetai/common/validation/Check.java b/src/main/java/com/senmesh/common/validation/Check.java similarity index 65% rename from src/main/java/com/newyetai/common/validation/Check.java rename to src/main/java/com/senmesh/common/validation/Check.java index cc0cc4f..aeef3fc 100644 --- a/src/main/java/com/newyetai/common/validation/Check.java +++ b/src/main/java/com/senmesh/common/validation/Check.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation; +package com.senmesh.common.validation; /** * 校验 diff --git a/src/main/java/com/newyetai/common/validation/Create.java b/src/main/java/com/senmesh/common/validation/Create.java similarity index 67% rename from src/main/java/com/newyetai/common/validation/Create.java rename to src/main/java/com/senmesh/common/validation/Create.java index a323a9b..e45b79c 100644 --- a/src/main/java/com/newyetai/common/validation/Create.java +++ b/src/main/java/com/senmesh/common/validation/Create.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation; +package com.senmesh.common.validation; /** * 新增校验 diff --git a/src/main/java/com/newyetai/common/validation/Delete.java b/src/main/java/com/senmesh/common/validation/Delete.java similarity index 67% rename from src/main/java/com/newyetai/common/validation/Delete.java rename to src/main/java/com/senmesh/common/validation/Delete.java index 3e031f3..96331ea 100644 --- a/src/main/java/com/newyetai/common/validation/Delete.java +++ b/src/main/java/com/senmesh/common/validation/Delete.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation; +package com.senmesh.common.validation; /** * 删除校验 diff --git a/src/main/java/com/newyetai/common/validation/Send.java b/src/main/java/com/senmesh/common/validation/Send.java similarity index 60% rename from src/main/java/com/newyetai/common/validation/Send.java rename to src/main/java/com/senmesh/common/validation/Send.java index 8e211f7..3f90f5c 100644 --- a/src/main/java/com/newyetai/common/validation/Send.java +++ b/src/main/java/com/senmesh/common/validation/Send.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation; +package com.senmesh.common.validation; /** * @author on 2019-11-05 diff --git a/src/main/java/com/newyetai/common/validation/Update.java b/src/main/java/com/senmesh/common/validation/Update.java similarity index 67% rename from src/main/java/com/newyetai/common/validation/Update.java rename to src/main/java/com/senmesh/common/validation/Update.java index 7f8ad02..d3523d0 100644 --- a/src/main/java/com/newyetai/common/validation/Update.java +++ b/src/main/java/com/senmesh/common/validation/Update.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation; +package com.senmesh.common.validation; /** * 更新校验 diff --git a/src/main/java/com/newyetai/common/validation/annotation/BigDecimalRange.java b/src/main/java/com/senmesh/common/validation/annotation/BigDecimalRange.java similarity index 95% rename from src/main/java/com/newyetai/common/validation/annotation/BigDecimalRange.java rename to src/main/java/com/senmesh/common/validation/annotation/BigDecimalRange.java index 8dddf0d..0e37d32 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/BigDecimalRange.java +++ b/src/main/java/com/senmesh/common/validation/annotation/BigDecimalRange.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/src/main/java/com/newyetai/common/validation/annotation/BigDecimalRangeValidator.java b/src/main/java/com/senmesh/common/validation/annotation/BigDecimalRangeValidator.java similarity index 98% rename from src/main/java/com/newyetai/common/validation/annotation/BigDecimalRangeValidator.java rename to src/main/java/com/senmesh/common/validation/annotation/BigDecimalRangeValidator.java index 3fa6769..3c97822 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/BigDecimalRangeValidator.java +++ b/src/main/java/com/senmesh/common/validation/annotation/BigDecimalRangeValidator.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/common/validation/annotation/Expression.java b/src/main/java/com/senmesh/common/validation/annotation/Expression.java similarity index 91% rename from src/main/java/com/newyetai/common/validation/annotation/Expression.java rename to src/main/java/com/senmesh/common/validation/annotation/Expression.java index 21fd21a..802120f 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/Expression.java +++ b/src/main/java/com/senmesh/common/validation/annotation/Expression.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.CONSTRUCTOR; @@ -15,7 +15,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.validation.constants.ValidProviderEnum; /** * 表达式校验器注解 diff --git a/src/main/java/com/newyetai/common/validation/annotation/ExpressionValidator.java b/src/main/java/com/senmesh/common/validation/annotation/ExpressionValidator.java similarity index 91% rename from src/main/java/com/newyetai/common/validation/annotation/ExpressionValidator.java rename to src/main/java/com/senmesh/common/validation/annotation/ExpressionValidator.java index 3e14776..7d46cc1 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/ExpressionValidator.java +++ b/src/main/java/com/senmesh/common/validation/annotation/ExpressionValidator.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -8,7 +8,7 @@ import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.validation.constants.ValidProviderEnum; public class ExpressionValidator implements ConstraintValidator{ diff --git a/src/main/java/com/newyetai/common/validation/annotation/IdCard.java b/src/main/java/com/senmesh/common/validation/annotation/IdCard.java similarity index 96% rename from src/main/java/com/newyetai/common/validation/annotation/IdCard.java rename to src/main/java/com/senmesh/common/validation/annotation/IdCard.java index 0d405fc..239923e 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/IdCard.java +++ b/src/main/java/com/senmesh/common/validation/annotation/IdCard.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/com/newyetai/common/validation/annotation/IdCardValidator.java b/src/main/java/com/senmesh/common/validation/annotation/IdCardValidator.java similarity index 83% rename from src/main/java/com/newyetai/common/validation/annotation/IdCardValidator.java rename to src/main/java/com/senmesh/common/validation/annotation/IdCardValidator.java index 36d7c67..63e37c5 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/IdCardValidator.java +++ b/src/main/java/com/senmesh/common/validation/annotation/IdCardValidator.java @@ -1,11 +1,11 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.validation.util.ValidateUtils; +import com.senmesh.common.validation.util.ValidateUtils; /** * 身份证号校验器 diff --git a/src/main/java/com/newyetai/common/validation/annotation/Phone.java b/src/main/java/com/senmesh/common/validation/annotation/Phone.java similarity index 97% rename from src/main/java/com/newyetai/common/validation/annotation/Phone.java rename to src/main/java/com/senmesh/common/validation/annotation/Phone.java index 78af3f5..20900c1 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/Phone.java +++ b/src/main/java/com/senmesh/common/validation/annotation/Phone.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/com/newyetai/common/validation/annotation/PhoneValidator.java b/src/main/java/com/senmesh/common/validation/annotation/PhoneValidator.java similarity index 84% rename from src/main/java/com/newyetai/common/validation/annotation/PhoneValidator.java rename to src/main/java/com/senmesh/common/validation/annotation/PhoneValidator.java index 7976b08..af87cd6 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/PhoneValidator.java +++ b/src/main/java/com/senmesh/common/validation/annotation/PhoneValidator.java @@ -1,11 +1,11 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.validation.util.ValidateUtils; +import com.senmesh.common.validation.util.ValidateUtils; /** * 电话号码校验器 diff --git a/src/main/java/com/newyetai/common/validation/annotation/TableColumn.java b/src/main/java/com/senmesh/common/validation/annotation/TableColumn.java similarity index 89% rename from src/main/java/com/newyetai/common/validation/annotation/TableColumn.java rename to src/main/java/com/senmesh/common/validation/annotation/TableColumn.java index e36b727..1d07939 100644 --- a/src/main/java/com/newyetai/common/validation/annotation/TableColumn.java +++ b/src/main/java/com/senmesh/common/validation/annotation/TableColumn.java @@ -1,4 +1,4 @@ -package com.newyetai.common.validation.annotation; +package com.senmesh.common.validation.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/com/newyetai/common/validation/constants/ValidProviderEnum.java b/src/main/java/com/senmesh/common/validation/constants/ValidProviderEnum.java similarity index 92% rename from src/main/java/com/newyetai/common/validation/constants/ValidProviderEnum.java rename to src/main/java/com/senmesh/common/validation/constants/ValidProviderEnum.java index 332e656..e8b7a24 100644 --- a/src/main/java/com/newyetai/common/validation/constants/ValidProviderEnum.java +++ b/src/main/java/com/senmesh/common/validation/constants/ValidProviderEnum.java @@ -1,10 +1,10 @@ -package com.newyetai.common.validation.constants; +package com.senmesh.common.validation.constants; import java.util.Map; import java.util.function.Function; import com.google.common.collect.Maps; -import com.newyetai.common.validation.util.ValidateUtils; +import com.senmesh.common.validation.util.ValidateUtils; public enum ValidProviderEnum { diff --git a/src/main/java/com/newyetai/common/validation/util/ValidateUtils.java b/src/main/java/com/senmesh/common/validation/util/ValidateUtils.java similarity index 98% rename from src/main/java/com/newyetai/common/validation/util/ValidateUtils.java rename to src/main/java/com/senmesh/common/validation/util/ValidateUtils.java index b73ebb2..3a7faa4 100644 --- a/src/main/java/com/newyetai/common/validation/util/ValidateUtils.java +++ b/src/main/java/com/senmesh/common/validation/util/ValidateUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.common.validation.util; +package com.senmesh.common.validation.util; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; import org.apache.commons.lang3.StringUtils; import javax.validation.ConstraintViolation; diff --git a/src/main/java/com/newyetai/commonexport/dto/CommonExportDynamicDTO.java b/src/main/java/com/senmesh/commonexport/dto/CommonExportDynamicDTO.java similarity index 93% rename from src/main/java/com/newyetai/commonexport/dto/CommonExportDynamicDTO.java rename to src/main/java/com/senmesh/commonexport/dto/CommonExportDynamicDTO.java index 7c85eb5..c5b4607 100644 --- a/src/main/java/com/newyetai/commonexport/dto/CommonExportDynamicDTO.java +++ b/src/main/java/com/senmesh/commonexport/dto/CommonExportDynamicDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.commonexport.dto; +package com.senmesh.commonexport.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/commonexport/dto/CommonExportMapDTO.java b/src/main/java/com/senmesh/commonexport/dto/CommonExportMapDTO.java similarity index 97% rename from src/main/java/com/newyetai/commonexport/dto/CommonExportMapDTO.java rename to src/main/java/com/senmesh/commonexport/dto/CommonExportMapDTO.java index 11ada32..38d4665 100644 --- a/src/main/java/com/newyetai/commonexport/dto/CommonExportMapDTO.java +++ b/src/main/java/com/senmesh/commonexport/dto/CommonExportMapDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.commonexport.dto; +package com.senmesh.commonexport.dto; import com.alibaba.excel.write.style.column.AbstractHeadColumnWidthStyleStrategy; import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; diff --git a/src/main/java/com/newyetai/commonexport/dto/CommonExportPropertiesDTO.java b/src/main/java/com/senmesh/commonexport/dto/CommonExportPropertiesDTO.java similarity index 97% rename from src/main/java/com/newyetai/commonexport/dto/CommonExportPropertiesDTO.java rename to src/main/java/com/senmesh/commonexport/dto/CommonExportPropertiesDTO.java index 43f2f08..b13c9c2 100644 --- a/src/main/java/com/newyetai/commonexport/dto/CommonExportPropertiesDTO.java +++ b/src/main/java/com/senmesh/commonexport/dto/CommonExportPropertiesDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.commonexport.dto; +package com.senmesh.commonexport.dto; import com.alibaba.excel.write.style.column.AbstractHeadColumnWidthStyleStrategy; import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; diff --git a/src/main/java/com/senmesh/commonexport/service/ExportService.java b/src/main/java/com/senmesh/commonexport/service/ExportService.java new file mode 100644 index 0000000..f21bd2d --- /dev/null +++ b/src/main/java/com/senmesh/commonexport/service/ExportService.java @@ -0,0 +1,20 @@ +package com.senmesh.commonexport.service; + +import com.senmesh.commonexport.dto.CommonExportMapDTO; +import com.senmesh.commonexport.dto.CommonExportPropertiesDTO; +import com.senmesh.component.file.entity.FileRecord; + +public interface ExportService { + + /** + * 公共导出方法 + * + * @param commonExportPropertiesDTO 导出实体 + * @return FileRecord + */ + FileRecord export(CommonExportPropertiesDTO commonExportPropertiesDTO); + + + FileRecord export(CommonExportMapDTO commonExportMapDTO); + +} diff --git a/src/main/java/com/newyetai/commonexport/service/impl/ExportByDtoServiceImpl.java b/src/main/java/com/senmesh/commonexport/service/impl/ExportByDtoServiceImpl.java similarity index 84% rename from src/main/java/com/newyetai/commonexport/service/impl/ExportByDtoServiceImpl.java rename to src/main/java/com/senmesh/commonexport/service/impl/ExportByDtoServiceImpl.java index b0ef4fc..7d49e62 100644 --- a/src/main/java/com/newyetai/commonexport/service/impl/ExportByDtoServiceImpl.java +++ b/src/main/java/com/senmesh/commonexport/service/impl/ExportByDtoServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.commonexport.service.impl; +package com.senmesh.commonexport.service.impl; import java.io.ByteArrayOutputStream; import java.util.HashMap; @@ -12,13 +12,13 @@ import org.springframework.stereotype.Service; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.commonexport.dto.CommonExportMapDTO; -import com.newyetai.commonexport.dto.CommonExportPropertiesDTO; -import com.newyetai.commonexport.service.ExportService; -import com.newyetai.component.file.config.FileProperties; -import com.newyetai.component.file.entity.FileRecord; -import com.newyetai.component.file.service.FileService; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.commonexport.dto.CommonExportMapDTO; +import com.senmesh.commonexport.dto.CommonExportPropertiesDTO; +import com.senmesh.commonexport.service.ExportService; +import com.senmesh.component.file.config.FileProperties; +import com.senmesh.component.file.entity.FileRecord; +import com.senmesh.component.file.service.FileService; import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/component/action/annotation/ActionField.java b/src/main/java/com/senmesh/component/action/annotation/ActionField.java similarity index 88% rename from src/main/java/com/newyetai/component/action/annotation/ActionField.java rename to src/main/java/com/senmesh/component/action/annotation/ActionField.java index 71a25de..aabb1c6 100644 --- a/src/main/java/com/newyetai/component/action/annotation/ActionField.java +++ b/src/main/java/com/senmesh/component/action/annotation/ActionField.java @@ -1,4 +1,4 @@ -package com.newyetai.component.action.annotation; +package com.senmesh.component.action.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/newyetai/component/action/annotation/ActionModel.java b/src/main/java/com/senmesh/component/action/annotation/ActionModel.java similarity index 87% rename from src/main/java/com/newyetai/component/action/annotation/ActionModel.java rename to src/main/java/com/senmesh/component/action/annotation/ActionModel.java index 6d816f4..5906468 100644 --- a/src/main/java/com/newyetai/component/action/annotation/ActionModel.java +++ b/src/main/java/com/senmesh/component/action/annotation/ActionModel.java @@ -1,4 +1,4 @@ -package com.newyetai.component.action.annotation; +package com.senmesh.component.action.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/newyetai/component/action/constant/ActionConstants.java b/src/main/java/com/senmesh/component/action/constant/ActionConstants.java similarity index 61% rename from src/main/java/com/newyetai/component/action/constant/ActionConstants.java rename to src/main/java/com/senmesh/component/action/constant/ActionConstants.java index 605d43b..6d084f0 100644 --- a/src/main/java/com/newyetai/component/action/constant/ActionConstants.java +++ b/src/main/java/com/senmesh/component/action/constant/ActionConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.component.action.constant; +package com.senmesh.component.action.constant; /** * @author sr on 2022-02-18 diff --git a/src/main/java/com/newyetai/component/action/constant/ActionTypeEnum.java b/src/main/java/com/senmesh/component/action/constant/ActionTypeEnum.java similarity index 83% rename from src/main/java/com/newyetai/component/action/constant/ActionTypeEnum.java rename to src/main/java/com/senmesh/component/action/constant/ActionTypeEnum.java index b72b610..dfaeca5 100644 --- a/src/main/java/com/newyetai/component/action/constant/ActionTypeEnum.java +++ b/src/main/java/com/senmesh/component/action/constant/ActionTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.action.constant; +package com.senmesh.component.action.constant; /** * 操作类型枚举 diff --git a/src/main/java/com/newyetai/component/action/controller/ActionController.java b/src/main/java/com/senmesh/component/action/controller/ActionController.java similarity index 76% rename from src/main/java/com/newyetai/component/action/controller/ActionController.java rename to src/main/java/com/senmesh/component/action/controller/ActionController.java index 23e2031..fe28f74 100644 --- a/src/main/java/com/newyetai/component/action/controller/ActionController.java +++ b/src/main/java/com/senmesh/component/action/controller/ActionController.java @@ -1,15 +1,15 @@ -package com.newyetai.component.action.controller; +package com.senmesh.component.action.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.component.action.dto.ActionDTO; -import com.newyetai.component.action.dto.ActionQueryDTO; -import com.newyetai.component.action.service.ActionService; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.AlitaResult; +import com.senmesh.component.action.dto.ActionDTO; +import com.senmesh.component.action.dto.ActionQueryDTO; +import com.senmesh.component.action.service.ActionService; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/component/action/controller/ActionDetailController.java b/src/main/java/com/senmesh/component/action/controller/ActionDetailController.java similarity index 77% rename from src/main/java/com/newyetai/component/action/controller/ActionDetailController.java rename to src/main/java/com/senmesh/component/action/controller/ActionDetailController.java index fd1875e..735a2c0 100644 --- a/src/main/java/com/newyetai/component/action/controller/ActionDetailController.java +++ b/src/main/java/com/senmesh/component/action/controller/ActionDetailController.java @@ -1,10 +1,10 @@ -package com.newyetai.component.action.controller; +package com.senmesh.component.action.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.component.action.dto.ActionDetailDTO; -import com.newyetai.component.action.dto.ActionDetailQueryDTO; -import com.newyetai.component.action.service.ActionDetailService; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.AlitaResult; +import com.senmesh.component.action.dto.ActionDetailDTO; +import com.senmesh.component.action.dto.ActionDetailQueryDTO; +import com.senmesh.component.action.service.ActionDetailService; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/component/action/dao/ActionDetailMapper.java b/src/main/java/com/senmesh/component/action/dao/ActionDetailMapper.java similarity index 60% rename from src/main/java/com/newyetai/component/action/dao/ActionDetailMapper.java rename to src/main/java/com/senmesh/component/action/dao/ActionDetailMapper.java index 32ead78..719ec9d 100644 --- a/src/main/java/com/newyetai/component/action/dao/ActionDetailMapper.java +++ b/src/main/java/com/senmesh/component/action/dao/ActionDetailMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.component.action.dao; +package com.senmesh.component.action.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.component.action.dto.ActionDetailDTO; -import com.newyetai.component.action.dto.ActionDetailQueryDTO; -import com.newyetai.component.action.entity.ActionDetail; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.component.action.dto.ActionDetailDTO; +import com.senmesh.component.action.dto.ActionDetailQueryDTO; +import com.senmesh.component.action.entity.ActionDetail; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 操作记录明细 diff --git a/src/main/java/com/newyetai/component/action/dao/ActionMapper.java b/src/main/java/com/senmesh/component/action/dao/ActionMapper.java similarity index 59% rename from src/main/java/com/newyetai/component/action/dao/ActionMapper.java rename to src/main/java/com/senmesh/component/action/dao/ActionMapper.java index 585b32e..5782d8d 100644 --- a/src/main/java/com/newyetai/component/action/dao/ActionMapper.java +++ b/src/main/java/com/senmesh/component/action/dao/ActionMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.component.action.dao; +package com.senmesh.component.action.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.component.action.dto.ActionDTO; -import com.newyetai.component.action.dto.ActionQueryDTO; -import com.newyetai.component.action.entity.Action; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.component.action.dto.ActionDTO; +import com.senmesh.component.action.dto.ActionQueryDTO; +import com.senmesh.component.action.entity.Action; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 操作记录 diff --git a/src/main/java/com/newyetai/component/action/dto/ActionCreateDTO.java b/src/main/java/com/senmesh/component/action/dto/ActionCreateDTO.java similarity index 91% rename from src/main/java/com/newyetai/component/action/dto/ActionCreateDTO.java rename to src/main/java/com/senmesh/component/action/dto/ActionCreateDTO.java index 1d97d1e..9b82edf 100644 --- a/src/main/java/com/newyetai/component/action/dto/ActionCreateDTO.java +++ b/src/main/java/com/senmesh/component/action/dto/ActionCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.action.dto; +package com.senmesh.component.action.dto; import java.io.Serializable; import java.util.List; @@ -7,7 +7,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/component/action/dto/ActionDTO.java b/src/main/java/com/senmesh/component/action/dto/ActionDTO.java similarity index 88% rename from src/main/java/com/newyetai/component/action/dto/ActionDTO.java rename to src/main/java/com/senmesh/component/action/dto/ActionDTO.java index fbf2f6a..bb08fab 100644 --- a/src/main/java/com/newyetai/component/action/dto/ActionDTO.java +++ b/src/main/java/com/senmesh/component/action/dto/ActionDTO.java @@ -1,11 +1,10 @@ -package com.newyetai.component.action.dto; +package com.senmesh.component.action.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/component/action/dto/ActionDetailCreateDTO.java b/src/main/java/com/senmesh/component/action/dto/ActionDetailCreateDTO.java similarity index 84% rename from src/main/java/com/newyetai/component/action/dto/ActionDetailCreateDTO.java rename to src/main/java/com/senmesh/component/action/dto/ActionDetailCreateDTO.java index 90f6714..9f171c7 100644 --- a/src/main/java/com/newyetai/component/action/dto/ActionDetailCreateDTO.java +++ b/src/main/java/com/senmesh/component/action/dto/ActionDetailCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.action.dto; +package com.senmesh.component.action.dto; import java.io.Serializable; @@ -10,10 +10,8 @@ import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2022-02-18 diff --git a/src/main/java/com/newyetai/component/action/dto/ActionDetailDTO.java b/src/main/java/com/senmesh/component/action/dto/ActionDetailDTO.java similarity index 90% rename from src/main/java/com/newyetai/component/action/dto/ActionDetailDTO.java rename to src/main/java/com/senmesh/component/action/dto/ActionDetailDTO.java index a92b98f..f26a46f 100644 --- a/src/main/java/com/newyetai/component/action/dto/ActionDetailDTO.java +++ b/src/main/java/com/senmesh/component/action/dto/ActionDetailDTO.java @@ -1,11 +1,10 @@ -package com.newyetai.component.action.dto; +package com.senmesh.component.action.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/component/action/dto/ActionDetailQueryDTO.java b/src/main/java/com/senmesh/component/action/dto/ActionDetailQueryDTO.java similarity index 88% rename from src/main/java/com/newyetai/component/action/dto/ActionDetailQueryDTO.java rename to src/main/java/com/senmesh/component/action/dto/ActionDetailQueryDTO.java index 0dd564c..d664cb7 100644 --- a/src/main/java/com/newyetai/component/action/dto/ActionDetailQueryDTO.java +++ b/src/main/java/com/senmesh/component/action/dto/ActionDetailQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.action.dto; +package com.senmesh.component.action.dto; import java.io.Serializable; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2022-02-18 diff --git a/src/main/java/com/newyetai/component/action/dto/ActionQueryDTO.java b/src/main/java/com/senmesh/component/action/dto/ActionQueryDTO.java similarity index 87% rename from src/main/java/com/newyetai/component/action/dto/ActionQueryDTO.java rename to src/main/java/com/senmesh/component/action/dto/ActionQueryDTO.java index de91fb3..f20fb1b 100644 --- a/src/main/java/com/newyetai/component/action/dto/ActionQueryDTO.java +++ b/src/main/java/com/senmesh/component/action/dto/ActionQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.action.dto; +package com.senmesh.component.action.dto; import java.io.Serializable; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2022-02-18 diff --git a/src/main/java/com/newyetai/component/action/entity/Action.java b/src/main/java/com/senmesh/component/action/entity/Action.java similarity index 86% rename from src/main/java/com/newyetai/component/action/entity/Action.java rename to src/main/java/com/senmesh/component/action/entity/Action.java index ee97925..62e325b 100644 --- a/src/main/java/com/newyetai/component/action/entity/Action.java +++ b/src/main/java/com/senmesh/component/action/entity/Action.java @@ -1,7 +1,7 @@ -package com.newyetai.component.action.entity; +package com.senmesh.component.action.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/component/action/entity/ActionDetail.java b/src/main/java/com/senmesh/component/action/entity/ActionDetail.java similarity index 90% rename from src/main/java/com/newyetai/component/action/entity/ActionDetail.java rename to src/main/java/com/senmesh/component/action/entity/ActionDetail.java index 938e7d1..14516df 100644 --- a/src/main/java/com/newyetai/component/action/entity/ActionDetail.java +++ b/src/main/java/com/senmesh/component/action/entity/ActionDetail.java @@ -1,7 +1,7 @@ -package com.newyetai.component.action.entity; +package com.senmesh.component.action.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/component/action/mapper/ActionDetailMapper.xml b/src/main/java/com/senmesh/component/action/mapper/ActionDetailMapper.xml similarity index 71% rename from src/main/java/com/newyetai/component/action/mapper/ActionDetailMapper.xml rename to src/main/java/com/senmesh/component/action/mapper/ActionDetailMapper.xml index 047fc79..7aa07e8 100644 --- a/src/main/java/com/newyetai/component/action/mapper/ActionDetailMapper.xml +++ b/src/main/java/com/senmesh/component/action/mapper/ActionDetailMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_action_detail diff --git a/src/main/java/com/newyetai/component/action/mapper/ActionMapper.xml b/src/main/java/com/senmesh/component/action/mapper/ActionMapper.xml similarity index 76% rename from src/main/java/com/newyetai/component/action/mapper/ActionMapper.xml rename to src/main/java/com/senmesh/component/action/mapper/ActionMapper.xml index bc2565e..dadd9a0 100644 --- a/src/main/java/com/newyetai/component/action/mapper/ActionMapper.xml +++ b/src/main/java/com/senmesh/component/action/mapper/ActionMapper.xml @@ -2,8 +2,8 @@ - - select t1.*,t2.nickname as createName from uc_action t1 left join uc_user t2 on t1.create_by = t2.id and t2.deleted = 0 where diff --git a/src/main/java/com/newyetai/component/action/mapstruct/ActionDetailMapMapper.java b/src/main/java/com/senmesh/component/action/mapstruct/ActionDetailMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/component/action/mapstruct/ActionDetailMapMapper.java rename to src/main/java/com/senmesh/component/action/mapstruct/ActionDetailMapMapper.java index c9f773c..c05a391 100644 --- a/src/main/java/com/newyetai/component/action/mapstruct/ActionDetailMapMapper.java +++ b/src/main/java/com/senmesh/component/action/mapstruct/ActionDetailMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.component.action.mapstruct; +package com.senmesh.component.action.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.action.dto.ActionDetailCreateDTO; -import com.newyetai.component.action.dto.ActionDetailDTO; -import com.newyetai.component.action.entity.ActionDetail; +import com.senmesh.component.action.dto.ActionDetailCreateDTO; +import com.senmesh.component.action.dto.ActionDetailDTO; +import com.senmesh.component.action.entity.ActionDetail; /** * @author sr on 2022-02-18 diff --git a/src/main/java/com/newyetai/component/action/mapstruct/ActionMapMapper.java b/src/main/java/com/senmesh/component/action/mapstruct/ActionMapMapper.java similarity index 71% rename from src/main/java/com/newyetai/component/action/mapstruct/ActionMapMapper.java rename to src/main/java/com/senmesh/component/action/mapstruct/ActionMapMapper.java index 0bf5038..a2ac885 100644 --- a/src/main/java/com/newyetai/component/action/mapstruct/ActionMapMapper.java +++ b/src/main/java/com/senmesh/component/action/mapstruct/ActionMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.component.action.mapstruct; +package com.senmesh.component.action.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.action.dto.ActionCreateDTO; -import com.newyetai.component.action.dto.ActionDTO; -import com.newyetai.component.action.entity.Action; +import com.senmesh.component.action.dto.ActionCreateDTO; +import com.senmesh.component.action.dto.ActionDTO; +import com.senmesh.component.action.entity.Action; /** * @author sr on 2022-02-18 diff --git a/src/main/java/com/newyetai/component/action/service/ActionDetailService.java b/src/main/java/com/senmesh/component/action/service/ActionDetailService.java similarity index 79% rename from src/main/java/com/newyetai/component/action/service/ActionDetailService.java rename to src/main/java/com/senmesh/component/action/service/ActionDetailService.java index e81a13c..b81b8ce 100644 --- a/src/main/java/com/newyetai/component/action/service/ActionDetailService.java +++ b/src/main/java/com/senmesh/component/action/service/ActionDetailService.java @@ -1,9 +1,9 @@ -package com.newyetai.component.action.service; +package com.senmesh.component.action.service; import java.util.List; -import com.newyetai.component.action.dto.ActionDetailDTO; -import com.newyetai.component.action.dto.ActionDetailQueryDTO; +import com.senmesh.component.action.dto.ActionDetailDTO; +import com.senmesh.component.action.dto.ActionDetailQueryDTO; /** * 操作记录明细 diff --git a/src/main/java/com/newyetai/component/action/service/ActionService.java b/src/main/java/com/senmesh/component/action/service/ActionService.java similarity index 79% rename from src/main/java/com/newyetai/component/action/service/ActionService.java rename to src/main/java/com/senmesh/component/action/service/ActionService.java index a681d81..24b1ed6 100644 --- a/src/main/java/com/newyetai/component/action/service/ActionService.java +++ b/src/main/java/com/senmesh/component/action/service/ActionService.java @@ -1,12 +1,12 @@ -package com.newyetai.component.action.service; +package com.senmesh.component.action.service; import java.util.List; import org.springframework.validation.annotation.Validated; -import com.newyetai.component.action.dto.ActionCreateDTO; -import com.newyetai.component.action.dto.ActionDTO; -import com.newyetai.component.action.dto.ActionQueryDTO; +import com.senmesh.component.action.dto.ActionCreateDTO; +import com.senmesh.component.action.dto.ActionDTO; +import com.senmesh.component.action.dto.ActionQueryDTO; /** * 操作记录 diff --git a/src/main/java/com/newyetai/component/action/service/impl/ActionDetailServiceImpl.java b/src/main/java/com/senmesh/component/action/service/impl/ActionDetailServiceImpl.java similarity index 73% rename from src/main/java/com/newyetai/component/action/service/impl/ActionDetailServiceImpl.java rename to src/main/java/com/senmesh/component/action/service/impl/ActionDetailServiceImpl.java index 7d32ff2..4050421 100644 --- a/src/main/java/com/newyetai/component/action/service/impl/ActionDetailServiceImpl.java +++ b/src/main/java/com/senmesh/component/action/service/impl/ActionDetailServiceImpl.java @@ -1,15 +1,15 @@ -package com.newyetai.component.action.service.impl; +package com.senmesh.component.action.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.newyetai.common.util.ListUtil; -import com.newyetai.component.action.dao.ActionDetailMapper; -import com.newyetai.component.action.dto.ActionDetailDTO; -import com.newyetai.component.action.dto.ActionDetailQueryDTO; -import com.newyetai.component.action.service.ActionDetailService; +import com.senmesh.common.util.ListUtil; +import com.senmesh.component.action.dao.ActionDetailMapper; +import com.senmesh.component.action.dto.ActionDetailDTO; +import com.senmesh.component.action.dto.ActionDetailQueryDTO; +import com.senmesh.component.action.service.ActionDetailService; /** * @author sr on 2022-02-18 diff --git a/src/main/java/com/newyetai/component/action/service/impl/ActionServiceImpl.java b/src/main/java/com/senmesh/component/action/service/impl/ActionServiceImpl.java similarity index 69% rename from src/main/java/com/newyetai/component/action/service/impl/ActionServiceImpl.java rename to src/main/java/com/senmesh/component/action/service/impl/ActionServiceImpl.java index 89e7d3e..1202e77 100644 --- a/src/main/java/com/newyetai/component/action/service/impl/ActionServiceImpl.java +++ b/src/main/java/com/senmesh/component/action/service/impl/ActionServiceImpl.java @@ -1,6 +1,6 @@ -package com.newyetai.component.action.service.impl; +package com.senmesh.component.action.service.impl; -import com.newyetai.component.action.util.ActionUtils; +import com.senmesh.component.action.util.ActionUtils; import java.util.List; import java.util.stream.Collectors; @@ -10,23 +10,22 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.constant.CommonMqConstants; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.MockUtils; -import com.newyetai.component.action.dao.ActionDetailMapper; -import com.newyetai.component.action.dao.ActionMapper; -import com.newyetai.component.action.dto.ActionCreateDTO; -import com.newyetai.component.action.dto.ActionDTO; -import com.newyetai.component.action.dto.ActionDetailCreateDTO; -import com.newyetai.component.action.dto.ActionDetailQueryDTO; -import com.newyetai.component.action.dto.ActionQueryDTO; -import com.newyetai.component.action.entity.Action; -import com.newyetai.component.action.entity.ActionDetail; -import com.newyetai.component.action.mapstruct.ActionDetailMapMapper; -import com.newyetai.component.action.mapstruct.ActionMapMapper; -import com.newyetai.component.action.service.ActionService; -import com.newyetai.mq.consumer.handler.ITopicMqHandler; -import com.newyetai.mq.dto.TopicMqMessage; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.MockUtils; +import com.senmesh.component.action.dao.ActionDetailMapper; +import com.senmesh.component.action.dao.ActionMapper; +import com.senmesh.component.action.dto.ActionCreateDTO; +import com.senmesh.component.action.dto.ActionDTO; +import com.senmesh.component.action.dto.ActionDetailCreateDTO; +import com.senmesh.component.action.dto.ActionDetailQueryDTO; +import com.senmesh.component.action.dto.ActionQueryDTO; +import com.senmesh.component.action.entity.Action; +import com.senmesh.component.action.entity.ActionDetail; +import com.senmesh.component.action.mapstruct.ActionDetailMapMapper; +import com.senmesh.component.action.mapstruct.ActionMapMapper; +import com.senmesh.component.action.service.ActionService; +import com.senmesh.mq.consumer.handler.ITopicMqHandler; +import com.senmesh.mq.dto.TopicMqMessage; /** * @author sr on 2022-02-18 diff --git a/src/main/java/com/newyetai/component/action/util/ActionUtils.java b/src/main/java/com/senmesh/component/action/util/ActionUtils.java similarity index 86% rename from src/main/java/com/newyetai/component/action/util/ActionUtils.java rename to src/main/java/com/senmesh/component/action/util/ActionUtils.java index 0b55577..2e52864 100644 --- a/src/main/java/com/newyetai/component/action/util/ActionUtils.java +++ b/src/main/java/com/senmesh/component/action/util/ActionUtils.java @@ -1,6 +1,5 @@ -package com.newyetai.component.action.util; +package com.senmesh.component.action.util; -import com.newyetai.common.constant.CommonConstants; import java.lang.reflect.Field; import java.util.List; import java.util.Map; @@ -10,15 +9,14 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Lists; -import com.newyetai.common.constant.CommonMqConstants; -import com.newyetai.common.util.StrUtils; -import com.newyetai.component.action.annotation.ActionField; -import com.newyetai.component.action.annotation.ActionModel; -import com.newyetai.component.action.dto.ActionCreateDTO; -import com.newyetai.component.action.dto.ActionDetailCreateDTO; -import com.newyetai.component.dict.util.DictUtils; -import com.newyetai.mq.util.MqSendUtils; -import com.newyetai.mybatisplus.util.MybatisPlusUtils; +import com.senmesh.common.util.StrUtils; +import com.senmesh.component.action.annotation.ActionField; +import com.senmesh.component.action.annotation.ActionModel; +import com.senmesh.component.action.dto.ActionCreateDTO; +import com.senmesh.component.action.dto.ActionDetailCreateDTO; +import com.senmesh.component.dict.util.DictUtils; +import com.senmesh.mq.util.MqSendUtils; +import com.senmesh.mybatisplus.util.MybatisPlusUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskFlowStatusEnum.java b/src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskFlowStatusEnum.java similarity index 85% rename from src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskFlowStatusEnum.java rename to src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskFlowStatusEnum.java index 94f5841..4c650df 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskFlowStatusEnum.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskFlowStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.asyntasknotice.constant; +package com.senmesh.component.asyntasknotice.constant; /** diff --git a/src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskNoticeStatusEnum.java b/src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskNoticeStatusEnum.java similarity index 86% rename from src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskNoticeStatusEnum.java rename to src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskNoticeStatusEnum.java index 913dbf5..96e1b69 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskNoticeStatusEnum.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskNoticeStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.asyntasknotice.constant; +package com.senmesh.component.asyntasknotice.constant; /** diff --git a/src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskTypeEnum.java b/src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskTypeEnum.java similarity index 82% rename from src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskTypeEnum.java rename to src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskTypeEnum.java index 97c9302..32dcd4b 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/constant/AsyncTaskTypeEnum.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/constant/AsyncTaskTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.asyntasknotice.constant; +package com.senmesh.component.asyntasknotice.constant; /** * 异步任务类型 diff --git a/src/main/java/com/newyetai/component/asyntasknotice/controller/AsyncTaskNoticeController.java b/src/main/java/com/senmesh/component/asyntasknotice/controller/AsyncTaskNoticeController.java similarity index 62% rename from src/main/java/com/newyetai/component/asyntasknotice/controller/AsyncTaskNoticeController.java rename to src/main/java/com/senmesh/component/asyntasknotice/controller/AsyncTaskNoticeController.java index e1d82c5..34b7ba9 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/controller/AsyncTaskNoticeController.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/controller/AsyncTaskNoticeController.java @@ -1,22 +1,18 @@ -package com.newyetai.component.asyntasknotice.controller; +package com.senmesh.component.asyntasknotice.controller; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeQueryDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeReadDTO; -import com.newyetai.component.asyntasknotice.service.AsyncTaskNoticeService; -import com.newyetai.component.commonimport.dto.ImportMainCreateDTO; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeQueryDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeReadDTO; +import com.senmesh.component.asyntasknotice.service.AsyncTaskNoticeService; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/component/asyntasknotice/dao/AsyncTaskNoticeMapper.java b/src/main/java/com/senmesh/component/asyntasknotice/dao/AsyncTaskNoticeMapper.java similarity index 55% rename from src/main/java/com/newyetai/component/asyntasknotice/dao/AsyncTaskNoticeMapper.java rename to src/main/java/com/senmesh/component/asyntasknotice/dao/AsyncTaskNoticeMapper.java index b28578c..5353ae9 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/dao/AsyncTaskNoticeMapper.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/dao/AsyncTaskNoticeMapper.java @@ -1,15 +1,15 @@ -package com.newyetai.component.asyntasknotice.dao; +package com.senmesh.component.asyntasknotice.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeQueryDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeReadDTO; -import com.newyetai.component.asyntasknotice.entity.AsyncTaskNotice; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeQueryDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeReadDTO; +import com.senmesh.component.asyntasknotice.entity.AsyncTaskNotice; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 异步任务通知 diff --git a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeCreateDTO.java b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeCreateDTO.java similarity index 90% rename from src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeCreateDTO.java rename to src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeCreateDTO.java index e885932..8833557 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeCreateDTO.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeCreateDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.component.asyntasknotice.dto; +package com.senmesh.component.asyntasknotice.dto; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeDTO.java b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeDTO.java similarity index 79% rename from src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeDTO.java rename to src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeDTO.java index 6e3b368..1acf267 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeDTO.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.component.asyntasknotice.dto; +package com.senmesh.component.asyntasknotice.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.component.action.dto.ActionDetailDTO; +import com.senmesh.common.dto.BaseDTO; -import com.newyetai.component.asyntasknotice.constant.AsyncTaskTypeEnum; +import com.senmesh.component.asyntasknotice.constant.AsyncTaskTypeEnum; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeFinishDTO.java b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeFinishDTO.java similarity index 88% rename from src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeFinishDTO.java rename to src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeFinishDTO.java index 84be7f0..c43991f 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeFinishDTO.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeFinishDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.component.asyntasknotice.dto; +package com.senmesh.component.asyntasknotice.dto; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeQueryDTO.java b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeQueryDTO.java similarity index 88% rename from src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeQueryDTO.java rename to src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeQueryDTO.java index ba242f0..fe97f80 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeQueryDTO.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.asyntasknotice.dto; +package com.senmesh.component.asyntasknotice.dto; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2024-02-06 diff --git a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeReadDTO.java b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeReadDTO.java similarity index 86% rename from src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeReadDTO.java rename to src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeReadDTO.java index 1879b6b..231a1ad 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/dto/AsyncTaskNoticeReadDTO.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/dto/AsyncTaskNoticeReadDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.component.asyntasknotice.dto; +package com.senmesh.component.asyntasknotice.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/component/asyntasknotice/entity/AsyncTaskNotice.java b/src/main/java/com/senmesh/component/asyntasknotice/entity/AsyncTaskNotice.java similarity index 90% rename from src/main/java/com/newyetai/component/asyntasknotice/entity/AsyncTaskNotice.java rename to src/main/java/com/senmesh/component/asyntasknotice/entity/AsyncTaskNotice.java index 5c0d634..8d01bcf 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/entity/AsyncTaskNotice.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/entity/AsyncTaskNotice.java @@ -1,7 +1,7 @@ -package com.newyetai.component.asyntasknotice.entity; +package com.senmesh.component.asyntasknotice.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/component/asyntasknotice/mapper/AsyncTaskNoticeMapper.xml b/src/main/java/com/senmesh/component/asyntasknotice/mapper/AsyncTaskNoticeMapper.xml similarity index 88% rename from src/main/java/com/newyetai/component/asyntasknotice/mapper/AsyncTaskNoticeMapper.xml rename to src/main/java/com/senmesh/component/asyntasknotice/mapper/AsyncTaskNoticeMapper.xml index 43da302..26e6680 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/mapper/AsyncTaskNoticeMapper.xml +++ b/src/main/java/com/senmesh/component/asyntasknotice/mapper/AsyncTaskNoticeMapper.xml @@ -2,8 +2,8 @@ - - select * from async_task_notice diff --git a/src/main/java/com/newyetai/component/asyntasknotice/mapstruct/AsyncTaskNoticeMapMapper.java b/src/main/java/com/senmesh/component/asyntasknotice/mapstruct/AsyncTaskNoticeMapMapper.java similarity index 68% rename from src/main/java/com/newyetai/component/asyntasknotice/mapstruct/AsyncTaskNoticeMapMapper.java rename to src/main/java/com/senmesh/component/asyntasknotice/mapstruct/AsyncTaskNoticeMapMapper.java index fc16280..3fed446 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/mapstruct/AsyncTaskNoticeMapMapper.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/mapstruct/AsyncTaskNoticeMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.component.asyntasknotice.mapstruct; +package com.senmesh.component.asyntasknotice.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeDTO; -import com.newyetai.component.asyntasknotice.entity.AsyncTaskNotice; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeDTO; +import com.senmesh.component.asyntasknotice.entity.AsyncTaskNotice; /** * @author sr on 2024-02-06 diff --git a/src/main/java/com/newyetai/component/asyntasknotice/service/AsyncTaskNoticeService.java b/src/main/java/com/senmesh/component/asyntasknotice/service/AsyncTaskNoticeService.java similarity index 75% rename from src/main/java/com/newyetai/component/asyntasknotice/service/AsyncTaskNoticeService.java rename to src/main/java/com/senmesh/component/asyntasknotice/service/AsyncTaskNoticeService.java index f8001fd..526db55 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/service/AsyncTaskNoticeService.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/service/AsyncTaskNoticeService.java @@ -1,14 +1,14 @@ -package com.newyetai.component.asyntasknotice.service; +package com.senmesh.component.asyntasknotice.service; import java.util.List; import javax.validation.Valid; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeQueryDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeReadDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeQueryDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeReadDTO; /** * 异步任务通知 diff --git a/src/main/java/com/newyetai/component/asyntasknotice/service/impl/AsyncTaskNoticeServiceImpl.java b/src/main/java/com/senmesh/component/asyntasknotice/service/impl/AsyncTaskNoticeServiceImpl.java similarity index 70% rename from src/main/java/com/newyetai/component/asyntasknotice/service/impl/AsyncTaskNoticeServiceImpl.java rename to src/main/java/com/senmesh/component/asyntasknotice/service/impl/AsyncTaskNoticeServiceImpl.java index 0466b02..9958662 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/service/impl/AsyncTaskNoticeServiceImpl.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/service/impl/AsyncTaskNoticeServiceImpl.java @@ -1,34 +1,31 @@ -package com.newyetai.component.asyntasknotice.service.impl; +package com.senmesh.component.asyntasknotice.service.impl; -import com.newyetai.component.notice.constant.NoticeFirstTypeEnum; -import com.newyetai.component.notice.dto.NoticeMsgDTO; -import com.newyetai.component.notice.service.AsyncNoticeHandler; -import com.newyetai.component.notice.util.NoticeUtils; +import com.senmesh.component.notice.constant.NoticeFirstTypeEnum; +import com.senmesh.component.notice.dto.NoticeMsgDTO; +import com.senmesh.component.notice.util.NoticeUtils; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.asyntasknotice.constant.AsyncTaskFlowStatusEnum; -import com.newyetai.component.asyntasknotice.constant.AsyncTaskNoticeStatusEnum; -import com.newyetai.component.asyntasknotice.dao.AsyncTaskNoticeMapper; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeQueryDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeReadDTO; -import com.newyetai.component.asyntasknotice.entity.AsyncTaskNotice; -import com.newyetai.component.asyntasknotice.mapstruct.AsyncTaskNoticeMapMapper; -import com.newyetai.component.asyntasknotice.service.AsyncTaskNoticeService; -import com.newyetai.component.asyntasknotice.util.AsyncTaskNoticeUtils; -import com.newyetai.frame.redis.aop.annotation.AutoUnLock; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.mq.util.MqSendUtils; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.asyntasknotice.constant.AsyncTaskFlowStatusEnum; +import com.senmesh.component.asyntasknotice.constant.AsyncTaskNoticeStatusEnum; +import com.senmesh.component.asyntasknotice.dao.AsyncTaskNoticeMapper; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeQueryDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeReadDTO; +import com.senmesh.component.asyntasknotice.entity.AsyncTaskNotice; +import com.senmesh.component.asyntasknotice.mapstruct.AsyncTaskNoticeMapMapper; +import com.senmesh.component.asyntasknotice.service.AsyncTaskNoticeService; +import com.senmesh.frame.redis.aop.annotation.AutoUnLock; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; /** * @author sr on 2024-02-06 diff --git a/src/main/java/com/newyetai/component/asyntasknotice/util/AsyncTaskNoticeUtils.java b/src/main/java/com/senmesh/component/asyntasknotice/util/AsyncTaskNoticeUtils.java similarity index 71% rename from src/main/java/com/newyetai/component/asyntasknotice/util/AsyncTaskNoticeUtils.java rename to src/main/java/com/senmesh/component/asyntasknotice/util/AsyncTaskNoticeUtils.java index 1febca5..0a4058e 100644 --- a/src/main/java/com/newyetai/component/asyntasknotice/util/AsyncTaskNoticeUtils.java +++ b/src/main/java/com/senmesh/component/asyntasknotice/util/AsyncTaskNoticeUtils.java @@ -1,13 +1,11 @@ -package com.newyetai.component.asyntasknotice.util; +package com.senmesh.component.asyntasknotice.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; -import com.newyetai.component.asyntasknotice.service.AsyncTaskNoticeService; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; +import com.senmesh.component.asyntasknotice.service.AsyncTaskNoticeService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/component/cardbin/dao/CardBinMapper.java b/src/main/java/com/senmesh/component/cardbin/dao/CardBinMapper.java similarity index 79% rename from src/main/java/com/newyetai/component/cardbin/dao/CardBinMapper.java rename to src/main/java/com/senmesh/component/cardbin/dao/CardBinMapper.java index e411cc3..4976017 100644 --- a/src/main/java/com/newyetai/component/cardbin/dao/CardBinMapper.java +++ b/src/main/java/com/senmesh/component/cardbin/dao/CardBinMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.component.cardbin.dao; +package com.senmesh.component.cardbin.dao; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.component.cardbin.entity.CardBin; +import com.senmesh.component.cardbin.entity.CardBin; /** * @author sr on 2019-09-25 diff --git a/src/main/java/com/newyetai/component/cardbin/entity/BankCode.java b/src/main/java/com/senmesh/component/cardbin/entity/BankCode.java similarity index 86% rename from src/main/java/com/newyetai/component/cardbin/entity/BankCode.java rename to src/main/java/com/senmesh/component/cardbin/entity/BankCode.java index 2584269..afa1207 100644 --- a/src/main/java/com/newyetai/component/cardbin/entity/BankCode.java +++ b/src/main/java/com/senmesh/component/cardbin/entity/BankCode.java @@ -1,7 +1,7 @@ -package com.newyetai.component.cardbin.entity; +package com.senmesh.component.cardbin.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/component/cardbin/entity/CardBin.java b/src/main/java/com/senmesh/component/cardbin/entity/CardBin.java similarity index 90% rename from src/main/java/com/newyetai/component/cardbin/entity/CardBin.java rename to src/main/java/com/senmesh/component/cardbin/entity/CardBin.java index 2694ec6..353c228 100644 --- a/src/main/java/com/newyetai/component/cardbin/entity/CardBin.java +++ b/src/main/java/com/senmesh/component/cardbin/entity/CardBin.java @@ -1,7 +1,7 @@ -package com.newyetai.component.cardbin.entity; +package com.senmesh.component.cardbin.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/component/cardbin/mapper/CardBinMapper.xml b/src/main/java/com/senmesh/component/cardbin/mapper/CardBinMapper.xml similarity index 65% rename from src/main/java/com/newyetai/component/cardbin/mapper/CardBinMapper.xml rename to src/main/java/com/senmesh/component/cardbin/mapper/CardBinMapper.xml index 506c060..1a3a61e 100644 --- a/src/main/java/com/newyetai/component/cardbin/mapper/CardBinMapper.xml +++ b/src/main/java/com/senmesh/component/cardbin/mapper/CardBinMapper.xml @@ -2,13 +2,13 @@ - + - select * from xs_card_bin where length(#{param1}) = card_length and locate(card_bin, #{param1}) = 1 and deleted = 0 - SELECT bank_org_code, bank_number, diff --git a/src/main/java/com/newyetai/component/cardbin/service/CardBinService.java b/src/main/java/com/senmesh/component/cardbin/service/CardBinService.java similarity index 85% rename from src/main/java/com/newyetai/component/cardbin/service/CardBinService.java rename to src/main/java/com/senmesh/component/cardbin/service/CardBinService.java index 4d7d317..a34a981 100644 --- a/src/main/java/com/newyetai/component/cardbin/service/CardBinService.java +++ b/src/main/java/com/senmesh/component/cardbin/service/CardBinService.java @@ -1,7 +1,7 @@ -package com.newyetai.component.cardbin.service; +package com.senmesh.component.cardbin.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.component.cardbin.entity.CardBin; +import com.senmesh.common.AlitaResult; +import com.senmesh.component.cardbin.entity.CardBin; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/newyetai/component/cardbin/service/impl/CardBinServiceImpl.java b/src/main/java/com/senmesh/component/cardbin/service/impl/CardBinServiceImpl.java similarity index 87% rename from src/main/java/com/newyetai/component/cardbin/service/impl/CardBinServiceImpl.java rename to src/main/java/com/senmesh/component/cardbin/service/impl/CardBinServiceImpl.java index 2b0ce28..12289fb 100644 --- a/src/main/java/com/newyetai/component/cardbin/service/impl/CardBinServiceImpl.java +++ b/src/main/java/com/senmesh/component/cardbin/service/impl/CardBinServiceImpl.java @@ -1,10 +1,10 @@ -package com.newyetai.component.cardbin.service.impl; +package com.senmesh.component.cardbin.service.impl; -import com.newyetai.common.AlitaResult; -import com.newyetai.component.cardbin.dao.CardBinMapper; -import com.newyetai.component.cardbin.entity.CardBin; -import com.newyetai.component.cardbin.service.CardBinService; -import com.newyetai.frame.redis.util.RedissonValueUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.component.cardbin.dao.CardBinMapper; +import com.senmesh.component.cardbin.entity.CardBin; +import com.senmesh.component.cardbin.service.CardBinService; +import com.senmesh.frame.redis.util.RedissonValueUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/component/chat/constant/ChatConstants.java b/src/main/java/com/senmesh/component/chat/constant/ChatConstants.java similarity index 61% rename from src/main/java/com/newyetai/component/chat/constant/ChatConstants.java rename to src/main/java/com/senmesh/component/chat/constant/ChatConstants.java index 443f72f..79a0aa6 100644 --- a/src/main/java/com/newyetai/component/chat/constant/ChatConstants.java +++ b/src/main/java/com/senmesh/component/chat/constant/ChatConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.component.chat.constant; +package com.senmesh.component.chat.constant; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/constant/ChatMsgStatusEnum.java b/src/main/java/com/senmesh/component/chat/constant/ChatMsgStatusEnum.java similarity index 84% rename from src/main/java/com/newyetai/component/chat/constant/ChatMsgStatusEnum.java rename to src/main/java/com/senmesh/component/chat/constant/ChatMsgStatusEnum.java index 8f7a83e..02a78c2 100644 --- a/src/main/java/com/newyetai/component/chat/constant/ChatMsgStatusEnum.java +++ b/src/main/java/com/senmesh/component/chat/constant/ChatMsgStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.chat.constant; +package com.senmesh.component.chat.constant; diff --git a/src/main/java/com/newyetai/component/chat/constant/ChatMsgTypeEnum.java b/src/main/java/com/senmesh/component/chat/constant/ChatMsgTypeEnum.java similarity index 65% rename from src/main/java/com/newyetai/component/chat/constant/ChatMsgTypeEnum.java rename to src/main/java/com/senmesh/component/chat/constant/ChatMsgTypeEnum.java index 8191c0b..02fbfdb 100644 --- a/src/main/java/com/newyetai/component/chat/constant/ChatMsgTypeEnum.java +++ b/src/main/java/com/senmesh/component/chat/constant/ChatMsgTypeEnum.java @@ -1,7 +1,4 @@ -package com.newyetai.component.chat.constant; - -import com.google.common.collect.Maps; -import java.util.Map; +package com.senmesh.component.chat.constant; public enum ChatMsgTypeEnum { diff --git a/src/main/java/com/newyetai/component/chat/constant/ChatStatusEnum.java b/src/main/java/com/senmesh/component/chat/constant/ChatStatusEnum.java similarity index 69% rename from src/main/java/com/newyetai/component/chat/constant/ChatStatusEnum.java rename to src/main/java/com/senmesh/component/chat/constant/ChatStatusEnum.java index 7e87b61..70bec10 100644 --- a/src/main/java/com/newyetai/component/chat/constant/ChatStatusEnum.java +++ b/src/main/java/com/senmesh/component/chat/constant/ChatStatusEnum.java @@ -1,7 +1,4 @@ -package com.newyetai.component.chat.constant; - -import com.google.common.collect.Maps; -import java.util.Map; +package com.senmesh.component.chat.constant; public enum ChatStatusEnum { diff --git a/src/main/java/com/newyetai/component/chat/constant/ChatTypeEnum.java b/src/main/java/com/senmesh/component/chat/constant/ChatTypeEnum.java similarity index 81% rename from src/main/java/com/newyetai/component/chat/constant/ChatTypeEnum.java rename to src/main/java/com/senmesh/component/chat/constant/ChatTypeEnum.java index 16b4090..730c4d8 100644 --- a/src/main/java/com/newyetai/component/chat/constant/ChatTypeEnum.java +++ b/src/main/java/com/senmesh/component/chat/constant/ChatTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.chat.constant; +package com.senmesh.component.chat.constant; public enum ChatTypeEnum { diff --git a/src/main/java/com/newyetai/component/chat/controller/ChatController.java b/src/main/java/com/senmesh/component/chat/controller/ChatController.java similarity index 80% rename from src/main/java/com/newyetai/component/chat/controller/ChatController.java rename to src/main/java/com/senmesh/component/chat/controller/ChatController.java index 573a7e1..dbbc68d 100644 --- a/src/main/java/com/newyetai/component/chat/controller/ChatController.java +++ b/src/main/java/com/senmesh/component/chat/controller/ChatController.java @@ -1,25 +1,23 @@ -package com.newyetai.component.chat.controller; +package com.senmesh.component.chat.controller; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.constant.UserTypeEnum; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.constant.UserTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PathVariable; -import com.newyetai.common.validation.Update; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.component.chat.dto.ChatQueryDTO; -import com.newyetai.component.chat.service.ChatService; -import com.newyetai.component.chat.dto.ChatDTO; -import com.newyetai.component.chat.dto.ChatCreateDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.component.chat.dto.ChatQueryDTO; +import com.senmesh.component.chat.service.ChatService; +import com.senmesh.component.chat.dto.ChatDTO; +import com.senmesh.component.chat.dto.ChatCreateDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/component/chat/controller/ChatMsgController.java b/src/main/java/com/senmesh/component/chat/controller/ChatMsgController.java similarity index 76% rename from src/main/java/com/newyetai/component/chat/controller/ChatMsgController.java rename to src/main/java/com/senmesh/component/chat/controller/ChatMsgController.java index 46f68de..c77e60b 100644 --- a/src/main/java/com/newyetai/component/chat/controller/ChatMsgController.java +++ b/src/main/java/com/senmesh/component/chat/controller/ChatMsgController.java @@ -1,11 +1,11 @@ -package com.newyetai.component.chat.controller; +package com.senmesh.component.chat.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.component.chat.dto.ChatMsgCreateDTO; -import com.newyetai.component.chat.dto.ChatMsgDTO; -import com.newyetai.component.chat.dto.ChatMsgQueryDTO; -import com.newyetai.component.chat.service.ChatMsgService; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.AlitaResult; +import com.senmesh.component.chat.dto.ChatMsgCreateDTO; +import com.senmesh.component.chat.dto.ChatMsgDTO; +import com.senmesh.component.chat.dto.ChatMsgQueryDTO; +import com.senmesh.component.chat.service.ChatMsgService; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/component/chat/dao/ChatMapper.java b/src/main/java/com/senmesh/component/chat/dao/ChatMapper.java similarity index 59% rename from src/main/java/com/newyetai/component/chat/dao/ChatMapper.java rename to src/main/java/com/senmesh/component/chat/dao/ChatMapper.java index 3ae312f..43b6913 100644 --- a/src/main/java/com/newyetai/component/chat/dao/ChatMapper.java +++ b/src/main/java/com/senmesh/component/chat/dao/ChatMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.component.chat.dao; +package com.senmesh.component.chat.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.component.chat.dto.ChatDTO; -import com.newyetai.component.chat.dto.ChatQueryDTO; -import com.newyetai.component.chat.entity.Chat; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.component.chat.dto.ChatDTO; +import com.senmesh.component.chat.dto.ChatQueryDTO; +import com.senmesh.component.chat.entity.Chat; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 聊天会话 diff --git a/src/main/java/com/newyetai/component/chat/dao/ChatMsgMapper.java b/src/main/java/com/senmesh/component/chat/dao/ChatMsgMapper.java similarity index 60% rename from src/main/java/com/newyetai/component/chat/dao/ChatMsgMapper.java rename to src/main/java/com/senmesh/component/chat/dao/ChatMsgMapper.java index 649a9d6..45e3753 100644 --- a/src/main/java/com/newyetai/component/chat/dao/ChatMsgMapper.java +++ b/src/main/java/com/senmesh/component/chat/dao/ChatMsgMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.component.chat.dao; +package com.senmesh.component.chat.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.component.chat.dto.ChatMsgDTO; -import com.newyetai.component.chat.dto.ChatMsgQueryDTO; -import com.newyetai.component.chat.entity.ChatMsg; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.component.chat.dto.ChatMsgDTO; +import com.senmesh.component.chat.dto.ChatMsgQueryDTO; +import com.senmesh.component.chat.entity.ChatMsg; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 聊天消息 diff --git a/src/main/java/com/newyetai/component/chat/dto/ChatCreateDTO.java b/src/main/java/com/senmesh/component/chat/dto/ChatCreateDTO.java similarity index 75% rename from src/main/java/com/newyetai/component/chat/dto/ChatCreateDTO.java rename to src/main/java/com/senmesh/component/chat/dto/ChatCreateDTO.java index e390e95..3aff155 100644 --- a/src/main/java/com/newyetai/component/chat/dto/ChatCreateDTO.java +++ b/src/main/java/com/senmesh/component/chat/dto/ChatCreateDTO.java @@ -1,7 +1,6 @@ -package com.newyetai.component.chat.dto; +package com.senmesh.component.chat.dto; -import com.newyetai.component.chat.constant.ChatTypeEnum; -import io.swagger.annotations.ApiModelProperty; +import com.senmesh.component.chat.constant.ChatTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Builder.Default; @@ -9,9 +8,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/dto/ChatDTO.java b/src/main/java/com/senmesh/component/chat/dto/ChatDTO.java similarity index 82% rename from src/main/java/com/newyetai/component/chat/dto/ChatDTO.java rename to src/main/java/com/senmesh/component/chat/dto/ChatDTO.java index d1ab4ce..c1c5157 100644 --- a/src/main/java/com/newyetai/component/chat/dto/ChatDTO.java +++ b/src/main/java/com/senmesh/component/chat/dto/ChatDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.component.chat.dto; +package com.senmesh.component.chat.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; -import com.newyetai.component.chat.constant.ChatTypeEnum; +import com.senmesh.component.chat.constant.ChatTypeEnum; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/component/chat/dto/ChatMsgCreateDTO.java b/src/main/java/com/senmesh/component/chat/dto/ChatMsgCreateDTO.java similarity index 75% rename from src/main/java/com/newyetai/component/chat/dto/ChatMsgCreateDTO.java rename to src/main/java/com/senmesh/component/chat/dto/ChatMsgCreateDTO.java index b05a2a3..34934c7 100644 --- a/src/main/java/com/newyetai/component/chat/dto/ChatMsgCreateDTO.java +++ b/src/main/java/com/senmesh/component/chat/dto/ChatMsgCreateDTO.java @@ -1,7 +1,6 @@ -package com.newyetai.component.chat.dto; +package com.senmesh.component.chat.dto; -import com.newyetai.component.chat.constant.ChatMsgTypeEnum; -import io.swagger.annotations.ApiModelProperty; +import com.senmesh.component.chat.constant.ChatMsgTypeEnum; import javax.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,10 +8,8 @@ import lombok.Builder.Default; import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/dto/ChatMsgDTO.java b/src/main/java/com/senmesh/component/chat/dto/ChatMsgDTO.java similarity index 75% rename from src/main/java/com/newyetai/component/chat/dto/ChatMsgDTO.java rename to src/main/java/com/senmesh/component/chat/dto/ChatMsgDTO.java index d917925..9d38eed 100644 --- a/src/main/java/com/newyetai/component/chat/dto/ChatMsgDTO.java +++ b/src/main/java/com/senmesh/component/chat/dto/ChatMsgDTO.java @@ -1,13 +1,11 @@ -package com.newyetai.component.chat.dto; +package com.senmesh.component.chat.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; -import com.newyetai.component.chat.constant.ChatMsgStatusEnum; -import com.newyetai.component.chat.constant.ChatMsgTypeEnum; +import com.senmesh.component.chat.constant.ChatMsgStatusEnum; +import com.senmesh.component.chat.constant.ChatMsgTypeEnum; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Builder.Default; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/newyetai/component/chat/dto/ChatMsgQueryDTO.java b/src/main/java/com/senmesh/component/chat/dto/ChatMsgQueryDTO.java similarity index 81% rename from src/main/java/com/newyetai/component/chat/dto/ChatMsgQueryDTO.java rename to src/main/java/com/senmesh/component/chat/dto/ChatMsgQueryDTO.java index 0b352b8..1fc3ebe 100644 --- a/src/main/java/com/newyetai/component/chat/dto/ChatMsgQueryDTO.java +++ b/src/main/java/com/senmesh/component/chat/dto/ChatMsgQueryDTO.java @@ -1,7 +1,6 @@ -package com.newyetai.component.chat.dto; +package com.senmesh.component.chat.dto; -import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/dto/ChatQueryDTO.java b/src/main/java/com/senmesh/component/chat/dto/ChatQueryDTO.java similarity index 81% rename from src/main/java/com/newyetai/component/chat/dto/ChatQueryDTO.java rename to src/main/java/com/senmesh/component/chat/dto/ChatQueryDTO.java index a328b2b..5065520 100644 --- a/src/main/java/com/newyetai/component/chat/dto/ChatQueryDTO.java +++ b/src/main/java/com/senmesh/component/chat/dto/ChatQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.component.chat.dto; +package com.senmesh.component.chat.dto; -import com.newyetai.component.chat.constant.ChatStatusEnum; -import com.newyetai.component.chat.constant.ChatTypeEnum; +import com.senmesh.component.chat.constant.ChatStatusEnum; +import com.senmesh.component.chat.constant.ChatTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -11,7 +11,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/entity/Chat.java b/src/main/java/com/senmesh/component/chat/entity/Chat.java similarity index 80% rename from src/main/java/com/newyetai/component/chat/entity/Chat.java rename to src/main/java/com/senmesh/component/chat/entity/Chat.java index 34c1cd5..ac35441 100644 --- a/src/main/java/com/newyetai/component/chat/entity/Chat.java +++ b/src/main/java/com/senmesh/component/chat/entity/Chat.java @@ -1,10 +1,10 @@ -package com.newyetai.component.chat.entity; +package com.senmesh.component.chat.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; -import com.newyetai.component.chat.constant.ChatStatusEnum; -import com.newyetai.component.chat.constant.ChatTypeEnum; +import com.senmesh.component.chat.constant.ChatStatusEnum; +import com.senmesh.component.chat.constant.ChatTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder.Default; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/component/chat/entity/ChatMsg.java b/src/main/java/com/senmesh/component/chat/entity/ChatMsg.java similarity index 80% rename from src/main/java/com/newyetai/component/chat/entity/ChatMsg.java rename to src/main/java/com/senmesh/component/chat/entity/ChatMsg.java index bf6158c..5692c48 100644 --- a/src/main/java/com/newyetai/component/chat/entity/ChatMsg.java +++ b/src/main/java/com/senmesh/component/chat/entity/ChatMsg.java @@ -1,9 +1,9 @@ -package com.newyetai.component.chat.entity; +package com.senmesh.component.chat.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.component.chat.constant.ChatMsgStatusEnum; -import com.newyetai.component.chat.constant.ChatMsgTypeEnum; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.component.chat.constant.ChatMsgStatusEnum; +import com.senmesh.component.chat.constant.ChatMsgTypeEnum; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder.Default; diff --git a/src/main/java/com/newyetai/component/chat/mapper/ChatMapper.xml b/src/main/java/com/senmesh/component/chat/mapper/ChatMapper.xml similarity index 85% rename from src/main/java/com/newyetai/component/chat/mapper/ChatMapper.xml rename to src/main/java/com/senmesh/component/chat/mapper/ChatMapper.xml index 7aa00f9..4bcb690 100644 --- a/src/main/java/com/newyetai/component/chat/mapper/ChatMapper.xml +++ b/src/main/java/com/senmesh/component/chat/mapper/ChatMapper.xml @@ -2,8 +2,8 @@ - - select c.*, o.org_name orgName, diff --git a/src/main/java/com/newyetai/component/chat/mapper/ChatMsgMapper.xml b/src/main/java/com/senmesh/component/chat/mapper/ChatMsgMapper.xml similarity index 75% rename from src/main/java/com/newyetai/component/chat/mapper/ChatMsgMapper.xml rename to src/main/java/com/senmesh/component/chat/mapper/ChatMsgMapper.xml index a33b00a..cdd1d95 100644 --- a/src/main/java/com/newyetai/component/chat/mapper/ChatMsgMapper.xml +++ b/src/main/java/com/senmesh/component/chat/mapper/ChatMsgMapper.xml @@ -2,8 +2,8 @@ - - select * from xs_chat_msg diff --git a/src/main/java/com/newyetai/component/chat/mapstruct/ChatMapMapper.java b/src/main/java/com/senmesh/component/chat/mapstruct/ChatMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/component/chat/mapstruct/ChatMapMapper.java rename to src/main/java/com/senmesh/component/chat/mapstruct/ChatMapMapper.java index 23f780b..71d26ff 100644 --- a/src/main/java/com/newyetai/component/chat/mapstruct/ChatMapMapper.java +++ b/src/main/java/com/senmesh/component/chat/mapstruct/ChatMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.component.chat.mapstruct; +package com.senmesh.component.chat.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.chat.dto.ChatDTO; -import com.newyetai.component.chat.entity.Chat; -import com.newyetai.component.chat.dto.ChatCreateDTO; +import com.senmesh.component.chat.dto.ChatDTO; +import com.senmesh.component.chat.entity.Chat; +import com.senmesh.component.chat.dto.ChatCreateDTO; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/mapstruct/ChatMsgMapMapper.java b/src/main/java/com/senmesh/component/chat/mapstruct/ChatMsgMapMapper.java similarity index 73% rename from src/main/java/com/newyetai/component/chat/mapstruct/ChatMsgMapMapper.java rename to src/main/java/com/senmesh/component/chat/mapstruct/ChatMsgMapMapper.java index b654eaa..25ed7ae 100644 --- a/src/main/java/com/newyetai/component/chat/mapstruct/ChatMsgMapMapper.java +++ b/src/main/java/com/senmesh/component/chat/mapstruct/ChatMsgMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.component.chat.mapstruct; +package com.senmesh.component.chat.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.chat.dto.ChatMsgDTO; -import com.newyetai.component.chat.entity.ChatMsg; -import com.newyetai.component.chat.dto.ChatMsgCreateDTO; +import com.senmesh.component.chat.dto.ChatMsgDTO; +import com.senmesh.component.chat.entity.ChatMsg; +import com.senmesh.component.chat.dto.ChatMsgCreateDTO; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/service/ChatMsgService.java b/src/main/java/com/senmesh/component/chat/service/ChatMsgService.java similarity index 82% rename from src/main/java/com/newyetai/component/chat/service/ChatMsgService.java rename to src/main/java/com/senmesh/component/chat/service/ChatMsgService.java index 3f7f684..f08c31f 100644 --- a/src/main/java/com/newyetai/component/chat/service/ChatMsgService.java +++ b/src/main/java/com/senmesh/component/chat/service/ChatMsgService.java @@ -1,10 +1,10 @@ -package com.newyetai.component.chat.service; +package com.senmesh.component.chat.service; import java.util.List; -import com.newyetai.component.chat.dto.ChatMsgQueryDTO; -import com.newyetai.component.chat.dto.ChatMsgCreateDTO; -import com.newyetai.component.chat.dto.ChatMsgDTO; +import com.senmesh.component.chat.dto.ChatMsgQueryDTO; +import com.senmesh.component.chat.dto.ChatMsgCreateDTO; +import com.senmesh.component.chat.dto.ChatMsgDTO; /** * 聊天消息 diff --git a/src/main/java/com/newyetai/component/chat/service/ChatService.java b/src/main/java/com/senmesh/component/chat/service/ChatService.java similarity index 80% rename from src/main/java/com/newyetai/component/chat/service/ChatService.java rename to src/main/java/com/senmesh/component/chat/service/ChatService.java index cae2b79..e36bea6 100644 --- a/src/main/java/com/newyetai/component/chat/service/ChatService.java +++ b/src/main/java/com/senmesh/component/chat/service/ChatService.java @@ -1,10 +1,10 @@ -package com.newyetai.component.chat.service; +package com.senmesh.component.chat.service; import java.util.List; -import com.newyetai.component.chat.dto.ChatQueryDTO; -import com.newyetai.component.chat.dto.ChatCreateDTO; -import com.newyetai.component.chat.dto.ChatDTO; +import com.senmesh.component.chat.dto.ChatQueryDTO; +import com.senmesh.component.chat.dto.ChatCreateDTO; +import com.senmesh.component.chat.dto.ChatDTO; /** * 聊天会话 diff --git a/src/main/java/com/newyetai/component/chat/service/impl/ChatMsgServiceImpl.java b/src/main/java/com/senmesh/component/chat/service/impl/ChatMsgServiceImpl.java similarity index 71% rename from src/main/java/com/newyetai/component/chat/service/impl/ChatMsgServiceImpl.java rename to src/main/java/com/senmesh/component/chat/service/impl/ChatMsgServiceImpl.java index c5220f4..74a1369 100644 --- a/src/main/java/com/newyetai/component/chat/service/impl/ChatMsgServiceImpl.java +++ b/src/main/java/com/senmesh/component/chat/service/impl/ChatMsgServiceImpl.java @@ -1,15 +1,14 @@ -package com.newyetai.component.chat.service.impl; +package com.senmesh.component.chat.service.impl; -import com.newyetai.component.chat.dto.ChatCreateDTO; -import com.newyetai.component.chat.dto.ChatDTO; -import com.newyetai.component.chat.dto.ChatQueryDTO; -import com.newyetai.component.chat.mapstruct.ChatMsgMapMapper; -import com.newyetai.component.chat.service.ChatService; -import com.newyetai.component.notice.constant.NoticeFirstTypeEnum; -import com.newyetai.component.notice.dto.NoticeMsgDTO; -import com.newyetai.component.notice.util.NoticeUtils; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.websocket.service.impl.WebsocketNoticeSendProvider; +import com.senmesh.component.chat.dto.ChatCreateDTO; +import com.senmesh.component.chat.dto.ChatDTO; +import com.senmesh.component.chat.dto.ChatQueryDTO; +import com.senmesh.component.chat.mapstruct.ChatMsgMapMapper; +import com.senmesh.component.chat.service.ChatService; +import com.senmesh.component.notice.constant.NoticeFirstTypeEnum; +import com.senmesh.component.notice.dto.NoticeMsgDTO; +import com.senmesh.component.notice.util.NoticeUtils; +import com.senmesh.usercenter.user.constant.UserTypeEnum; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,15 +16,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.component.chat.dao.ChatMsgMapper; -import com.newyetai.component.chat.service.ChatMsgService; -import com.newyetai.component.chat.dto.ChatMsgQueryDTO; -import com.newyetai.component.chat.dto.ChatMsgDTO; -import com.newyetai.component.chat.dto.ChatMsgCreateDTO; -import com.newyetai.component.chat.entity.ChatMsg; +import com.senmesh.component.chat.dao.ChatMsgMapper; +import com.senmesh.component.chat.service.ChatMsgService; +import com.senmesh.component.chat.dto.ChatMsgQueryDTO; +import com.senmesh.component.chat.dto.ChatMsgDTO; +import com.senmesh.component.chat.dto.ChatMsgCreateDTO; +import com.senmesh.component.chat.entity.ChatMsg; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.util.ListUtil; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/service/impl/ChatServiceImpl.java b/src/main/java/com/senmesh/component/chat/service/impl/ChatServiceImpl.java similarity index 67% rename from src/main/java/com/newyetai/component/chat/service/impl/ChatServiceImpl.java rename to src/main/java/com/senmesh/component/chat/service/impl/ChatServiceImpl.java index eedc9b9..bd0850e 100644 --- a/src/main/java/com/newyetai/component/chat/service/impl/ChatServiceImpl.java +++ b/src/main/java/com/senmesh/component/chat/service/impl/ChatServiceImpl.java @@ -1,32 +1,28 @@ -package com.newyetai.component.chat.service.impl; +package com.senmesh.component.chat.service.impl; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.component.chat.constant.ChatStatusEnum; -import com.newyetai.component.chat.mapstruct.ChatMapMapper; -import com.newyetai.component.dynamictable.entity.DynamicTable; -import com.newyetai.component.dynamictable.mapstruct.DynamicTableMapMapper; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.usercenter.user.dao.OrgUserMapper; -import com.newyetai.usercenter.user.dto.OrgUserDTO; -import com.newyetai.usercenter.user.dto.OrgUserQueryDTO; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.component.chat.constant.ChatStatusEnum; +import com.senmesh.component.chat.mapstruct.ChatMapMapper; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.usercenter.user.dao.OrgUserMapper; +import com.senmesh.usercenter.user.dto.OrgUserDTO; +import com.senmesh.usercenter.user.dto.OrgUserQueryDTO; import java.util.List; -import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.component.chat.dao.ChatMapper; -import com.newyetai.component.chat.service.ChatService; -import com.newyetai.component.chat.dto.ChatQueryDTO; -import com.newyetai.component.chat.dto.ChatDTO; -import com.newyetai.component.chat.dto.ChatCreateDTO; -import com.newyetai.component.chat.entity.Chat; +import com.senmesh.component.chat.dao.ChatMapper; +import com.senmesh.component.chat.service.ChatService; +import com.senmesh.component.chat.dto.ChatQueryDTO; +import com.senmesh.component.chat.dto.ChatDTO; +import com.senmesh.component.chat.dto.ChatCreateDTO; +import com.senmesh.component.chat.entity.Chat; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.util.ListUtil; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/util/ChatMsgUtils.java b/src/main/java/com/senmesh/component/chat/util/ChatMsgUtils.java similarity index 61% rename from src/main/java/com/newyetai/component/chat/util/ChatMsgUtils.java rename to src/main/java/com/senmesh/component/chat/util/ChatMsgUtils.java index a282f1c..9ceed4c 100644 --- a/src/main/java/com/newyetai/component/chat/util/ChatMsgUtils.java +++ b/src/main/java/com/senmesh/component/chat/util/ChatMsgUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.component.chat.util; +package com.senmesh.component.chat.util; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/chat/util/ChatUtils.java b/src/main/java/com/senmesh/component/chat/util/ChatUtils.java similarity index 60% rename from src/main/java/com/newyetai/component/chat/util/ChatUtils.java rename to src/main/java/com/senmesh/component/chat/util/ChatUtils.java index 2fa0145..8a01ccd 100644 --- a/src/main/java/com/newyetai/component/chat/util/ChatUtils.java +++ b/src/main/java/com/senmesh/component/chat/util/ChatUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.component.chat.util; +package com.senmesh.component.chat.util; /** * @author sr on 2025-05-29 diff --git a/src/main/java/com/newyetai/component/commonimport/constant/ImportDetailStatusEnum.java b/src/main/java/com/senmesh/component/commonimport/constant/ImportDetailStatusEnum.java similarity index 87% rename from src/main/java/com/newyetai/component/commonimport/constant/ImportDetailStatusEnum.java rename to src/main/java/com/senmesh/component/commonimport/constant/ImportDetailStatusEnum.java index 554ba19..02868fe 100644 --- a/src/main/java/com/newyetai/component/commonimport/constant/ImportDetailStatusEnum.java +++ b/src/main/java/com/senmesh/component/commonimport/constant/ImportDetailStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.constant; +package com.senmesh.component.commonimport.constant; /** * 通用导入明细状态 diff --git a/src/main/java/com/newyetai/component/commonimport/constant/ImportExecuteTypeEnum.java b/src/main/java/com/senmesh/component/commonimport/constant/ImportExecuteTypeEnum.java similarity index 87% rename from src/main/java/com/newyetai/component/commonimport/constant/ImportExecuteTypeEnum.java rename to src/main/java/com/senmesh/component/commonimport/constant/ImportExecuteTypeEnum.java index 6584b47..870e7b2 100644 --- a/src/main/java/com/newyetai/component/commonimport/constant/ImportExecuteTypeEnum.java +++ b/src/main/java/com/senmesh/component/commonimport/constant/ImportExecuteTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.constant; +package com.senmesh.component.commonimport.constant; /** * 指定执行类型 diff --git a/src/main/java/com/newyetai/component/commonimport/constant/ImportStatusEnum.java b/src/main/java/com/senmesh/component/commonimport/constant/ImportStatusEnum.java similarity index 95% rename from src/main/java/com/newyetai/component/commonimport/constant/ImportStatusEnum.java rename to src/main/java/com/senmesh/component/commonimport/constant/ImportStatusEnum.java index bb747f5..457b1b9 100644 --- a/src/main/java/com/newyetai/component/commonimport/constant/ImportStatusEnum.java +++ b/src/main/java/com/senmesh/component/commonimport/constant/ImportStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.constant; +package com.senmesh.component.commonimport.constant; import java.util.Map; diff --git a/src/main/java/com/newyetai/component/commonimport/constant/ImportTypeEnum.java b/src/main/java/com/senmesh/component/commonimport/constant/ImportTypeEnum.java similarity index 94% rename from src/main/java/com/newyetai/component/commonimport/constant/ImportTypeEnum.java rename to src/main/java/com/senmesh/component/commonimport/constant/ImportTypeEnum.java index 0dd6009..46172c8 100644 --- a/src/main/java/com/newyetai/component/commonimport/constant/ImportTypeEnum.java +++ b/src/main/java/com/senmesh/component/commonimport/constant/ImportTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.constant; +package com.senmesh.component.commonimport.constant; import java.util.Map; diff --git a/src/main/java/com/newyetai/component/commonimport/controller/CommonImportController.java b/src/main/java/com/senmesh/component/commonimport/controller/CommonImportController.java similarity index 83% rename from src/main/java/com/newyetai/component/commonimport/controller/CommonImportController.java rename to src/main/java/com/senmesh/component/commonimport/controller/CommonImportController.java index 17fe6ff..d5ae573 100644 --- a/src/main/java/com/newyetai/component/commonimport/controller/CommonImportController.java +++ b/src/main/java/com/senmesh/component/commonimport/controller/CommonImportController.java @@ -1,6 +1,5 @@ -package com.newyetai.component.commonimport.controller; +package com.senmesh.component.commonimport.controller; -import java.util.List; import java.util.Map; import org.apache.poi.ss.formula.functions.T; @@ -11,19 +10,18 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.component.commonimport.dto.ImportDetailPageDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateFormDTO; -import com.newyetai.component.commonimport.dto.ImportMainDTO; -import com.newyetai.component.commonimport.dto.ImportMainQueryDTO; -import com.newyetai.component.commonimport.service.impl.CommonImportAdapter; -import com.newyetai.config.dto.ConfigDTO; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.component.commonimport.dto.ImportDetailPageDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateFormDTO; +import com.senmesh.component.commonimport.dto.ImportMainDTO; +import com.senmesh.component.commonimport.dto.ImportMainQueryDTO; +import com.senmesh.component.commonimport.service.impl.CommonImportAdapter; +import com.senmesh.config.dto.ConfigDTO; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/component/commonimport/dao/ImportMainMapper.java b/src/main/java/com/senmesh/component/commonimport/dao/ImportMainMapper.java similarity index 56% rename from src/main/java/com/newyetai/component/commonimport/dao/ImportMainMapper.java rename to src/main/java/com/senmesh/component/commonimport/dao/ImportMainMapper.java index d36d481..4cde287 100644 --- a/src/main/java/com/newyetai/component/commonimport/dao/ImportMainMapper.java +++ b/src/main/java/com/senmesh/component/commonimport/dao/ImportMainMapper.java @@ -1,14 +1,14 @@ -package com.newyetai.component.commonimport.dao; +package com.senmesh.component.commonimport.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.component.commonimport.dto.ImportMainDTO; -import com.newyetai.component.commonimport.dto.ImportMainQueryDTO; -import com.newyetai.component.commonimport.dto.ImportMainUpdateDTO; -import com.newyetai.component.commonimport.entity.UcImportMain; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.component.commonimport.dto.ImportMainDTO; +import com.senmesh.component.commonimport.dto.ImportMainQueryDTO; +import com.senmesh.component.commonimport.dto.ImportMainUpdateDTO; +import com.senmesh.component.commonimport.entity.UcImportMain; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 通用导入 diff --git a/src/main/java/com/newyetai/component/commonimport/dto/ImportDetailPageDTO.java b/src/main/java/com/senmesh/component/commonimport/dto/ImportDetailPageDTO.java similarity index 92% rename from src/main/java/com/newyetai/component/commonimport/dto/ImportDetailPageDTO.java rename to src/main/java/com/senmesh/component/commonimport/dto/ImportDetailPageDTO.java index b5454d4..48a2c93 100644 --- a/src/main/java/com/newyetai/component/commonimport/dto/ImportDetailPageDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/dto/ImportDetailPageDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.dto; +package com.senmesh.component.commonimport.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/component/commonimport/dto/ImportDetailSuperDTO.java b/src/main/java/com/senmesh/component/commonimport/dto/ImportDetailSuperDTO.java similarity index 82% rename from src/main/java/com/newyetai/component/commonimport/dto/ImportDetailSuperDTO.java rename to src/main/java/com/senmesh/component/commonimport/dto/ImportDetailSuperDTO.java index 57bcace..13606d1 100644 --- a/src/main/java/com/newyetai/component/commonimport/dto/ImportDetailSuperDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/dto/ImportDetailSuperDTO.java @@ -1,11 +1,9 @@ -package com.newyetai.component.commonimport.dto; +package com.senmesh.component.commonimport.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.component.action.dto.ActionDetailDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/component/commonimport/dto/ImportExecuteSuperDTO.java b/src/main/java/com/senmesh/component/commonimport/dto/ImportExecuteSuperDTO.java similarity index 94% rename from src/main/java/com/newyetai/component/commonimport/dto/ImportExecuteSuperDTO.java rename to src/main/java/com/senmesh/component/commonimport/dto/ImportExecuteSuperDTO.java index 9932812..1f4952c 100644 --- a/src/main/java/com/newyetai/component/commonimport/dto/ImportExecuteSuperDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/dto/ImportExecuteSuperDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.dto; +package com.senmesh.component.commonimport.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainCreateDTO.java b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainCreateDTO.java similarity index 85% rename from src/main/java/com/newyetai/component/commonimport/dto/ImportMainCreateDTO.java rename to src/main/java/com/senmesh/component/commonimport/dto/ImportMainCreateDTO.java index cb47580..0bbdd17 100644 --- a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainCreateDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainCreateDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.component.commonimport.dto; +package com.senmesh.component.commonimport.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.component.commonimport.constant.ImportExecuteTypeEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.component.commonimport.constant.ImportExecuteTypeEnum; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainCreateFormDTO.java b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainCreateFormDTO.java similarity index 89% rename from src/main/java/com/newyetai/component/commonimport/dto/ImportMainCreateFormDTO.java rename to src/main/java/com/senmesh/component/commonimport/dto/ImportMainCreateFormDTO.java index 39be333..0dca8e5 100644 --- a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainCreateFormDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainCreateFormDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.dto; +package com.senmesh.component.commonimport.dto; import java.util.List; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.Map; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainDTO.java b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainDTO.java similarity index 94% rename from src/main/java/com/newyetai/component/commonimport/dto/ImportMainDTO.java rename to src/main/java/com/senmesh/component/commonimport/dto/ImportMainDTO.java index 382c157..b118641 100644 --- a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.component.commonimport.dto; +package com.senmesh.component.commonimport.dto; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainQueryDTO.java b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainQueryDTO.java similarity index 95% rename from src/main/java/com/newyetai/component/commonimport/dto/ImportMainQueryDTO.java rename to src/main/java/com/senmesh/component/commonimport/dto/ImportMainQueryDTO.java index c174f3f..1bc5537 100644 --- a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainQueryDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.dto; +package com.senmesh.component.commonimport.dto; import io.swagger.annotations.ApiModelProperty; @@ -13,7 +13,7 @@ import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2024-01-19 diff --git a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainUpdateDTO.java b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainUpdateDTO.java similarity index 91% rename from src/main/java/com/newyetai/component/commonimport/dto/ImportMainUpdateDTO.java rename to src/main/java/com/senmesh/component/commonimport/dto/ImportMainUpdateDTO.java index da84a8e..725ad9e 100644 --- a/src/main/java/com/newyetai/component/commonimport/dto/ImportMainUpdateDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/dto/ImportMainUpdateDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.component.commonimport.dto; +package com.senmesh.component.commonimport.dto; import java.util.Date; import java.util.Set; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/commonimport/entity/UcImportMain.java b/src/main/java/com/senmesh/component/commonimport/entity/UcImportMain.java similarity index 93% rename from src/main/java/com/newyetai/component/commonimport/entity/UcImportMain.java rename to src/main/java/com/senmesh/component/commonimport/entity/UcImportMain.java index 4bd3d0a..76e8b50 100644 --- a/src/main/java/com/newyetai/component/commonimport/entity/UcImportMain.java +++ b/src/main/java/com/senmesh/component/commonimport/entity/UcImportMain.java @@ -1,9 +1,9 @@ -package com.newyetai.component.commonimport.entity; +package com.senmesh.component.commonimport.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/component/commonimport/mapper/ImportMainMapper.xml b/src/main/java/com/senmesh/component/commonimport/mapper/ImportMainMapper.xml similarity index 92% rename from src/main/java/com/newyetai/component/commonimport/mapper/ImportMainMapper.xml rename to src/main/java/com/senmesh/component/commonimport/mapper/ImportMainMapper.xml index 64d8f80..4c3ff6a 100644 --- a/src/main/java/com/newyetai/component/commonimport/mapper/ImportMainMapper.xml +++ b/src/main/java/com/senmesh/component/commonimport/mapper/ImportMainMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_import_main diff --git a/src/main/java/com/newyetai/component/commonimport/mapstruct/ImportMainMapMapper.java b/src/main/java/com/senmesh/component/commonimport/mapstruct/ImportMainMapMapper.java similarity index 62% rename from src/main/java/com/newyetai/component/commonimport/mapstruct/ImportMainMapMapper.java rename to src/main/java/com/senmesh/component/commonimport/mapstruct/ImportMainMapMapper.java index 966dacc..93fb4b6 100644 --- a/src/main/java/com/newyetai/component/commonimport/mapstruct/ImportMainMapMapper.java +++ b/src/main/java/com/senmesh/component/commonimport/mapstruct/ImportMainMapMapper.java @@ -1,12 +1,12 @@ -package com.newyetai.component.commonimport.mapstruct; +package com.senmesh.component.commonimport.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.commonimport.dto.ImportMainCreateDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateFormDTO; -import com.newyetai.component.commonimport.dto.ImportMainDTO; -import com.newyetai.component.commonimport.entity.UcImportMain; +import com.senmesh.component.commonimport.dto.ImportMainCreateDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateFormDTO; +import com.senmesh.component.commonimport.dto.ImportMainDTO; +import com.senmesh.component.commonimport.entity.UcImportMain; /** * @author sr on 2024-01-19 diff --git a/src/main/java/com/newyetai/component/commonimport/service/ICommonImportProvider.java b/src/main/java/com/senmesh/component/commonimport/service/ICommonImportProvider.java similarity index 74% rename from src/main/java/com/newyetai/component/commonimport/service/ICommonImportProvider.java rename to src/main/java/com/senmesh/component/commonimport/service/ICommonImportProvider.java index f1ab162..33075ff 100644 --- a/src/main/java/com/newyetai/component/commonimport/service/ICommonImportProvider.java +++ b/src/main/java/com/senmesh/component/commonimport/service/ICommonImportProvider.java @@ -1,13 +1,13 @@ -package com.newyetai.component.commonimport.service; +package com.senmesh.component.commonimport.service; import java.util.List; -import com.newyetai.component.commonimport.dto.ImportDetailPageDTO; -import com.newyetai.component.commonimport.dto.ImportDetailSuperDTO; -import com.newyetai.component.commonimport.dto.ImportExecuteSuperDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateFormDTO; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.component.commonimport.dto.ImportDetailPageDTO; +import com.senmesh.component.commonimport.dto.ImportDetailSuperDTO; +import com.senmesh.component.commonimport.dto.ImportExecuteSuperDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateFormDTO; +import com.senmesh.tkmybatis.pojo.Page; public interface ICommonImportProvider { diff --git a/src/main/java/com/newyetai/component/commonimport/service/IImportDetailForm.java b/src/main/java/com/senmesh/component/commonimport/service/IImportDetailForm.java similarity index 63% rename from src/main/java/com/newyetai/component/commonimport/service/IImportDetailForm.java rename to src/main/java/com/senmesh/component/commonimport/service/IImportDetailForm.java index dc72d1d..4043c56 100644 --- a/src/main/java/com/newyetai/component/commonimport/service/IImportDetailForm.java +++ b/src/main/java/com/senmesh/component/commonimport/service/IImportDetailForm.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.service; +package com.senmesh.component.commonimport.service; /** * 明细form diff --git a/src/main/java/com/newyetai/component/commonimport/service/ImportDetailSuperQueryDTO.java b/src/main/java/com/senmesh/component/commonimport/service/ImportDetailSuperQueryDTO.java similarity index 74% rename from src/main/java/com/newyetai/component/commonimport/service/ImportDetailSuperQueryDTO.java rename to src/main/java/com/senmesh/component/commonimport/service/ImportDetailSuperQueryDTO.java index 1c3d100..55715b8 100644 --- a/src/main/java/com/newyetai/component/commonimport/service/ImportDetailSuperQueryDTO.java +++ b/src/main/java/com/senmesh/component/commonimport/service/ImportDetailSuperQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.service; +package com.senmesh.component.commonimport.service; /** * @description: 导入详情分页查询 diff --git a/src/main/java/com/newyetai/component/commonimport/service/ImportMainService.java b/src/main/java/com/senmesh/component/commonimport/service/ImportMainService.java similarity index 75% rename from src/main/java/com/newyetai/component/commonimport/service/ImportMainService.java rename to src/main/java/com/senmesh/component/commonimport/service/ImportMainService.java index ca6cadc..901343d 100644 --- a/src/main/java/com/newyetai/component/commonimport/service/ImportMainService.java +++ b/src/main/java/com/senmesh/component/commonimport/service/ImportMainService.java @@ -1,12 +1,12 @@ -package com.newyetai.component.commonimport.service; +package com.senmesh.component.commonimport.service; import java.util.List; -import com.newyetai.component.commonimport.dto.ImportMainCreateDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateFormDTO; -import com.newyetai.component.commonimport.dto.ImportMainDTO; -import com.newyetai.component.commonimport.dto.ImportMainQueryDTO; -import com.newyetai.component.commonimport.dto.ImportMainUpdateDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateFormDTO; +import com.senmesh.component.commonimport.dto.ImportMainDTO; +import com.senmesh.component.commonimport.dto.ImportMainQueryDTO; +import com.senmesh.component.commonimport.dto.ImportMainUpdateDTO; /** * 通用导入 diff --git a/src/main/java/com/newyetai/component/commonimport/service/impl/AbstractCommonImportProvider.java b/src/main/java/com/senmesh/component/commonimport/service/impl/AbstractCommonImportProvider.java similarity index 79% rename from src/main/java/com/newyetai/component/commonimport/service/impl/AbstractCommonImportProvider.java rename to src/main/java/com/senmesh/component/commonimport/service/impl/AbstractCommonImportProvider.java index d186ddf..f9e283c 100644 --- a/src/main/java/com/newyetai/component/commonimport/service/impl/AbstractCommonImportProvider.java +++ b/src/main/java/com/senmesh/component/commonimport/service/impl/AbstractCommonImportProvider.java @@ -1,36 +1,36 @@ -package com.newyetai.component.commonimport.service.impl; +package com.senmesh.component.commonimport.service.impl; import java.util.Date; import java.util.List; import com.google.common.collect.Sets; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.MockUtils; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.component.asyntasknotice.constant.AsyncTaskTypeEnum; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; -import com.newyetai.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; -import com.newyetai.component.asyntasknotice.util.AsyncTaskNoticeUtils; -import com.newyetai.component.commonimport.constant.ImportDetailStatusEnum; -import com.newyetai.component.commonimport.constant.ImportExecuteTypeEnum; -import com.newyetai.component.commonimport.constant.ImportStatusEnum; -import com.newyetai.component.commonimport.constant.ImportTypeEnum; -import com.newyetai.component.commonimport.dto.ImportDetailSuperDTO; -import com.newyetai.component.commonimport.dto.ImportExecuteSuperDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateFormDTO; -import com.newyetai.component.commonimport.dto.ImportMainDTO; -import com.newyetai.component.commonimport.dto.ImportMainQueryDTO; -import com.newyetai.component.commonimport.dto.ImportMainUpdateDTO; -import com.newyetai.component.commonimport.service.ICommonImportProvider; -import com.newyetai.component.commonimport.service.IImportDetailForm; -import com.newyetai.component.commonimport.service.ImportMainService; -import com.newyetai.mq.consumer.handler.ITopicMqHandler; -import com.newyetai.mq.dto.TopicMqMessage; -import com.newyetai.mq.util.MqSendUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.MockUtils; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.component.asyntasknotice.constant.AsyncTaskTypeEnum; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeCreateDTO; +import com.senmesh.component.asyntasknotice.dto.AsyncTaskNoticeFinishDTO; +import com.senmesh.component.asyntasknotice.util.AsyncTaskNoticeUtils; +import com.senmesh.component.commonimport.constant.ImportDetailStatusEnum; +import com.senmesh.component.commonimport.constant.ImportExecuteTypeEnum; +import com.senmesh.component.commonimport.constant.ImportStatusEnum; +import com.senmesh.component.commonimport.constant.ImportTypeEnum; +import com.senmesh.component.commonimport.dto.ImportDetailSuperDTO; +import com.senmesh.component.commonimport.dto.ImportExecuteSuperDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateFormDTO; +import com.senmesh.component.commonimport.dto.ImportMainDTO; +import com.senmesh.component.commonimport.dto.ImportMainQueryDTO; +import com.senmesh.component.commonimport.dto.ImportMainUpdateDTO; +import com.senmesh.component.commonimport.service.ICommonImportProvider; +import com.senmesh.component.commonimport.service.IImportDetailForm; +import com.senmesh.component.commonimport.service.ImportMainService; +import com.senmesh.mq.consumer.handler.ITopicMqHandler; +import com.senmesh.mq.dto.TopicMqMessage; +import com.senmesh.mq.util.MqSendUtils; import org.springframework.aop.framework.AopContext; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/newyetai/component/commonimport/service/impl/CommonImportAdapter.java b/src/main/java/com/senmesh/component/commonimport/service/impl/CommonImportAdapter.java similarity index 80% rename from src/main/java/com/newyetai/component/commonimport/service/impl/CommonImportAdapter.java rename to src/main/java/com/senmesh/component/commonimport/service/impl/CommonImportAdapter.java index a6646ee..e5751a9 100644 --- a/src/main/java/com/newyetai/component/commonimport/service/impl/CommonImportAdapter.java +++ b/src/main/java/com/senmesh/component/commonimport/service/impl/CommonImportAdapter.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.service.impl; +package com.senmesh.component.commonimport.service.impl; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -15,22 +15,21 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.Maps; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.component.commonimport.dto.ImportDetailPageDTO; -import com.newyetai.component.commonimport.dto.ImportExecuteSuperDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateFormDTO; -import com.newyetai.component.commonimport.dto.ImportMainDTO; -import com.newyetai.component.commonimport.dto.ImportMainQueryDTO; -import com.newyetai.component.commonimport.service.ICommonImportProvider; -import com.newyetai.component.commonimport.service.IImportDetailForm; -import com.newyetai.component.commonimport.service.ImportDetailSuperQueryDTO; -import com.newyetai.component.commonimport.service.ImportMainService; -import com.newyetai.config.dto.ConfigDTO; -import com.newyetai.config.service.ConfigService; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.component.commonimport.dto.ImportDetailPageDTO; +import com.senmesh.component.commonimport.dto.ImportExecuteSuperDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateFormDTO; +import com.senmesh.component.commonimport.dto.ImportMainDTO; +import com.senmesh.component.commonimport.dto.ImportMainQueryDTO; +import com.senmesh.component.commonimport.service.ICommonImportProvider; +import com.senmesh.component.commonimport.service.IImportDetailForm; +import com.senmesh.component.commonimport.service.ImportMainService; +import com.senmesh.config.dto.ConfigDTO; +import com.senmesh.config.service.ConfigService; +import com.senmesh.tkmybatis.pojo.Page; @Service @ConditionalOnBean(AbstractCommonImportProvider.class) diff --git a/src/main/java/com/newyetai/component/commonimport/service/impl/ImportMainServiceImpl.java b/src/main/java/com/senmesh/component/commonimport/service/impl/ImportMainServiceImpl.java similarity index 69% rename from src/main/java/com/newyetai/component/commonimport/service/impl/ImportMainServiceImpl.java rename to src/main/java/com/senmesh/component/commonimport/service/impl/ImportMainServiceImpl.java index 2f3d339..ccd5e19 100644 --- a/src/main/java/com/newyetai/component/commonimport/service/impl/ImportMainServiceImpl.java +++ b/src/main/java/com/senmesh/component/commonimport/service/impl/ImportMainServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.component.commonimport.service.impl; +package com.senmesh.component.commonimport.service.impl; import java.util.List; @@ -6,23 +6,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.codegenerator.util.CodeUtils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.commonimport.constant.ImportExecuteTypeEnum; -import com.newyetai.component.commonimport.constant.ImportStatusEnum; -import com.newyetai.component.commonimport.dao.ImportMainMapper; -import com.newyetai.component.commonimport.dto.ImportMainCreateDTO; -import com.newyetai.component.commonimport.dto.ImportMainCreateFormDTO; -import com.newyetai.component.commonimport.dto.ImportMainDTO; -import com.newyetai.component.commonimport.dto.ImportMainQueryDTO; -import com.newyetai.component.commonimport.dto.ImportMainUpdateDTO; -import com.newyetai.component.commonimport.entity.UcImportMain; -import com.newyetai.component.commonimport.mapstruct.ImportMainMapMapper; -import com.newyetai.component.commonimport.service.ImportMainService; -import com.newyetai.component.constants.CodeTypeEnum; +import com.senmesh.codegenerator.util.CodeUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.commonimport.constant.ImportExecuteTypeEnum; +import com.senmesh.component.commonimport.constant.ImportStatusEnum; +import com.senmesh.component.commonimport.dao.ImportMainMapper; +import com.senmesh.component.commonimport.dto.ImportMainCreateDTO; +import com.senmesh.component.commonimport.dto.ImportMainCreateFormDTO; +import com.senmesh.component.commonimport.dto.ImportMainDTO; +import com.senmesh.component.commonimport.dto.ImportMainQueryDTO; +import com.senmesh.component.commonimport.dto.ImportMainUpdateDTO; +import com.senmesh.component.commonimport.entity.UcImportMain; +import com.senmesh.component.commonimport.mapstruct.ImportMainMapMapper; +import com.senmesh.component.commonimport.service.ImportMainService; +import com.senmesh.component.constants.CodeTypeEnum; /** * @author sr on 2024-01-19 diff --git a/src/main/java/com/newyetai/component/constants/CodeTypeEnum.java b/src/main/java/com/senmesh/component/constants/CodeTypeEnum.java similarity index 82% rename from src/main/java/com/newyetai/component/constants/CodeTypeEnum.java rename to src/main/java/com/senmesh/component/constants/CodeTypeEnum.java index 7bc1584..f16f2a2 100644 --- a/src/main/java/com/newyetai/component/constants/CodeTypeEnum.java +++ b/src/main/java/com/senmesh/component/constants/CodeTypeEnum.java @@ -1,6 +1,6 @@ -package com.newyetai.component.constants; +package com.senmesh.component.constants; -import com.newyetai.codegenerator.pojo.CodeParam; +import com.senmesh.codegenerator.pojo.CodeParam; /** * @author sr on 2020-08-04 diff --git a/src/main/java/com/newyetai/component/dict/controller/DictController.java b/src/main/java/com/senmesh/component/dict/controller/DictController.java similarity index 79% rename from src/main/java/com/newyetai/component/dict/controller/DictController.java rename to src/main/java/com/senmesh/component/dict/controller/DictController.java index ffe56cd..9455f71 100644 --- a/src/main/java/com/newyetai/component/dict/controller/DictController.java +++ b/src/main/java/com/senmesh/component/dict/controller/DictController.java @@ -1,15 +1,15 @@ -package com.newyetai.component.dict.controller; +package com.senmesh.component.dict.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.dict.dto.DictDTO; -import com.newyetai.component.dict.dto.DictDetailQueryDTO; -import com.newyetai.component.dict.dto.DictQueryDTO; -import com.newyetai.component.dict.dto.DropdownDictDetailDTO; -import com.newyetai.component.dict.service.DictCacheService; -import com.newyetai.component.dict.service.DictDetailService; -import com.newyetai.component.dict.service.DictService; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.dict.dto.DictDTO; +import com.senmesh.component.dict.dto.DictDetailQueryDTO; +import com.senmesh.component.dict.dto.DictQueryDTO; +import com.senmesh.component.dict.dto.DropdownDictDetailDTO; +import com.senmesh.component.dict.service.DictCacheService; +import com.senmesh.component.dict.service.DictDetailService; +import com.senmesh.component.dict.service.DictService; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/component/dict/dao/DictDetailMapper.java b/src/main/java/com/senmesh/component/dict/dao/DictDetailMapper.java similarity index 68% rename from src/main/java/com/newyetai/component/dict/dao/DictDetailMapper.java rename to src/main/java/com/senmesh/component/dict/dao/DictDetailMapper.java index 3089cb2..ebcace3 100644 --- a/src/main/java/com/newyetai/component/dict/dao/DictDetailMapper.java +++ b/src/main/java/com/senmesh/component/dict/dao/DictDetailMapper.java @@ -1,15 +1,15 @@ -package com.newyetai.component.dict.dao; +package com.senmesh.component.dict.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.component.dict.dto.DictDetailDTO; -import com.newyetai.component.dict.dto.DictDetailQueryDTO; -import com.newyetai.component.dict.dto.DropdownDictDetailDTO; -import com.newyetai.component.dict.entity.DictDetail; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.dto.DictDetailQueryDTO; +import com.senmesh.component.dict.dto.DropdownDictDetailDTO; +import com.senmesh.component.dict.entity.DictDetail; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.tkmybatis.pojo.Page; /** * @author Rey(leijiaping@newyetai.com) diff --git a/src/main/java/com/newyetai/component/dict/dao/DictMapper.java b/src/main/java/com/senmesh/component/dict/dao/DictMapper.java similarity index 55% rename from src/main/java/com/newyetai/component/dict/dao/DictMapper.java rename to src/main/java/com/senmesh/component/dict/dao/DictMapper.java index 17f0a3f..0e4f9ff 100644 --- a/src/main/java/com/newyetai/component/dict/dao/DictMapper.java +++ b/src/main/java/com/senmesh/component/dict/dao/DictMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.component.dict.dao; +package com.senmesh.component.dict.dao; -import com.newyetai.component.dict.dto.DictDTO; -import com.newyetai.component.dict.dto.DictQueryDTO; -import com.newyetai.component.dict.entity.Dict; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.component.dict.dto.DictDTO; +import com.senmesh.component.dict.dto.DictQueryDTO; +import com.senmesh.component.dict.entity.Dict; +import com.senmesh.tkmybatis.mybatis.MyMapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/component/dict/dto/DictDTO.java b/src/main/java/com/senmesh/component/dict/dto/DictDTO.java similarity index 79% rename from src/main/java/com/newyetai/component/dict/dto/DictDTO.java rename to src/main/java/com/senmesh/component/dict/dto/DictDTO.java index 6b3dec1..c5237c9 100644 --- a/src/main/java/com/newyetai/component/dict/dto/DictDTO.java +++ b/src/main/java/com/senmesh/component/dict/dto/DictDTO.java @@ -1,15 +1,12 @@ -package com.newyetai.component.dict.dto; +package com.senmesh.component.dict.dto; import java.io.Serializable; -import java.util.Date; import java.util.List; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.component.action.dto.ActionDetailDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/component/dict/dto/DictDetailDTO.java b/src/main/java/com/senmesh/component/dict/dto/DictDetailDTO.java similarity index 84% rename from src/main/java/com/newyetai/component/dict/dto/DictDetailDTO.java rename to src/main/java/com/senmesh/component/dict/dto/DictDetailDTO.java index a2d715a..c9c4a5b 100644 --- a/src/main/java/com/newyetai/component/dict/dto/DictDetailDTO.java +++ b/src/main/java/com/senmesh/component/dict/dto/DictDetailDTO.java @@ -1,15 +1,13 @@ -package com.newyetai.component.dict.dto; +package com.senmesh.component.dict.dto; import com.google.common.collect.Lists; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.util.TreeNode; -import com.newyetai.component.action.dto.ActionDetailDTO; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.util.TreeNode; import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.SuperBuilder; -import java.util.Date; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/com/newyetai/component/dict/dto/DictDetailQueryDTO.java b/src/main/java/com/senmesh/component/dict/dto/DictDetailQueryDTO.java similarity index 93% rename from src/main/java/com/newyetai/component/dict/dto/DictDetailQueryDTO.java rename to src/main/java/com/senmesh/component/dict/dto/DictDetailQueryDTO.java index 979d622..2923236 100644 --- a/src/main/java/com/newyetai/component/dict/dto/DictDetailQueryDTO.java +++ b/src/main/java/com/senmesh/component/dict/dto/DictDetailQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.component.dict.dto; +package com.senmesh.component.dict.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/dict/dto/DictQueryDTO.java b/src/main/java/com/senmesh/component/dict/dto/DictQueryDTO.java similarity index 88% rename from src/main/java/com/newyetai/component/dict/dto/DictQueryDTO.java rename to src/main/java/com/senmesh/component/dict/dto/DictQueryDTO.java index 7c90253..3a5e160 100644 --- a/src/main/java/com/newyetai/component/dict/dto/DictQueryDTO.java +++ b/src/main/java/com/senmesh/component/dict/dto/DictQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.component.dict.dto; +package com.senmesh.component.dict.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/component/dict/dto/DropdownDictDetailDTO.java b/src/main/java/com/senmesh/component/dict/dto/DropdownDictDetailDTO.java similarity index 95% rename from src/main/java/com/newyetai/component/dict/dto/DropdownDictDetailDTO.java rename to src/main/java/com/senmesh/component/dict/dto/DropdownDictDetailDTO.java index 3067cb6..17caad3 100644 --- a/src/main/java/com/newyetai/component/dict/dto/DropdownDictDetailDTO.java +++ b/src/main/java/com/senmesh/component/dict/dto/DropdownDictDetailDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dict.dto; +package com.senmesh.component.dict.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/component/dict/entity/Dict.java b/src/main/java/com/senmesh/component/dict/entity/Dict.java similarity index 91% rename from src/main/java/com/newyetai/component/dict/entity/Dict.java rename to src/main/java/com/senmesh/component/dict/entity/Dict.java index 1d05049..8f14220 100644 --- a/src/main/java/com/newyetai/component/dict/entity/Dict.java +++ b/src/main/java/com/senmesh/component/dict/entity/Dict.java @@ -1,9 +1,9 @@ -package com.newyetai.component.dict.entity; +package com.senmesh.component.dict.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/component/dict/entity/DictDetail.java b/src/main/java/com/senmesh/component/dict/entity/DictDetail.java similarity index 93% rename from src/main/java/com/newyetai/component/dict/entity/DictDetail.java rename to src/main/java/com/senmesh/component/dict/entity/DictDetail.java index 68f8d8c..6e0c772 100644 --- a/src/main/java/com/newyetai/component/dict/entity/DictDetail.java +++ b/src/main/java/com/senmesh/component/dict/entity/DictDetail.java @@ -1,9 +1,9 @@ -package com.newyetai.component.dict.entity; +package com.senmesh.component.dict.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/component/dict/mapper/DictDetailMapper.xml b/src/main/java/com/senmesh/component/dict/mapper/DictDetailMapper.xml similarity index 90% rename from src/main/java/com/newyetai/component/dict/mapper/DictDetailMapper.xml rename to src/main/java/com/senmesh/component/dict/mapper/DictDetailMapper.xml index 98a4321..d0b4082 100644 --- a/src/main/java/com/newyetai/component/dict/mapper/DictDetailMapper.xml +++ b/src/main/java/com/senmesh/component/dict/mapper/DictDetailMapper.xml @@ -2,7 +2,7 @@ - + from @@ -49,7 +49,7 @@ - select detail.*, (select dict_detail_name from xs_dict_detail son where son.id = detail.parent_id) as parent_name, @@ -58,7 +58,7 @@ order by detail.dict_order - SELECT detail.id as detail_id, dict.dict_code as 'type', diff --git a/src/main/java/com/newyetai/component/dict/mapper/DictMapper.xml b/src/main/java/com/senmesh/component/dict/mapper/DictMapper.xml similarity index 86% rename from src/main/java/com/newyetai/component/dict/mapper/DictMapper.xml rename to src/main/java/com/senmesh/component/dict/mapper/DictMapper.xml index e66f20d..a773c14 100644 --- a/src/main/java/com/newyetai/component/dict/mapper/DictMapper.xml +++ b/src/main/java/com/senmesh/component/dict/mapper/DictMapper.xml @@ -2,9 +2,9 @@ - + - SELECT * FROM xs_dict deleted = 0 diff --git a/src/main/java/com/newyetai/component/dict/mapstruct/DictDetailMapMapper.java b/src/main/java/com/senmesh/component/dict/mapstruct/DictDetailMapMapper.java similarity index 70% rename from src/main/java/com/newyetai/component/dict/mapstruct/DictDetailMapMapper.java rename to src/main/java/com/senmesh/component/dict/mapstruct/DictDetailMapMapper.java index 61a6f65..207beaa 100644 --- a/src/main/java/com/newyetai/component/dict/mapstruct/DictDetailMapMapper.java +++ b/src/main/java/com/senmesh/component/dict/mapstruct/DictDetailMapMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.component.dict.mapstruct; +package com.senmesh.component.dict.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.dict.dto.DictDetailDTO; -import com.newyetai.component.dict.entity.DictDetail; +import com.senmesh.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.entity.DictDetail; /** * @author sr on 2020-07-30 diff --git a/src/main/java/com/newyetai/component/dict/mapstruct/DictMapMapper.java b/src/main/java/com/senmesh/component/dict/mapstruct/DictMapMapper.java similarity index 74% rename from src/main/java/com/newyetai/component/dict/mapstruct/DictMapMapper.java rename to src/main/java/com/senmesh/component/dict/mapstruct/DictMapMapper.java index f13c634..ef6827c 100644 --- a/src/main/java/com/newyetai/component/dict/mapstruct/DictMapMapper.java +++ b/src/main/java/com/senmesh/component/dict/mapstruct/DictMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.component.dict.mapstruct; +package com.senmesh.component.dict.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.dict.dto.DictDTO; -import com.newyetai.component.dict.dto.DictQueryDTO; -import com.newyetai.component.dict.entity.Dict; +import com.senmesh.component.dict.dto.DictDTO; +import com.senmesh.component.dict.dto.DictQueryDTO; +import com.senmesh.component.dict.entity.Dict; /** * @author sr on 2020-07-30 diff --git a/src/main/java/com/newyetai/component/dict/service/DictCacheService.java b/src/main/java/com/senmesh/component/dict/service/DictCacheService.java similarity index 88% rename from src/main/java/com/newyetai/component/dict/service/DictCacheService.java rename to src/main/java/com/senmesh/component/dict/service/DictCacheService.java index 8b67686..bc1c018 100644 --- a/src/main/java/com/newyetai/component/dict/service/DictCacheService.java +++ b/src/main/java/com/senmesh/component/dict/service/DictCacheService.java @@ -1,8 +1,8 @@ -package com.newyetai.component.dict.service; +package com.senmesh.component.dict.service; import java.util.List; -import com.newyetai.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.dto.DictDetailDTO; /** * 字典缓存 diff --git a/src/main/java/com/newyetai/component/dict/service/DictDetailService.java b/src/main/java/com/senmesh/component/dict/service/DictDetailService.java similarity index 88% rename from src/main/java/com/newyetai/component/dict/service/DictDetailService.java rename to src/main/java/com/senmesh/component/dict/service/DictDetailService.java index 12b6fab..a82511f 100644 --- a/src/main/java/com/newyetai/component/dict/service/DictDetailService.java +++ b/src/main/java/com/senmesh/component/dict/service/DictDetailService.java @@ -1,9 +1,9 @@ -package com.newyetai.component.dict.service; +package com.senmesh.component.dict.service; -import com.newyetai.component.dict.dto.DictDetailDTO; -import com.newyetai.component.dict.dto.DictDetailQueryDTO; -import com.newyetai.component.dict.dto.DropdownDictDetailDTO; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.dto.DictDetailQueryDTO; +import com.senmesh.component.dict.dto.DropdownDictDetailDTO; +import com.senmesh.tkmybatis.pojo.Page; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/newyetai/component/dict/service/DictService.java b/src/main/java/com/senmesh/component/dict/service/DictService.java similarity index 80% rename from src/main/java/com/newyetai/component/dict/service/DictService.java rename to src/main/java/com/senmesh/component/dict/service/DictService.java index 637e00a..137fd24 100644 --- a/src/main/java/com/newyetai/component/dict/service/DictService.java +++ b/src/main/java/com/senmesh/component/dict/service/DictService.java @@ -1,7 +1,7 @@ -package com.newyetai.component.dict.service; +package com.senmesh.component.dict.service; -import com.newyetai.component.dict.dto.DictDTO; -import com.newyetai.component.dict.dto.DictQueryDTO; +import com.senmesh.component.dict.dto.DictDTO; +import com.senmesh.component.dict.dto.DictQueryDTO; /** * diff --git a/src/main/java/com/newyetai/component/dict/service/impl/DictCacheServiceImpl.java b/src/main/java/com/senmesh/component/dict/service/impl/DictCacheServiceImpl.java similarity index 78% rename from src/main/java/com/newyetai/component/dict/service/impl/DictCacheServiceImpl.java rename to src/main/java/com/senmesh/component/dict/service/impl/DictCacheServiceImpl.java index 699d7f0..a23f8fe 100644 --- a/src/main/java/com/newyetai/component/dict/service/impl/DictCacheServiceImpl.java +++ b/src/main/java/com/senmesh/component/dict/service/impl/DictCacheServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dict.service.impl; +package com.senmesh.component.dict.service.impl; import java.util.List; @@ -8,12 +8,12 @@ import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import com.newyetai.common.constant.CacheConstants; -import com.newyetai.common.util.TreeHelper; -import com.newyetai.component.dict.dao.DictDetailMapper; -import com.newyetai.component.dict.dto.DictDetailDTO; -import com.newyetai.component.dict.dto.DictDetailQueryDTO; -import com.newyetai.component.dict.service.DictCacheService; +import com.senmesh.common.constant.CacheConstants; +import com.senmesh.common.util.TreeHelper; +import com.senmesh.component.dict.dao.DictDetailMapper; +import com.senmesh.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.dto.DictDetailQueryDTO; +import com.senmesh.component.dict.service.DictCacheService; /** * @author sr on 2020-04-03 diff --git a/src/main/java/com/newyetai/component/dict/service/impl/DictDetailServiceImpl.java b/src/main/java/com/senmesh/component/dict/service/impl/DictDetailServiceImpl.java similarity index 91% rename from src/main/java/com/newyetai/component/dict/service/impl/DictDetailServiceImpl.java rename to src/main/java/com/senmesh/component/dict/service/impl/DictDetailServiceImpl.java index 6d8caa6..2a56053 100644 --- a/src/main/java/com/newyetai/component/dict/service/impl/DictDetailServiceImpl.java +++ b/src/main/java/com/senmesh/component/dict/service/impl/DictDetailServiceImpl.java @@ -1,15 +1,15 @@ -package com.newyetai.component.dict.service.impl; +package com.senmesh.component.dict.service.impl; import com.google.common.base.CaseFormat; import com.google.common.collect.Maps; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.component.dict.dao.DictDetailMapper; -import com.newyetai.component.dict.dto.*; -import com.newyetai.component.dict.mapstruct.DictDetailMapMapper; -import com.newyetai.component.dict.service.DictCacheService; -import com.newyetai.component.dict.service.DictDetailService; -import com.newyetai.component.dict.service.DictService; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.component.dict.dao.DictDetailMapper; +import com.senmesh.component.dict.dto.*; +import com.senmesh.component.dict.mapstruct.DictDetailMapMapper; +import com.senmesh.component.dict.service.DictCacheService; +import com.senmesh.component.dict.service.DictDetailService; +import com.senmesh.component.dict.service.DictService; +import com.senmesh.tkmybatis.pojo.Page; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/component/dict/service/impl/DictServiceImpl.java b/src/main/java/com/senmesh/component/dict/service/impl/DictServiceImpl.java similarity index 82% rename from src/main/java/com/newyetai/component/dict/service/impl/DictServiceImpl.java rename to src/main/java/com/senmesh/component/dict/service/impl/DictServiceImpl.java index 454e320..7b25117 100644 --- a/src/main/java/com/newyetai/component/dict/service/impl/DictServiceImpl.java +++ b/src/main/java/com/senmesh/component/dict/service/impl/DictServiceImpl.java @@ -1,14 +1,14 @@ -package com.newyetai.component.dict.service.impl; +package com.senmesh.component.dict.service.impl; -import com.newyetai.common.constant.ExceptionMsgs; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.component.dict.dao.DictMapper; -import com.newyetai.component.dict.dto.DictDTO; -import com.newyetai.component.dict.dto.DictQueryDTO; -import com.newyetai.component.dict.entity.Dict; -import com.newyetai.component.dict.mapstruct.DictMapMapper; -import com.newyetai.component.dict.service.DictCacheService; -import com.newyetai.component.dict.service.DictService; +import com.senmesh.common.constant.ExceptionMsgs; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.component.dict.dao.DictMapper; +import com.senmesh.component.dict.dto.DictDTO; +import com.senmesh.component.dict.dto.DictQueryDTO; +import com.senmesh.component.dict.entity.Dict; +import com.senmesh.component.dict.mapstruct.DictMapMapper; +import com.senmesh.component.dict.service.DictCacheService; +import com.senmesh.component.dict.service.DictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/component/dict/util/DictUtils.java b/src/main/java/com/senmesh/component/dict/util/DictUtils.java similarity index 86% rename from src/main/java/com/newyetai/component/dict/util/DictUtils.java rename to src/main/java/com/senmesh/component/dict/util/DictUtils.java index 10a70d8..063efe4 100644 --- a/src/main/java/com/newyetai/component/dict/util/DictUtils.java +++ b/src/main/java/com/senmesh/component/dict/util/DictUtils.java @@ -1,15 +1,15 @@ -package com.newyetai.component.dict.util; +package com.senmesh.component.dict.util; import java.util.List; -import java.util.Map;import java.util.stream.Collector; +import java.util.Map; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.newyetai.component.dict.dto.DictDetailDTO; -import com.newyetai.component.dict.entity.Dict; -import com.newyetai.component.dict.service.DictCacheService; +import com.senmesh.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.entity.Dict; +import com.senmesh.component.dict.service.DictCacheService; /** * 字典工具类 diff --git a/src/main/java/com/newyetai/component/dropdown/constant/DropdownConstants.java b/src/main/java/com/senmesh/component/dropdown/constant/DropdownConstants.java similarity index 91% rename from src/main/java/com/newyetai/component/dropdown/constant/DropdownConstants.java rename to src/main/java/com/senmesh/component/dropdown/constant/DropdownConstants.java index 97096ac..260634d 100644 --- a/src/main/java/com/newyetai/component/dropdown/constant/DropdownConstants.java +++ b/src/main/java/com/senmesh/component/dropdown/constant/DropdownConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dropdown.constant; +package com.senmesh.component.dropdown.constant; /** * 通用配置常量类 diff --git a/src/main/java/com/newyetai/component/dropdown/controller/DropdownController.java b/src/main/java/com/senmesh/component/dropdown/controller/DropdownController.java similarity index 85% rename from src/main/java/com/newyetai/component/dropdown/controller/DropdownController.java rename to src/main/java/com/senmesh/component/dropdown/controller/DropdownController.java index 8f2212d..b2a1a2a 100644 --- a/src/main/java/com/newyetai/component/dropdown/controller/DropdownController.java +++ b/src/main/java/com/senmesh/component/dropdown/controller/DropdownController.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dropdown.controller; +package com.senmesh.component.dropdown.controller; import java.util.List; import java.util.Map; @@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.dropdown.dto.DropdownDTO; -import com.newyetai.component.dropdown.service.impl.DropdownServiceImpl; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.dropdown.dto.DropdownDTO; +import com.senmesh.component.dropdown.service.impl.DropdownServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/component/dropdown/dto/DropdownDTO.java b/src/main/java/com/senmesh/component/dropdown/dto/DropdownDTO.java similarity index 91% rename from src/main/java/com/newyetai/component/dropdown/dto/DropdownDTO.java rename to src/main/java/com/senmesh/component/dropdown/dto/DropdownDTO.java index a63ac2e..6b6994f 100644 --- a/src/main/java/com/newyetai/component/dropdown/dto/DropdownDTO.java +++ b/src/main/java/com/senmesh/component/dropdown/dto/DropdownDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dropdown.dto; +package com.senmesh.component.dropdown.dto; import java.io.Serializable; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Maps; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.util.JsonUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/component/dropdown/service/DropdownProvider.java b/src/main/java/com/senmesh/component/dropdown/service/DropdownProvider.java similarity index 87% rename from src/main/java/com/newyetai/component/dropdown/service/DropdownProvider.java rename to src/main/java/com/senmesh/component/dropdown/service/DropdownProvider.java index 481395c..7a0bd62 100644 --- a/src/main/java/com/newyetai/component/dropdown/service/DropdownProvider.java +++ b/src/main/java/com/senmesh/component/dropdown/service/DropdownProvider.java @@ -1,9 +1,9 @@ -package com.newyetai.component.dropdown.service; +package com.senmesh.component.dropdown.service; import java.util.List; import java.util.Map; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.dto.IUserDetail; /** * 下拉框提供者 diff --git a/src/main/java/com/newyetai/component/dropdown/service/DropdownService.java b/src/main/java/com/senmesh/component/dropdown/service/DropdownService.java similarity index 78% rename from src/main/java/com/newyetai/component/dropdown/service/DropdownService.java rename to src/main/java/com/senmesh/component/dropdown/service/DropdownService.java index 9c30609..d96c065 100644 --- a/src/main/java/com/newyetai/component/dropdown/service/DropdownService.java +++ b/src/main/java/com/senmesh/component/dropdown/service/DropdownService.java @@ -1,10 +1,10 @@ -package com.newyetai.component.dropdown.service; +package com.senmesh.component.dropdown.service; import java.util.List; import java.util.Map; -import com.newyetai.component.dropdown.dto.DropdownDTO; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.component.dropdown.dto.DropdownDTO; +import com.senmesh.usercenter.dto.IUserDetail; /** * 下拉框service diff --git a/src/main/java/com/newyetai/component/dropdown/service/impl/CodeSettingDropdownProvider.java b/src/main/java/com/senmesh/component/dropdown/service/impl/CodeSettingDropdownProvider.java similarity index 71% rename from src/main/java/com/newyetai/component/dropdown/service/impl/CodeSettingDropdownProvider.java rename to src/main/java/com/senmesh/component/dropdown/service/impl/CodeSettingDropdownProvider.java index a7fcd2a..dfa9240 100644 --- a/src/main/java/com/newyetai/component/dropdown/service/impl/CodeSettingDropdownProvider.java +++ b/src/main/java/com/senmesh/component/dropdown/service/impl/CodeSettingDropdownProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dropdown.service.impl; +package com.senmesh.component.dropdown.service.impl; import java.util.List; import java.util.Map; @@ -7,12 +7,12 @@ import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.newyetai.codesetting.service.CodeSettingService; -import com.newyetai.common.exception.NoneLoginException; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.component.dropdown.constant.DropdownConstants; -import com.newyetai.component.dropdown.service.DropdownProvider; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.codesetting.service.CodeSettingService; +import com.senmesh.common.exception.NoneLoginException; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.component.dropdown.constant.DropdownConstants; +import com.senmesh.component.dropdown.service.DropdownProvider; +import com.senmesh.usercenter.dto.IUserDetail; /** * 编码配置下拉框 diff --git a/src/main/java/com/newyetai/component/dropdown/service/impl/DictDropdownProvider.java b/src/main/java/com/senmesh/component/dropdown/service/impl/DictDropdownProvider.java similarity index 70% rename from src/main/java/com/newyetai/component/dropdown/service/impl/DictDropdownProvider.java rename to src/main/java/com/senmesh/component/dropdown/service/impl/DictDropdownProvider.java index 1b5a1cf..d1aff42 100644 --- a/src/main/java/com/newyetai/component/dropdown/service/impl/DictDropdownProvider.java +++ b/src/main/java/com/senmesh/component/dropdown/service/impl/DictDropdownProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dropdown.service.impl; +package com.senmesh.component.dropdown.service.impl; import java.util.Collections; import java.util.List; @@ -10,16 +10,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.google.common.collect.Maps; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.component.dict.dao.DictDetailMapper; -import com.newyetai.component.dict.dto.DictDetailDTO; -import com.newyetai.component.dict.dto.DictDetailQueryDTO; -import com.newyetai.component.dict.entity.DictDetail; -import com.newyetai.component.dict.service.DictCacheService; -import com.newyetai.component.dropdown.constant.DropdownConstants; -import com.newyetai.component.dropdown.service.DropdownProvider; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.component.dict.dao.DictDetailMapper; +import com.senmesh.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.dto.DictDetailQueryDTO; +import com.senmesh.component.dict.service.DictCacheService; +import com.senmesh.component.dropdown.constant.DropdownConstants; +import com.senmesh.component.dropdown.service.DropdownProvider; +import com.senmesh.usercenter.dto.IUserDetail; /** * 数据字典下拉框 diff --git a/src/main/java/com/newyetai/component/dropdown/service/impl/DropdownServiceImpl.java b/src/main/java/com/senmesh/component/dropdown/service/impl/DropdownServiceImpl.java similarity index 76% rename from src/main/java/com/newyetai/component/dropdown/service/impl/DropdownServiceImpl.java rename to src/main/java/com/senmesh/component/dropdown/service/impl/DropdownServiceImpl.java index 28050e0..63bbc01 100644 --- a/src/main/java/com/newyetai/component/dropdown/service/impl/DropdownServiceImpl.java +++ b/src/main/java/com/senmesh/component/dropdown/service/impl/DropdownServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dropdown.service.impl; +package com.senmesh.component.dropdown.service.impl; import java.util.List; import java.util.Map; @@ -7,11 +7,11 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.newyetai.component.dropdown.constant.DropdownConstants; -import com.newyetai.component.dropdown.dto.DropdownDTO; -import com.newyetai.component.dropdown.service.DropdownProvider; -import com.newyetai.component.dropdown.service.DropdownService; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.component.dropdown.constant.DropdownConstants; +import com.senmesh.component.dropdown.dto.DropdownDTO; +import com.senmesh.component.dropdown.service.DropdownProvider; +import com.senmesh.component.dropdown.service.DropdownService; +import com.senmesh.usercenter.dto.IUserDetail; /** * 下拉框 diff --git a/src/main/java/com/newyetai/component/dynamictable/constant/DynamicTableConstants.java b/src/main/java/com/senmesh/component/dynamictable/constant/DynamicTableConstants.java similarity index 60% rename from src/main/java/com/newyetai/component/dynamictable/constant/DynamicTableConstants.java rename to src/main/java/com/senmesh/component/dynamictable/constant/DynamicTableConstants.java index c51cf24..723e844 100644 --- a/src/main/java/com/newyetai/component/dynamictable/constant/DynamicTableConstants.java +++ b/src/main/java/com/senmesh/component/dynamictable/constant/DynamicTableConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dynamictable.constant; +package com.senmesh.component.dynamictable.constant; /** * @author sr on 2024-04-09 diff --git a/src/main/java/com/newyetai/component/dynamictable/controller/DynamicTableController.java b/src/main/java/com/senmesh/component/dynamictable/controller/DynamicTableController.java similarity index 80% rename from src/main/java/com/newyetai/component/dynamictable/controller/DynamicTableController.java rename to src/main/java/com/senmesh/component/dynamictable/controller/DynamicTableController.java index d56f37d..e5f4359 100644 --- a/src/main/java/com/newyetai/component/dynamictable/controller/DynamicTableController.java +++ b/src/main/java/com/senmesh/component/dynamictable/controller/DynamicTableController.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dynamictable.controller; +package com.senmesh.component.dynamictable.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -10,13 +10,13 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.dynamictable.dto.DynamicTableCreateDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableModifyDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableQueryDTO; -import com.newyetai.component.dynamictable.service.DynamicTableService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.dynamictable.dto.DynamicTableCreateDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableModifyDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableQueryDTO; +import com.senmesh.component.dynamictable.service.DynamicTableService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/component/dynamictable/dao/DynamicTableMapper.java b/src/main/java/com/senmesh/component/dynamictable/dao/DynamicTableMapper.java similarity index 58% rename from src/main/java/com/newyetai/component/dynamictable/dao/DynamicTableMapper.java rename to src/main/java/com/senmesh/component/dynamictable/dao/DynamicTableMapper.java index 1a7e22d..9d37589 100644 --- a/src/main/java/com/newyetai/component/dynamictable/dao/DynamicTableMapper.java +++ b/src/main/java/com/senmesh/component/dynamictable/dao/DynamicTableMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.component.dynamictable.dao; +package com.senmesh.component.dynamictable.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.component.dynamictable.dto.DynamicTableDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableQueryDTO; -import com.newyetai.component.dynamictable.entity.DynamicTable; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.component.dynamictable.dto.DynamicTableDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableQueryDTO; +import com.senmesh.component.dynamictable.entity.DynamicTable; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 动态表格 diff --git a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableColumnDTO.java b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableColumnDTO.java similarity index 93% rename from src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableColumnDTO.java rename to src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableColumnDTO.java index d5b3556..e8a5971 100644 --- a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableColumnDTO.java +++ b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableColumnDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dynamictable.dto; +package com.senmesh.component.dynamictable.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableCreateDTO.java b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableCreateDTO.java similarity index 90% rename from src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableCreateDTO.java rename to src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableCreateDTO.java index 69c42f7..c33a3db 100644 --- a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableCreateDTO.java +++ b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dynamictable.dto; +package com.senmesh.component.dynamictable.dto; import java.util.List; @@ -6,7 +6,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableDTO.java b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableDTO.java similarity index 83% rename from src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableDTO.java rename to src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableDTO.java index 205b70c..bcaeb38 100644 --- a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableDTO.java +++ b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableDTO.java @@ -1,15 +1,13 @@ -package com.newyetai.component.dynamictable.dto; +package com.senmesh.component.dynamictable.dto; import java.util.List; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.ListUtils; import org.apache.commons.lang3.StringUtils; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.google.common.collect.Lists; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.util.JsonUtils; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableModifyDTO.java b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableModifyDTO.java similarity index 90% rename from src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableModifyDTO.java rename to src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableModifyDTO.java index a940426..e7466dd 100644 --- a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableModifyDTO.java +++ b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableModifyDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dynamictable.dto; +package com.senmesh.component.dynamictable.dto; import java.util.List; @@ -6,7 +6,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableQueryDTO.java b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableQueryDTO.java similarity index 86% rename from src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableQueryDTO.java rename to src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableQueryDTO.java index e20bc67..e2917e6 100644 --- a/src/main/java/com/newyetai/component/dynamictable/dto/DynamicTableQueryDTO.java +++ b/src/main/java/com/senmesh/component/dynamictable/dto/DynamicTableQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.component.dynamictable.dto; +package com.senmesh.component.dynamictable.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/component/dynamictable/entity/DynamicTable.java b/src/main/java/com/senmesh/component/dynamictable/entity/DynamicTable.java similarity index 87% rename from src/main/java/com/newyetai/component/dynamictable/entity/DynamicTable.java rename to src/main/java/com/senmesh/component/dynamictable/entity/DynamicTable.java index 00164cb..b320d20 100644 --- a/src/main/java/com/newyetai/component/dynamictable/entity/DynamicTable.java +++ b/src/main/java/com/senmesh/component/dynamictable/entity/DynamicTable.java @@ -1,7 +1,7 @@ -package com.newyetai.component.dynamictable.entity; +package com.senmesh.component.dynamictable.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/component/dynamictable/mapper/DynamicTableMapper.xml b/src/main/java/com/senmesh/component/dynamictable/mapper/DynamicTableMapper.xml similarity index 73% rename from src/main/java/com/newyetai/component/dynamictable/mapper/DynamicTableMapper.xml rename to src/main/java/com/senmesh/component/dynamictable/mapper/DynamicTableMapper.xml index 8adf150..17a775e 100644 --- a/src/main/java/com/newyetai/component/dynamictable/mapper/DynamicTableMapper.xml +++ b/src/main/java/com/senmesh/component/dynamictable/mapper/DynamicTableMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_dynamic_table diff --git a/src/main/java/com/newyetai/component/dynamictable/mapstruct/DynamicTableMapMapper.java b/src/main/java/com/senmesh/component/dynamictable/mapstruct/DynamicTableMapMapper.java similarity index 67% rename from src/main/java/com/newyetai/component/dynamictable/mapstruct/DynamicTableMapMapper.java rename to src/main/java/com/senmesh/component/dynamictable/mapstruct/DynamicTableMapMapper.java index b61c0d5..2c8cd0f 100644 --- a/src/main/java/com/newyetai/component/dynamictable/mapstruct/DynamicTableMapMapper.java +++ b/src/main/java/com/senmesh/component/dynamictable/mapstruct/DynamicTableMapMapper.java @@ -1,12 +1,12 @@ -package com.newyetai.component.dynamictable.mapstruct; +package com.senmesh.component.dynamictable.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.dynamictable.dto.DynamicTableCreateDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableModifyDTO; -import com.newyetai.component.dynamictable.entity.DynamicTable; +import com.senmesh.component.dynamictable.dto.DynamicTableCreateDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableModifyDTO; +import com.senmesh.component.dynamictable.entity.DynamicTable; /** * @author sr on 2024-04-09 diff --git a/src/main/java/com/newyetai/component/dynamictable/service/DynamicTableService.java b/src/main/java/com/senmesh/component/dynamictable/service/DynamicTableService.java similarity index 77% rename from src/main/java/com/newyetai/component/dynamictable/service/DynamicTableService.java rename to src/main/java/com/senmesh/component/dynamictable/service/DynamicTableService.java index 128736a..a5c76a6 100644 --- a/src/main/java/com/newyetai/component/dynamictable/service/DynamicTableService.java +++ b/src/main/java/com/senmesh/component/dynamictable/service/DynamicTableService.java @@ -1,11 +1,11 @@ -package com.newyetai.component.dynamictable.service; +package com.senmesh.component.dynamictable.service; import java.util.List; -import com.newyetai.component.dynamictable.dto.DynamicTableCreateDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableModifyDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableQueryDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableCreateDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableModifyDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableQueryDTO; /** * 动态表格 diff --git a/src/main/java/com/newyetai/component/dynamictable/service/impl/DynamicTableServiceImpl.java b/src/main/java/com/senmesh/component/dynamictable/service/impl/DynamicTableServiceImpl.java similarity index 83% rename from src/main/java/com/newyetai/component/dynamictable/service/impl/DynamicTableServiceImpl.java rename to src/main/java/com/senmesh/component/dynamictable/service/impl/DynamicTableServiceImpl.java index 3ef562c..5a19de8 100644 --- a/src/main/java/com/newyetai/component/dynamictable/service/impl/DynamicTableServiceImpl.java +++ b/src/main/java/com/senmesh/component/dynamictable/service/impl/DynamicTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dynamictable.service.impl; +package com.senmesh.component.dynamictable.service.impl; import java.util.List; @@ -6,21 +6,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.dynamictable.dao.DynamicTableMapper; -import com.newyetai.component.dynamictable.dto.DynamicTableColumnDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableCreateDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableModifyDTO; -import com.newyetai.component.dynamictable.dto.DynamicTableQueryDTO; -import com.newyetai.component.dynamictable.entity.DynamicTable; -import com.newyetai.component.dynamictable.mapstruct.DynamicTableMapMapper; -import com.newyetai.component.dynamictable.service.DynamicTableService; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.dynamictable.dao.DynamicTableMapper; +import com.senmesh.component.dynamictable.dto.DynamicTableColumnDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableCreateDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableModifyDTO; +import com.senmesh.component.dynamictable.dto.DynamicTableQueryDTO; +import com.senmesh.component.dynamictable.entity.DynamicTable; +import com.senmesh.component.dynamictable.mapstruct.DynamicTableMapMapper; +import com.senmesh.component.dynamictable.service.DynamicTableService; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; /** * @author sr on 2024-04-09 diff --git a/src/main/java/com/newyetai/component/dynamictable/util/DynamicTableUtils.java b/src/main/java/com/senmesh/component/dynamictable/util/DynamicTableUtils.java similarity index 59% rename from src/main/java/com/newyetai/component/dynamictable/util/DynamicTableUtils.java rename to src/main/java/com/senmesh/component/dynamictable/util/DynamicTableUtils.java index 67176ed..8ca73c2 100644 --- a/src/main/java/com/newyetai/component/dynamictable/util/DynamicTableUtils.java +++ b/src/main/java/com/senmesh/component/dynamictable/util/DynamicTableUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.component.dynamictable.util; +package com.senmesh.component.dynamictable.util; /** * @author sr on 2024-04-09 diff --git a/src/main/java/com/newyetai/component/exceptionrecord/dao/ExceptionRecordMapper.java b/src/main/java/com/senmesh/component/exceptionrecord/dao/ExceptionRecordMapper.java similarity index 58% rename from src/main/java/com/newyetai/component/exceptionrecord/dao/ExceptionRecordMapper.java rename to src/main/java/com/senmesh/component/exceptionrecord/dao/ExceptionRecordMapper.java index 7f3591f..3456b46 100644 --- a/src/main/java/com/newyetai/component/exceptionrecord/dao/ExceptionRecordMapper.java +++ b/src/main/java/com/senmesh/component/exceptionrecord/dao/ExceptionRecordMapper.java @@ -1,8 +1,8 @@ -package com.newyetai.component.exceptionrecord.dao; +package com.senmesh.component.exceptionrecord.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.component.exceptionrecord.entity.ExceptionRecord; +import com.senmesh.component.exceptionrecord.entity.ExceptionRecord; public interface ExceptionRecordMapper extends BaseMapper { diff --git a/src/main/java/com/newyetai/component/exceptionrecord/emuns/ExceptionRecordSysEnum.java b/src/main/java/com/senmesh/component/exceptionrecord/emuns/ExceptionRecordSysEnum.java similarity index 89% rename from src/main/java/com/newyetai/component/exceptionrecord/emuns/ExceptionRecordSysEnum.java rename to src/main/java/com/senmesh/component/exceptionrecord/emuns/ExceptionRecordSysEnum.java index f9b8f81..7f30fad 100644 --- a/src/main/java/com/newyetai/component/exceptionrecord/emuns/ExceptionRecordSysEnum.java +++ b/src/main/java/com/senmesh/component/exceptionrecord/emuns/ExceptionRecordSysEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.exceptionrecord.emuns; +package com.senmesh.component.exceptionrecord.emuns; import com.baomidou.mybatisplus.annotation.EnumValue; diff --git a/src/main/java/com/newyetai/component/exceptionrecord/entity/ExceptionRecord.java b/src/main/java/com/senmesh/component/exceptionrecord/entity/ExceptionRecord.java similarity index 81% rename from src/main/java/com/newyetai/component/exceptionrecord/entity/ExceptionRecord.java rename to src/main/java/com/senmesh/component/exceptionrecord/entity/ExceptionRecord.java index 09ec13f..98d7dc6 100644 --- a/src/main/java/com/newyetai/component/exceptionrecord/entity/ExceptionRecord.java +++ b/src/main/java/com/senmesh/component/exceptionrecord/entity/ExceptionRecord.java @@ -1,8 +1,8 @@ -package com.newyetai.component.exceptionrecord.entity; +package com.senmesh.component.exceptionrecord.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.component.exceptionrecord.emuns.ExceptionRecordSysEnum; +import com.senmesh.common.entity.BaseEntity; +import com.senmesh.component.exceptionrecord.emuns.ExceptionRecordSysEnum; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/component/exceptionrecord/mapper/ExceptionRecordMapper.xml b/src/main/java/com/senmesh/component/exceptionrecord/mapper/ExceptionRecordMapper.xml similarity index 78% rename from src/main/java/com/newyetai/component/exceptionrecord/mapper/ExceptionRecordMapper.xml rename to src/main/java/com/senmesh/component/exceptionrecord/mapper/ExceptionRecordMapper.xml index 2239539..a0a35f8 100644 --- a/src/main/java/com/newyetai/component/exceptionrecord/mapper/ExceptionRecordMapper.xml +++ b/src/main/java/com/senmesh/component/exceptionrecord/mapper/ExceptionRecordMapper.xml @@ -2,7 +2,7 @@ - + + - SELECT * FROM xs_file_record diff --git a/src/main/java/com/newyetai/component/file/mapper/FileRecordMapper.xml b/src/main/java/com/senmesh/component/file/mapper/FileRecordMapper.xml similarity index 83% rename from src/main/java/com/newyetai/component/file/mapper/FileRecordMapper.xml rename to src/main/java/com/senmesh/component/file/mapper/FileRecordMapper.xml index a5c5cf7..89b7920 100644 --- a/src/main/java/com/newyetai/component/file/mapper/FileRecordMapper.xml +++ b/src/main/java/com/senmesh/component/file/mapper/FileRecordMapper.xml @@ -2,9 +2,9 @@ - + - SELECT * FROM xs_file_record @@ -15,7 +15,7 @@ - SELECT * FROM xs_file_record deleted = 0 diff --git a/src/main/java/com/newyetai/component/file/service/FileClassMapMapper.java b/src/main/java/com/senmesh/component/file/service/FileClassMapMapper.java similarity index 79% rename from src/main/java/com/newyetai/component/file/service/FileClassMapMapper.java rename to src/main/java/com/senmesh/component/file/service/FileClassMapMapper.java index fdcbcdc..e2d5cdc 100644 --- a/src/main/java/com/newyetai/component/file/service/FileClassMapMapper.java +++ b/src/main/java/com/senmesh/component/file/service/FileClassMapMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.component.file.service; +package com.senmesh.component.file.service; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.component.file.dto.FileClassDTO; -import com.newyetai.component.file.entity.FileClass; +import com.senmesh.component.file.dto.FileClassDTO; +import com.senmesh.component.file.entity.FileClass; /** * 文件配置entity/dto转换 diff --git a/src/main/java/com/newyetai/component/file/service/FileClassService.java b/src/main/java/com/senmesh/component/file/service/FileClassService.java similarity index 80% rename from src/main/java/com/newyetai/component/file/service/FileClassService.java rename to src/main/java/com/senmesh/component/file/service/FileClassService.java index dd72bc2..cdaa939 100644 --- a/src/main/java/com/newyetai/component/file/service/FileClassService.java +++ b/src/main/java/com/senmesh/component/file/service/FileClassService.java @@ -1,7 +1,7 @@ -package com.newyetai.component.file.service; +package com.senmesh.component.file.service; -import com.newyetai.component.file.dto.FileClassDTO; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.component.file.dto.FileClassDTO; +import com.senmesh.tkmybatis.pojo.Page; /** * 文件类型 diff --git a/src/main/java/com/newyetai/component/file/service/FileRecordService.java b/src/main/java/com/senmesh/component/file/service/FileRecordService.java similarity index 84% rename from src/main/java/com/newyetai/component/file/service/FileRecordService.java rename to src/main/java/com/senmesh/component/file/service/FileRecordService.java index adbb07f..e393d8a 100644 --- a/src/main/java/com/newyetai/component/file/service/FileRecordService.java +++ b/src/main/java/com/senmesh/component/file/service/FileRecordService.java @@ -1,9 +1,9 @@ -package com.newyetai.component.file.service; +package com.senmesh.component.file.service; import java.io.InputStream; -import com.newyetai.component.file.entity.FileRecord; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.component.file.entity.FileRecord; +import com.senmesh.tkmybatis.pojo.Page; /** * @author Rey(leijiaping @ newyetai.com) diff --git a/src/main/java/com/newyetai/component/file/service/FileService.java b/src/main/java/com/senmesh/component/file/service/FileService.java similarity index 92% rename from src/main/java/com/newyetai/component/file/service/FileService.java rename to src/main/java/com/senmesh/component/file/service/FileService.java index b01d6e6..b0b27a8 100644 --- a/src/main/java/com/newyetai/component/file/service/FileService.java +++ b/src/main/java/com/senmesh/component/file/service/FileService.java @@ -1,14 +1,13 @@ -package com.newyetai.component.file.service; +package com.senmesh.component.file.service; -import com.newyetai.component.file.dto.FileUploadDTO; -import com.newyetai.component.file.entity.FileRecord; +import com.senmesh.component.file.dto.FileUploadDTO; +import com.senmesh.component.file.entity.FileRecord; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.math.BigDecimal; /** * 文件 diff --git a/src/main/java/com/newyetai/component/file/service/IFileStorage.java b/src/main/java/com/senmesh/component/file/service/IFileStorage.java similarity index 93% rename from src/main/java/com/newyetai/component/file/service/IFileStorage.java rename to src/main/java/com/senmesh/component/file/service/IFileStorage.java index 0bfad2d..f2a9a2d 100644 --- a/src/main/java/com/newyetai/component/file/service/IFileStorage.java +++ b/src/main/java/com/senmesh/component/file/service/IFileStorage.java @@ -1,4 +1,4 @@ -package com.newyetai.component.file.service; +package com.senmesh.component.file.service; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/com/newyetai/component/file/service/impl/FileClassServiceImpl.java b/src/main/java/com/senmesh/component/file/service/impl/FileClassServiceImpl.java similarity index 75% rename from src/main/java/com/newyetai/component/file/service/impl/FileClassServiceImpl.java rename to src/main/java/com/senmesh/component/file/service/impl/FileClassServiceImpl.java index 9d043b4..7d9afc8 100644 --- a/src/main/java/com/newyetai/component/file/service/impl/FileClassServiceImpl.java +++ b/src/main/java/com/senmesh/component/file/service/impl/FileClassServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.component.file.service.impl; +package com.senmesh.component.file.service.impl; import java.util.List; @@ -6,17 +6,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.codegenerator.util.CodeUtils; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.BaseDtoUtils; -import com.newyetai.common.util.ListUtil; -import com.newyetai.component.constants.CodeTypeEnum; -import com.newyetai.component.file.dao.FileClassMapper; -import com.newyetai.component.file.dto.FileClassDTO; -import com.newyetai.component.file.entity.FileClass; -import com.newyetai.component.file.service.FileClassMapMapper; -import com.newyetai.component.file.service.FileClassService; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.codegenerator.util.CodeUtils; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.BaseDtoUtils; +import com.senmesh.common.util.ListUtil; +import com.senmesh.component.constants.CodeTypeEnum; +import com.senmesh.component.file.dao.FileClassMapper; +import com.senmesh.component.file.dto.FileClassDTO; +import com.senmesh.component.file.entity.FileClass; +import com.senmesh.component.file.service.FileClassMapMapper; +import com.senmesh.component.file.service.FileClassService; +import com.senmesh.tkmybatis.pojo.Page; /** * 文件类型 diff --git a/src/main/java/com/newyetai/component/file/service/impl/FileRecordServiceImpl.java b/src/main/java/com/senmesh/component/file/service/impl/FileRecordServiceImpl.java similarity index 83% rename from src/main/java/com/newyetai/component/file/service/impl/FileRecordServiceImpl.java rename to src/main/java/com/senmesh/component/file/service/impl/FileRecordServiceImpl.java index 43c6fa5..c8d2009 100644 --- a/src/main/java/com/newyetai/component/file/service/impl/FileRecordServiceImpl.java +++ b/src/main/java/com/senmesh/component/file/service/impl/FileRecordServiceImpl.java @@ -1,16 +1,16 @@ -package com.newyetai.component.file.service.impl; +package com.senmesh.component.file.service.impl; import java.io.InputStream; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.component.file.dao.FileRecordMapper; -import com.newyetai.component.file.entity.FileRecord; -import com.newyetai.component.file.service.FileRecordService; -import com.newyetai.component.file.util.FileStorageUtils; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.component.file.dao.FileRecordMapper; +import com.senmesh.component.file.entity.FileRecord; +import com.senmesh.component.file.service.FileRecordService; +import com.senmesh.component.file.util.FileStorageUtils; +import com.senmesh.tkmybatis.pojo.Page; /** * @author Rey(leijiaping @ newyetai.com) diff --git a/src/main/java/com/newyetai/component/file/service/impl/FileServiceImpl.java b/src/main/java/com/senmesh/component/file/service/impl/FileServiceImpl.java similarity index 94% rename from src/main/java/com/newyetai/component/file/service/impl/FileServiceImpl.java rename to src/main/java/com/senmesh/component/file/service/impl/FileServiceImpl.java index 7b0633c..ee4eac2 100644 --- a/src/main/java/com/newyetai/component/file/service/impl/FileServiceImpl.java +++ b/src/main/java/com/senmesh/component/file/service/impl/FileServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.component.file.service.impl; +package com.senmesh.component.file.service.impl; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -29,22 +29,21 @@ import org.springframework.stereotype.Service; import org.springframework.util.MimeTypeUtils; import org.springframework.web.multipart.MultipartFile; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.file.config.FileProperties; -import com.newyetai.component.file.constant.FileClassCodeEnum; -import com.newyetai.component.file.constant.FileConstants; -import com.newyetai.component.file.dto.FileClassDTO; -import com.newyetai.component.file.dto.FileUploadDTO; -import com.newyetai.component.file.entity.FileRecord; -import com.newyetai.component.file.service.FileClassService; -import com.newyetai.component.file.service.FileRecordService; -import com.newyetai.component.file.service.FileService; -import com.newyetai.component.file.service.IFileStorage; -import com.newyetai.component.file.service.storage.AliFileStorage; -import com.newyetai.component.file.util.FileUtils; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.file.config.FileProperties; +import com.senmesh.component.file.constant.FileClassCodeEnum; +import com.senmesh.component.file.constant.FileConstants; +import com.senmesh.component.file.dto.FileClassDTO; +import com.senmesh.component.file.dto.FileUploadDTO; +import com.senmesh.component.file.entity.FileRecord; +import com.senmesh.component.file.service.FileClassService; +import com.senmesh.component.file.service.FileRecordService; +import com.senmesh.component.file.service.FileService; +import com.senmesh.component.file.service.IFileStorage; +import com.senmesh.component.file.util.FileUtils; import cn.hutool.core.date.DateUtil; import cn.hutool.core.img.Img; diff --git a/src/main/java/com/newyetai/component/file/service/storage/AliFileStorage.java b/src/main/java/com/senmesh/component/file/service/storage/AliFileStorage.java similarity index 92% rename from src/main/java/com/newyetai/component/file/service/storage/AliFileStorage.java rename to src/main/java/com/senmesh/component/file/service/storage/AliFileStorage.java index 9f6aad8..8f7b165 100644 --- a/src/main/java/com/newyetai/component/file/service/storage/AliFileStorage.java +++ b/src/main/java/com/senmesh/component/file/service/storage/AliFileStorage.java @@ -1,4 +1,4 @@ -package com.newyetai.component.file.service.storage; +package com.senmesh.component.file.service.storage; import java.io.File; import java.io.IOException; @@ -15,14 +15,14 @@ import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.OSSException; import com.aliyun.oss.model.GetObjectRequest; import com.aliyun.oss.model.OSSObject; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.DevopsException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.component.file.config.FileProperties; -import com.newyetai.component.file.config.FileProperties.AliStorage; -import com.newyetai.component.file.constant.FileStorageEnum; -import com.newyetai.component.file.service.IFileStorage; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.DevopsException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.component.file.config.FileProperties; +import com.senmesh.component.file.config.FileProperties.AliStorage; +import com.senmesh.component.file.constant.FileStorageEnum; +import com.senmesh.component.file.service.IFileStorage; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/component/file/service/storage/LocalFileStorage.java b/src/main/java/com/senmesh/component/file/service/storage/LocalFileStorage.java similarity index 91% rename from src/main/java/com/newyetai/component/file/service/storage/LocalFileStorage.java rename to src/main/java/com/senmesh/component/file/service/storage/LocalFileStorage.java index bea95b0..32724a8 100644 --- a/src/main/java/com/newyetai/component/file/service/storage/LocalFileStorage.java +++ b/src/main/java/com/senmesh/component/file/service/storage/LocalFileStorage.java @@ -1,8 +1,8 @@ -package com.newyetai.component.file.service.storage; +package com.senmesh.component.file.service.storage; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.component.file.constant.FileStorageEnum; -import com.newyetai.component.file.service.IFileStorage; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.component.file.constant.FileStorageEnum; +import com.senmesh.component.file.service.IFileStorage; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/src/main/java/com/newyetai/component/file/util/FileStorageUtils.java b/src/main/java/com/senmesh/component/file/util/FileStorageUtils.java similarity index 71% rename from src/main/java/com/newyetai/component/file/util/FileStorageUtils.java rename to src/main/java/com/senmesh/component/file/util/FileStorageUtils.java index 066d674..f727089 100644 --- a/src/main/java/com/newyetai/component/file/util/FileStorageUtils.java +++ b/src/main/java/com/senmesh/component/file/util/FileStorageUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.component.file.util; +package com.senmesh.component.file.util; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.component.file.service.IFileStorage; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.component.file.service.IFileStorage; /** * @author sr on 2022-03-08 diff --git a/src/main/java/com/newyetai/component/file/util/FileUtils.java b/src/main/java/com/senmesh/component/file/util/FileUtils.java similarity index 97% rename from src/main/java/com/newyetai/component/file/util/FileUtils.java rename to src/main/java/com/senmesh/component/file/util/FileUtils.java index d223797..602a840 100644 --- a/src/main/java/com/newyetai/component/file/util/FileUtils.java +++ b/src/main/java/com/senmesh/component/file/util/FileUtils.java @@ -1,6 +1,6 @@ -package com.newyetai.component.file.util; +package com.senmesh.component.file.util; -import com.newyetai.component.file.config.FileProperties; +import com.senmesh.component.file.config.FileProperties; import java.awt.image.BufferedImage; import java.io.File; import java.io.FileInputStream; @@ -19,8 +19,8 @@ import javax.imageio.ImageIO; import org.springframework.stereotype.Component; import org.springframework.util.FileCopyUtils; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.component.file.constant.FileConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.component.file.constant.FileConstants; import cn.hutool.core.img.Img; import cn.hutool.core.io.FileUtil; diff --git a/src/main/java/com/newyetai/component/file/util/PDFBuilder.java b/src/main/java/com/senmesh/component/file/util/PDFBuilder.java similarity index 99% rename from src/main/java/com/newyetai/component/file/util/PDFBuilder.java rename to src/main/java/com/senmesh/component/file/util/PDFBuilder.java index af09ea4..dde5b48 100644 --- a/src/main/java/com/newyetai/component/file/util/PDFBuilder.java +++ b/src/main/java/com/senmesh/component/file/util/PDFBuilder.java @@ -1,4 +1,4 @@ -package com.newyetai.component.file.util; +package com.senmesh.component.file.util; import com.itextpdf.text.BaseColor; import com.itextpdf.text.Document; diff --git a/src/main/java/com/newyetai/component/file/util/PDFProperty.java b/src/main/java/com/senmesh/component/file/util/PDFProperty.java similarity index 87% rename from src/main/java/com/newyetai/component/file/util/PDFProperty.java rename to src/main/java/com/senmesh/component/file/util/PDFProperty.java index 09c1971..b9f101d 100644 --- a/src/main/java/com/newyetai/component/file/util/PDFProperty.java +++ b/src/main/java/com/senmesh/component/file/util/PDFProperty.java @@ -1,4 +1,4 @@ -package com.newyetai.component.file.util; +package com.senmesh.component.file.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/newyetai/component/file/util/Pdf2ImageUtil.java b/src/main/java/com/senmesh/component/file/util/Pdf2ImageUtil.java similarity index 97% rename from src/main/java/com/newyetai/component/file/util/Pdf2ImageUtil.java rename to src/main/java/com/senmesh/component/file/util/Pdf2ImageUtil.java index 1a5a2ad..b4168b3 100644 --- a/src/main/java/com/newyetai/component/file/util/Pdf2ImageUtil.java +++ b/src/main/java/com/senmesh/component/file/util/Pdf2ImageUtil.java @@ -1,4 +1,4 @@ -package com.newyetai.component.file.util; +package com.senmesh.component.file.util; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -17,8 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.google.common.collect.Lists; -import com.newyetai.component.file.entity.FileRecord; -import com.newyetai.component.file.service.FileService; +import com.senmesh.component.file.entity.FileRecord; +import com.senmesh.component.file.service.FileService; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/component/file/util/PdfUtils.java b/src/main/java/com/senmesh/component/file/util/PdfUtils.java similarity index 93% rename from src/main/java/com/newyetai/component/file/util/PdfUtils.java rename to src/main/java/com/senmesh/component/file/util/PdfUtils.java index 3b76444..cc8a7fe 100644 --- a/src/main/java/com/newyetai/component/file/util/PdfUtils.java +++ b/src/main/java/com/senmesh/component/file/util/PdfUtils.java @@ -1,12 +1,7 @@ -package com.newyetai.component.file.util; +package com.senmesh.component.file.util; import java.awt.geom.Rectangle2D; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -14,7 +9,7 @@ import java.io.OutputStream; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; -import com.newyetai.common.exception.BusinessException; +import com.senmesh.common.exception.BusinessException; import com.spire.pdf.FileFormat; import com.spire.pdf.PdfDocument; import com.spire.pdf.PdfPageBase; diff --git a/src/main/java/com/newyetai/component/notice/constant/NoticeFirstTypeEnum.java b/src/main/java/com/senmesh/component/notice/constant/NoticeFirstTypeEnum.java similarity index 87% rename from src/main/java/com/newyetai/component/notice/constant/NoticeFirstTypeEnum.java rename to src/main/java/com/senmesh/component/notice/constant/NoticeFirstTypeEnum.java index 5c73ea7..da1feeb 100644 --- a/src/main/java/com/newyetai/component/notice/constant/NoticeFirstTypeEnum.java +++ b/src/main/java/com/senmesh/component/notice/constant/NoticeFirstTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.component.notice.constant; +package com.senmesh.component.notice.constant; /** * 通知大类 diff --git a/src/main/java/com/newyetai/component/notice/dto/NoticeMsgDTO.java b/src/main/java/com/senmesh/component/notice/dto/NoticeMsgDTO.java similarity index 82% rename from src/main/java/com/newyetai/component/notice/dto/NoticeMsgDTO.java rename to src/main/java/com/senmesh/component/notice/dto/NoticeMsgDTO.java index a082b16..5faf01b 100644 --- a/src/main/java/com/newyetai/component/notice/dto/NoticeMsgDTO.java +++ b/src/main/java/com/senmesh/component/notice/dto/NoticeMsgDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.component.notice.dto; +package com.senmesh.component.notice.dto; -import com.newyetai.component.notice.constant.NoticeFirstTypeEnum; +import com.senmesh.component.notice.constant.NoticeFirstTypeEnum; import java.io.Serializable; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/component/notice/service/AsyncNoticeHandler.java b/src/main/java/com/senmesh/component/notice/service/AsyncNoticeHandler.java similarity index 75% rename from src/main/java/com/newyetai/component/notice/service/AsyncNoticeHandler.java rename to src/main/java/com/senmesh/component/notice/service/AsyncNoticeHandler.java index b3c4a41..e28ab05 100644 --- a/src/main/java/com/newyetai/component/notice/service/AsyncNoticeHandler.java +++ b/src/main/java/com/senmesh/component/notice/service/AsyncNoticeHandler.java @@ -1,13 +1,12 @@ -package com.newyetai.component.notice.service; +package com.senmesh.component.notice.service; -import com.newyetai.component.notice.dto.NoticeMsgDTO; +import com.senmesh.component.notice.dto.NoticeMsgDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.stereotype.Service; -import com.newyetai.component.asyntasknotice.util.AsyncTaskNoticeUtils; -import com.newyetai.mq.consumer.handler.ITopicMqHandler; -import com.newyetai.mq.dto.TopicMqMessage; +import com.senmesh.mq.consumer.handler.ITopicMqHandler; +import com.senmesh.mq.dto.TopicMqMessage; @Service @ConditionalOnBean(INoticeSendProvider.class) diff --git a/src/main/java/com/newyetai/component/notice/service/INoticeSendProvider.java b/src/main/java/com/senmesh/component/notice/service/INoticeSendProvider.java similarity index 57% rename from src/main/java/com/newyetai/component/notice/service/INoticeSendProvider.java rename to src/main/java/com/senmesh/component/notice/service/INoticeSendProvider.java index c5ecb09..2271e69 100644 --- a/src/main/java/com/newyetai/component/notice/service/INoticeSendProvider.java +++ b/src/main/java/com/senmesh/component/notice/service/INoticeSendProvider.java @@ -1,6 +1,6 @@ -package com.newyetai.component.notice.service; +package com.senmesh.component.notice.service; -import com.newyetai.component.notice.dto.NoticeMsgDTO; +import com.senmesh.component.notice.dto.NoticeMsgDTO; /** * 异步任务发送 diff --git a/src/main/java/com/senmesh/component/notice/util/NoticeUtils.java b/src/main/java/com/senmesh/component/notice/util/NoticeUtils.java new file mode 100644 index 0000000..15a773d --- /dev/null +++ b/src/main/java/com/senmesh/component/notice/util/NoticeUtils.java @@ -0,0 +1,17 @@ +package com.senmesh.component.notice.util; + +import com.senmesh.component.notice.dto.NoticeMsgDTO; +import com.senmesh.component.notice.service.AsyncNoticeHandler; +import com.senmesh.mq.util.MqSendUtils; + +public class NoticeUtils { + + /** + * 发送异步通知 + * @param msg + */ + public static void sendAsyncNotice(NoticeMsgDTO msg){ + MqSendUtils.send(AsyncNoticeHandler.ROUTING_KEY, msg); + } + +} diff --git a/src/main/java/com/newyetai/config/constant/ConfigConstants.java b/src/main/java/com/senmesh/config/constant/ConfigConstants.java similarity index 94% rename from src/main/java/com/newyetai/config/constant/ConfigConstants.java rename to src/main/java/com/senmesh/config/constant/ConfigConstants.java index 8497c12..113d648 100644 --- a/src/main/java/com/newyetai/config/constant/ConfigConstants.java +++ b/src/main/java/com/senmesh/config/constant/ConfigConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.config.constant; +package com.senmesh.config.constant; /** * 配置常量类 diff --git a/src/main/java/com/senmesh/config/controller/AnonConfigController.java b/src/main/java/com/senmesh/config/controller/AnonConfigController.java new file mode 100644 index 0000000..779c9f4 --- /dev/null +++ b/src/main/java/com/senmesh/config/controller/AnonConfigController.java @@ -0,0 +1,30 @@ +package com.senmesh.config.controller; + +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.config.dto.*; +import com.senmesh.config.service.ConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 配置操作 + * + * @author on 2019-11-05 + */ +@RestController +@RequestMapping("anon/config") +public class AnonConfigController { + + @Autowired + private ConfigService configService; + + + @GetMapping("/code/{configCode}") + public AlitaResult getAppVersion(@PathVariable("configCode") String configCode) { + ConfigDTO configDto = configService.getConfigDto(configCode, CommonConstants.PLATFORM_ORG_ID, Boolean.TRUE); + return AlitaResult.success(configDto); + } + + +} diff --git a/src/main/java/com/newyetai/config/controller/ConfigController.java b/src/main/java/com/senmesh/config/controller/ConfigController.java similarity index 84% rename from src/main/java/com/newyetai/config/controller/ConfigController.java rename to src/main/java/com/senmesh/config/controller/ConfigController.java index 26592ae..49c0596 100644 --- a/src/main/java/com/newyetai/config/controller/ConfigController.java +++ b/src/main/java/com/senmesh/config/controller/ConfigController.java @@ -1,21 +1,17 @@ -package com.newyetai.config.controller; +package com.senmesh.config.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.Create; -import com.newyetai.config.dao.ConfigMapper; -import com.newyetai.config.dto.*; -import com.newyetai.config.service.ConfigService; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.config.dao.ConfigMapper; +import com.senmesh.config.dto.*; +import com.senmesh.config.service.ConfigService; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/com/newyetai/config/convert/ConfigConvert.java b/src/main/java/com/senmesh/config/convert/ConfigConvert.java similarity index 69% rename from src/main/java/com/newyetai/config/convert/ConfigConvert.java rename to src/main/java/com/senmesh/config/convert/ConfigConvert.java index c7c6321..3b20b52 100644 --- a/src/main/java/com/newyetai/config/convert/ConfigConvert.java +++ b/src/main/java/com/senmesh/config/convert/ConfigConvert.java @@ -1,8 +1,8 @@ -package com.newyetai.config.convert; +package com.senmesh.config.convert; -import com.newyetai.config.dto.ConfigDTO; -import com.newyetai.config.dto.ConfigOperatorDTO; -import com.newyetai.config.entity.Config; +import com.senmesh.config.dto.ConfigDTO; +import com.senmesh.config.dto.ConfigOperatorDTO; +import com.senmesh.config.entity.Config; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/src/main/java/com/newyetai/config/dao/ConfigMapper.java b/src/main/java/com/senmesh/config/dao/ConfigMapper.java similarity index 87% rename from src/main/java/com/newyetai/config/dao/ConfigMapper.java rename to src/main/java/com/senmesh/config/dao/ConfigMapper.java index e2d272a..16d6eec 100644 --- a/src/main/java/com/newyetai/config/dao/ConfigMapper.java +++ b/src/main/java/com/senmesh/config/dao/ConfigMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.config.dao; +package com.senmesh.config.dao; -import com.newyetai.config.dto.ConfigDTO; -import com.newyetai.config.dto.ConfigPageQueryDTO; -import com.newyetai.config.dto.ConfigQueryDTO; -import com.newyetai.config.dto.OrgInfoDTO; -import com.newyetai.config.entity.Config; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.config.dto.ConfigDTO; +import com.senmesh.config.dto.ConfigPageQueryDTO; +import com.senmesh.config.dto.ConfigQueryDTO; +import com.senmesh.config.dto.OrgInfoDTO; +import com.senmesh.config.entity.Config; +import com.senmesh.tkmybatis.mybatis.MyMapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/config/dto/AppVersionConfigInfo.java b/src/main/java/com/senmesh/config/dto/AppVersionConfigInfo.java similarity index 90% rename from src/main/java/com/newyetai/config/dto/AppVersionConfigInfo.java rename to src/main/java/com/senmesh/config/dto/AppVersionConfigInfo.java index cdec166..be5d92b 100644 --- a/src/main/java/com/newyetai/config/dto/AppVersionConfigInfo.java +++ b/src/main/java/com/senmesh/config/dto/AppVersionConfigInfo.java @@ -1,4 +1,4 @@ -package com.newyetai.config.dto; +package com.senmesh.config.dto; import lombok.Data; diff --git a/src/main/java/com/newyetai/config/dto/ConfigDTO.java b/src/main/java/com/senmesh/config/dto/ConfigDTO.java similarity index 83% rename from src/main/java/com/newyetai/config/dto/ConfigDTO.java rename to src/main/java/com/senmesh/config/dto/ConfigDTO.java index 2c8a2a5..c00528d 100644 --- a/src/main/java/com/newyetai/config/dto/ConfigDTO.java +++ b/src/main/java/com/senmesh/config/dto/ConfigDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.config.dto; +package com.senmesh.config.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.config.constant.ConfigConstants; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.config.constant.ConfigConstants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/newyetai/config/dto/ConfigOperatorDTO.java b/src/main/java/com/senmesh/config/dto/ConfigOperatorDTO.java similarity index 96% rename from src/main/java/com/newyetai/config/dto/ConfigOperatorDTO.java rename to src/main/java/com/senmesh/config/dto/ConfigOperatorDTO.java index b11fac1..8851c65 100644 --- a/src/main/java/com/newyetai/config/dto/ConfigOperatorDTO.java +++ b/src/main/java/com/senmesh/config/dto/ConfigOperatorDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.config.dto; +package com.senmesh.config.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/config/dto/ConfigPageQueryDTO.java b/src/main/java/com/senmesh/config/dto/ConfigPageQueryDTO.java similarity index 94% rename from src/main/java/com/newyetai/config/dto/ConfigPageQueryDTO.java rename to src/main/java/com/senmesh/config/dto/ConfigPageQueryDTO.java index cf94b3d..ce967f8 100644 --- a/src/main/java/com/newyetai/config/dto/ConfigPageQueryDTO.java +++ b/src/main/java/com/senmesh/config/dto/ConfigPageQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.config.dto; +package com.senmesh.config.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/config/dto/ConfigQueryDTO.java b/src/main/java/com/senmesh/config/dto/ConfigQueryDTO.java similarity index 98% rename from src/main/java/com/newyetai/config/dto/ConfigQueryDTO.java rename to src/main/java/com/senmesh/config/dto/ConfigQueryDTO.java index 8fc9330..05748d6 100644 --- a/src/main/java/com/newyetai/config/dto/ConfigQueryDTO.java +++ b/src/main/java/com/senmesh/config/dto/ConfigQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.config.dto; +package com.senmesh.config.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/newyetai/config/dto/OrgInfoDTO.java b/src/main/java/com/senmesh/config/dto/OrgInfoDTO.java similarity index 92% rename from src/main/java/com/newyetai/config/dto/OrgInfoDTO.java rename to src/main/java/com/senmesh/config/dto/OrgInfoDTO.java index 807eeda..e9ce0a6 100644 --- a/src/main/java/com/newyetai/config/dto/OrgInfoDTO.java +++ b/src/main/java/com/senmesh/config/dto/OrgInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.config.dto; +package com.senmesh.config.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/config/entity/Config.java b/src/main/java/com/senmesh/config/entity/Config.java similarity index 93% rename from src/main/java/com/newyetai/config/entity/Config.java rename to src/main/java/com/senmesh/config/entity/Config.java index 33afa04..17f9f8d 100644 --- a/src/main/java/com/newyetai/config/entity/Config.java +++ b/src/main/java/com/senmesh/config/entity/Config.java @@ -1,10 +1,10 @@ -package com.newyetai.config.entity; +package com.senmesh.config.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/config/mapper/ConfigMapper.xml b/src/main/java/com/senmesh/config/mapper/ConfigMapper.xml similarity index 90% rename from src/main/java/com/newyetai/config/mapper/ConfigMapper.xml rename to src/main/java/com/senmesh/config/mapper/ConfigMapper.xml index 5ecdb49..61623a4 100644 --- a/src/main/java/com/newyetai/config/mapper/ConfigMapper.xml +++ b/src/main/java/com/senmesh/config/mapper/ConfigMapper.xml @@ -2,7 +2,7 @@ - + UPDATE xs_config SET deleted = TRUE, @@ -12,12 +12,12 @@ AND config_code = #{configCode} - SELECT t.* - SELECT t.* ,o.org_name,o.id orgId FROM xs_config t @@ -105,7 +105,7 @@ ORDER BY t.id DESC - SELECT * FROM xs_config @@ -133,7 +133,7 @@ - SELECT c.* FROM @@ -161,7 +161,7 @@ - select a.* from (select * from xs_config @@ -176,14 +176,14 @@ and deleted = 0) a limit 1 - select * from xs_config where deleted = 0 and org_id = #{orgId} and config_code = #{configCode} limit 1 - SELECT o.id, o.org_name FROM xs_org o diff --git a/src/main/java/com/newyetai/config/service/ConfigService.java b/src/main/java/com/senmesh/config/service/ConfigService.java similarity index 77% rename from src/main/java/com/newyetai/config/service/ConfigService.java rename to src/main/java/com/senmesh/config/service/ConfigService.java index 4fabfb9..009b5a4 100644 --- a/src/main/java/com/newyetai/config/service/ConfigService.java +++ b/src/main/java/com/senmesh/config/service/ConfigService.java @@ -1,10 +1,10 @@ -package com.newyetai.config.service; +package com.senmesh.config.service; -import com.newyetai.config.dto.ConfigDTO; -import com.newyetai.config.dto.ConfigOperatorDTO; -import com.newyetai.config.dto.ConfigPageQueryDTO; -import com.newyetai.config.dto.ConfigQueryDTO; -import com.newyetai.config.entity.Config; +import com.senmesh.config.dto.ConfigDTO; +import com.senmesh.config.dto.ConfigOperatorDTO; +import com.senmesh.config.dto.ConfigPageQueryDTO; +import com.senmesh.config.dto.ConfigQueryDTO; +import com.senmesh.config.entity.Config; import javax.validation.Valid; import java.util.List; @@ -22,7 +22,7 @@ public interface ConfigService { * 配置表 - 创建 * * @param operatorDto 操作dto - * @return {@link com.newyetai.config.dto.ConfigDTO} + * @return {@link com.senmesh.config.dto.ConfigDTO} */ ConfigDTO create(@Valid ConfigOperatorDTO operatorDto); @@ -30,7 +30,7 @@ public interface ConfigService { * 配置表 - 修改 * * @param operatorDto 操作dto - * @return {@link com.newyetai.config.dto.ConfigDTO} + * @return {@link com.senmesh.config.dto.ConfigDTO} */ ConfigDTO modify(@Valid ConfigOperatorDTO operatorDto); @@ -38,7 +38,7 @@ public interface ConfigService { * 配置表 - 删除 * * @param id id - * @return {@link com.newyetai.config.dto.ConfigDTO} + * @return {@link com.senmesh.config.dto.ConfigDTO} */ ConfigDTO delete(Long id); @@ -46,7 +46,7 @@ public interface ConfigService { * 配置表 - 根据ID查询单个 * * @param id id - * @return {@link com.newyetai.config.dto.ConfigDTO} + * @return {@link com.senmesh.config.dto.ConfigDTO} */ ConfigDTO findById(Long id); @@ -54,7 +54,7 @@ public interface ConfigService { * 配置表 - 列表查询 * * @param queryDTO 列表查询dto - * @return {@link List}<{@link com.newyetai.config.dto.ConfigDTO}> + * @return {@link List}<{@link com.senmesh.config.dto.ConfigDTO}> */ List list(ConfigQueryDTO queryDTO); @@ -62,7 +62,7 @@ public interface ConfigService { * 配置表 - 分页查询 * * @param queryDTO 分页查询dto - * @return {@link com.newyetai.config.dto.ConfigDTO} + * @return {@link com.senmesh.config.dto.ConfigDTO} */ List page(ConfigPageQueryDTO queryDTO); diff --git a/src/main/java/com/newyetai/config/service/impl/ConfigServiceImpl.java b/src/main/java/com/senmesh/config/service/impl/ConfigServiceImpl.java similarity index 86% rename from src/main/java/com/newyetai/config/service/impl/ConfigServiceImpl.java rename to src/main/java/com/senmesh/config/service/impl/ConfigServiceImpl.java index f98e82d..b3c6f6d 100644 --- a/src/main/java/com/newyetai/config/service/impl/ConfigServiceImpl.java +++ b/src/main/java/com/senmesh/config/service/impl/ConfigServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.config.service.impl; +package com.senmesh.config.service.impl; import java.util.List; @@ -12,18 +12,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.config.constant.ConfigConstants; -import com.newyetai.config.convert.ConfigConvert; -import com.newyetai.config.dao.ConfigMapper; -import com.newyetai.config.dto.ConfigDTO; -import com.newyetai.config.dto.ConfigOperatorDTO; -import com.newyetai.config.dto.ConfigPageQueryDTO; -import com.newyetai.config.dto.ConfigQueryDTO; -import com.newyetai.config.entity.Config; -import com.newyetai.config.service.ConfigService; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.config.constant.ConfigConstants; +import com.senmesh.config.convert.ConfigConvert; +import com.senmesh.config.dao.ConfigMapper; +import com.senmesh.config.dto.ConfigDTO; +import com.senmesh.config.dto.ConfigOperatorDTO; +import com.senmesh.config.dto.ConfigPageQueryDTO; +import com.senmesh.config.dto.ConfigQueryDTO; +import com.senmesh.config.entity.Config; +import com.senmesh.config.service.ConfigService; /** * 配置 diff --git a/src/main/java/com/newyetai/config/util/ConfigUtils.java b/src/main/java/com/senmesh/config/util/ConfigUtils.java similarity index 88% rename from src/main/java/com/newyetai/config/util/ConfigUtils.java rename to src/main/java/com/senmesh/config/util/ConfigUtils.java index a13d154..5a39a6e 100644 --- a/src/main/java/com/newyetai/config/util/ConfigUtils.java +++ b/src/main/java/com/senmesh/config/util/ConfigUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.config.util; +package com.senmesh.config.util; -import com.newyetai.config.dto.ConfigDTO; -import com.newyetai.config.entity.Config; +import com.senmesh.config.dto.ConfigDTO; +import com.senmesh.config.entity.Config; /** * 配置工具类 diff --git a/src/main/java/com/newyetai/frame/redis/aop/annotation/AutoUnLock.java b/src/main/java/com/senmesh/frame/redis/aop/annotation/AutoUnLock.java similarity index 87% rename from src/main/java/com/newyetai/frame/redis/aop/annotation/AutoUnLock.java rename to src/main/java/com/senmesh/frame/redis/aop/annotation/AutoUnLock.java index 1bb4820..0809012 100644 --- a/src/main/java/com/newyetai/frame/redis/aop/annotation/AutoUnLock.java +++ b/src/main/java/com/senmesh/frame/redis/aop/annotation/AutoUnLock.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.aop.annotation; +package com.senmesh.frame.redis.aop.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonLock.java b/src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonLock.java similarity index 96% rename from src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonLock.java rename to src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonLock.java index f71315f..add62b9 100644 --- a/src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonLock.java +++ b/src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonLock.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.aop.annotation; +package com.senmesh.frame.redis.aop.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonLocks.java b/src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonLocks.java similarity index 90% rename from src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonLocks.java rename to src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonLocks.java index da78209..e8ac2b9 100644 --- a/src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonLocks.java +++ b/src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonLocks.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.aop.annotation; +package com.senmesh.frame.redis.aop.annotation; import java.lang.annotation.Documented; diff --git a/src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonMultiLock.java b/src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonMultiLock.java similarity index 96% rename from src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonMultiLock.java rename to src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonMultiLock.java index c875445..185f71b 100644 --- a/src/main/java/com/newyetai/frame/redis/aop/annotation/RedissonMultiLock.java +++ b/src/main/java/com/senmesh/frame/redis/aop/annotation/RedissonMultiLock.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.aop.annotation; +package com.senmesh.frame.redis.aop.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonLockAop.java b/src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonLockAop.java similarity index 80% rename from src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonLockAop.java rename to src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonLockAop.java index 981714f..8086ad2 100644 --- a/src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonLockAop.java +++ b/src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonLockAop.java @@ -1,8 +1,8 @@ -package com.newyetai.frame.redis.aop.aspect; +package com.senmesh.frame.redis.aop.aspect; -import com.newyetai.frame.redis.aop.annotation.RedissonLock; -import com.newyetai.frame.redis.util.IAopUtils; -import com.newyetai.frame.redis.util.LockUtils; +import com.senmesh.frame.redis.aop.annotation.RedissonLock; +import com.senmesh.frame.redis.util.IAopUtils; +import com.senmesh.frame.redis.util.LockUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; @Slf4j public class RedissonLockAop { - @Pointcut("@annotation(com.newyetai.frame.redis.aop.annotation.RedissonLock)") + @Pointcut("@annotation(com.senmesh.frame.redis.aop.annotation.RedissonLock)") public void annotationPointCut() { } diff --git a/src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonLocksAop.java b/src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonLocksAop.java similarity index 81% rename from src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonLocksAop.java rename to src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonLocksAop.java index d89ee04..851d4e2 100644 --- a/src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonLocksAop.java +++ b/src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonLocksAop.java @@ -1,9 +1,9 @@ -package com.newyetai.frame.redis.aop.aspect; +package com.senmesh.frame.redis.aop.aspect; -import com.newyetai.frame.redis.aop.annotation.RedissonLock; -import com.newyetai.frame.redis.aop.annotation.RedissonLocks; -import com.newyetai.frame.redis.util.IAopUtils; -import com.newyetai.frame.redis.util.LockUtils; +import com.senmesh.frame.redis.aop.annotation.RedissonLock; +import com.senmesh.frame.redis.aop.annotation.RedissonLocks; +import com.senmesh.frame.redis.util.IAopUtils; +import com.senmesh.frame.redis.util.LockUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; @Slf4j public class RedissonLocksAop { - @Pointcut("@annotation(com.newyetai.frame.redis.aop.annotation.RedissonLocks)") + @Pointcut("@annotation(com.senmesh.frame.redis.aop.annotation.RedissonLocks)") public void annotationPointCut() { } diff --git a/src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonMultiLockAop.java b/src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonMultiLockAop.java similarity index 92% rename from src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonMultiLockAop.java rename to src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonMultiLockAop.java index 395265f..784cc06 100644 --- a/src/main/java/com/newyetai/frame/redis/aop/aspect/RedissonMultiLockAop.java +++ b/src/main/java/com/senmesh/frame/redis/aop/aspect/RedissonMultiLockAop.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.aop.aspect; +package com.senmesh.frame.redis.aop.aspect; import java.util.ArrayList; import java.util.Collection; @@ -17,13 +17,13 @@ import org.aspectj.lang.reflect.MethodSignature; import org.redisson.api.RLock; import org.springframework.stereotype.Component; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.frame.redis.aop.annotation.RedissonMultiLock; -import com.newyetai.frame.redis.exception.RedisLockErrorParamException; -import com.newyetai.frame.redis.exception.RedisLockFailException; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.frame.redis.util.IAopUtils; -import com.newyetai.frame.redis.util.LockUtils; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.frame.redis.aop.annotation.RedissonMultiLock; +import com.senmesh.frame.redis.exception.RedisLockErrorParamException; +import com.senmesh.frame.redis.exception.RedisLockFailException; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.frame.redis.util.IAopUtils; +import com.senmesh.frame.redis.util.LockUtils; import lombok.extern.slf4j.Slf4j; @@ -37,7 +37,7 @@ public class RedissonMultiLockAop { public static final String FAIL_SET = "failSet"; - @Pointcut("@annotation(com.newyetai.frame.redis.aop.annotation.RedissonMultiLock)") + @Pointcut("@annotation(com.senmesh.frame.redis.aop.annotation.RedissonMultiLock)") public void annotationPointCut() {} @Around("annotationPointCut()") diff --git a/src/main/java/com/newyetai/frame/redis/aop/aspect/UnLockAutomaticallyAop.java b/src/main/java/com/senmesh/frame/redis/aop/aspect/UnLockAutomaticallyAop.java similarity index 78% rename from src/main/java/com/newyetai/frame/redis/aop/aspect/UnLockAutomaticallyAop.java rename to src/main/java/com/senmesh/frame/redis/aop/aspect/UnLockAutomaticallyAop.java index d23a9fe..704b850 100644 --- a/src/main/java/com/newyetai/frame/redis/aop/aspect/UnLockAutomaticallyAop.java +++ b/src/main/java/com/senmesh/frame/redis/aop/aspect/UnLockAutomaticallyAop.java @@ -1,6 +1,6 @@ -package com.newyetai.frame.redis.aop.aspect; +package com.senmesh.frame.redis.aop.aspect; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.frame.redis.redisson.RedissonUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; @Slf4j public class UnLockAutomaticallyAop { - @Pointcut("@annotation(com.newyetai.frame.redis.aop.annotation.AutoUnLock)") + @Pointcut("@annotation(com.senmesh.frame.redis.aop.annotation.AutoUnLock)") public void annotationPointCut() { } diff --git a/src/main/java/com/newyetai/frame/redis/config/RedisCacheConfig.java b/src/main/java/com/senmesh/frame/redis/config/RedisCacheConfig.java similarity index 99% rename from src/main/java/com/newyetai/frame/redis/config/RedisCacheConfig.java rename to src/main/java/com/senmesh/frame/redis/config/RedisCacheConfig.java index 9c269c5..182675e 100644 --- a/src/main/java/com/newyetai/frame/redis/config/RedisCacheConfig.java +++ b/src/main/java/com/senmesh/frame/redis/config/RedisCacheConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.config; +package com.senmesh.frame.redis.config; import java.util.LinkedHashSet; import java.util.List; diff --git a/src/main/java/com/newyetai/frame/redis/config/RedisConfig.java b/src/main/java/com/senmesh/frame/redis/config/RedisConfig.java similarity index 95% rename from src/main/java/com/newyetai/frame/redis/config/RedisConfig.java rename to src/main/java/com/senmesh/frame/redis/config/RedisConfig.java index 6d90ff0..fa69388 100644 --- a/src/main/java/com/newyetai/frame/redis/config/RedisConfig.java +++ b/src/main/java/com/senmesh/frame/redis/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.config; +package com.senmesh.frame.redis.config; import org.redisson.api.RedissonClient; import org.springframework.context.annotation.Bean; @@ -11,7 +11,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.ObjectMapper; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.frame.redis.redisson.RedissonUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/frame/redis/dto/LockDTO.java b/src/main/java/com/senmesh/frame/redis/dto/LockDTO.java similarity index 96% rename from src/main/java/com/newyetai/frame/redis/dto/LockDTO.java rename to src/main/java/com/senmesh/frame/redis/dto/LockDTO.java index b388e55..8505359 100644 --- a/src/main/java/com/newyetai/frame/redis/dto/LockDTO.java +++ b/src/main/java/com/senmesh/frame/redis/dto/LockDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.frame.redis.dto; +package com.senmesh.frame.redis.dto; -import com.newyetai.common.util.EnvironmentUtils; +import com.senmesh.common.util.EnvironmentUtils; import lombok.*; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/frame/redis/exception/RedisLockErrorParamException.java b/src/main/java/com/senmesh/frame/redis/exception/RedisLockErrorParamException.java similarity index 92% rename from src/main/java/com/newyetai/frame/redis/exception/RedisLockErrorParamException.java rename to src/main/java/com/senmesh/frame/redis/exception/RedisLockErrorParamException.java index 3356530..f17f0f6 100644 --- a/src/main/java/com/newyetai/frame/redis/exception/RedisLockErrorParamException.java +++ b/src/main/java/com/senmesh/frame/redis/exception/RedisLockErrorParamException.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.exception; +package com.senmesh.frame.redis.exception; /** * redis锁错误参数异常 diff --git a/src/main/java/com/newyetai/frame/redis/exception/RedisLockException.java b/src/main/java/com/senmesh/frame/redis/exception/RedisLockException.java similarity index 82% rename from src/main/java/com/newyetai/frame/redis/exception/RedisLockException.java rename to src/main/java/com/senmesh/frame/redis/exception/RedisLockException.java index b956e60..6fd6230 100644 --- a/src/main/java/com/newyetai/frame/redis/exception/RedisLockException.java +++ b/src/main/java/com/senmesh/frame/redis/exception/RedisLockException.java @@ -1,7 +1,7 @@ -package com.newyetai.frame.redis.exception; +package com.senmesh.frame.redis.exception; -import com.newyetai.common.exception.AlitaException; +import com.senmesh.common.exception.AlitaException; /** * redis锁专用异常父类 diff --git a/src/main/java/com/newyetai/frame/redis/exception/RedisLockFailException.java b/src/main/java/com/senmesh/frame/redis/exception/RedisLockFailException.java similarity index 91% rename from src/main/java/com/newyetai/frame/redis/exception/RedisLockFailException.java rename to src/main/java/com/senmesh/frame/redis/exception/RedisLockFailException.java index ca93d77..67fe068 100644 --- a/src/main/java/com/newyetai/frame/redis/exception/RedisLockFailException.java +++ b/src/main/java/com/senmesh/frame/redis/exception/RedisLockFailException.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.exception; +package com.senmesh.frame.redis.exception; /** * 加锁失败异常 diff --git a/src/main/java/com/newyetai/frame/redis/property/RedissonProperties.java b/src/main/java/com/senmesh/frame/redis/property/RedissonProperties.java similarity index 88% rename from src/main/java/com/newyetai/frame/redis/property/RedissonProperties.java rename to src/main/java/com/senmesh/frame/redis/property/RedissonProperties.java index c13bf3f..3ebaaf3 100644 --- a/src/main/java/com/newyetai/frame/redis/property/RedissonProperties.java +++ b/src/main/java/com/senmesh/frame/redis/property/RedissonProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.property; +package com.senmesh.frame.redis.property; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/newyetai/frame/redis/redisson/RedissonConfig.java b/src/main/java/com/senmesh/frame/redis/redisson/RedissonConfig.java similarity index 100% rename from src/main/java/com/newyetai/frame/redis/redisson/RedissonConfig.java rename to src/main/java/com/senmesh/frame/redis/redisson/RedissonConfig.java diff --git a/src/main/java/com/newyetai/frame/redis/redisson/RedissonUtils.java b/src/main/java/com/senmesh/frame/redis/redisson/RedissonUtils.java similarity index 96% rename from src/main/java/com/newyetai/frame/redis/redisson/RedissonUtils.java rename to src/main/java/com/senmesh/frame/redis/redisson/RedissonUtils.java index 79c2e72..2946b56 100644 --- a/src/main/java/com/newyetai/frame/redis/redisson/RedissonUtils.java +++ b/src/main/java/com/senmesh/frame/redis/redisson/RedissonUtils.java @@ -1,12 +1,11 @@ -package com.newyetai.frame.redis.redisson; +package com.senmesh.frame.redis.redisson; import com.google.common.collect.Lists; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.dto.IBaseDTO; -import com.newyetai.common.exception.ExistException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.function.TransactionAfterCommit; -import com.newyetai.frame.redis.dto.LockDTO; +import com.senmesh.common.dto.IBaseDTO; +import com.senmesh.common.exception.ExistException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.function.TransactionAfterCommit; +import com.senmesh.frame.redis.dto.LockDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/frame/redis/util/IAopUtils.java b/src/main/java/com/senmesh/frame/redis/util/IAopUtils.java similarity index 94% rename from src/main/java/com/newyetai/frame/redis/util/IAopUtils.java rename to src/main/java/com/senmesh/frame/redis/util/IAopUtils.java index 354bfdd..cd1c477 100644 --- a/src/main/java/com/newyetai/frame/redis/util/IAopUtils.java +++ b/src/main/java/com/senmesh/frame/redis/util/IAopUtils.java @@ -1,9 +1,9 @@ -package com.newyetai.frame.redis.util; +package com.senmesh.frame.redis.util; -import com.newyetai.frame.redis.aop.annotation.RedissonLock; -import com.newyetai.frame.redis.exception.RedisLockErrorParamException; -import com.newyetai.frame.redis.exception.RedisLockFailException; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.frame.redis.aop.annotation.RedissonLock; +import com.senmesh.frame.redis.exception.RedisLockErrorParamException; +import com.senmesh.frame.redis.exception.RedisLockFailException; +import com.senmesh.frame.redis.redisson.RedissonUtils; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/main/java/com/newyetai/frame/redis/util/LockUtils.java b/src/main/java/com/senmesh/frame/redis/util/LockUtils.java similarity index 94% rename from src/main/java/com/newyetai/frame/redis/util/LockUtils.java rename to src/main/java/com/senmesh/frame/redis/util/LockUtils.java index e7c79b5..75bd290 100644 --- a/src/main/java/com/newyetai/frame/redis/util/LockUtils.java +++ b/src/main/java/com/senmesh/frame/redis/util/LockUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.frame.redis.util; +package com.senmesh.frame.redis.util; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.frame.redis.redisson.RedissonUtils; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/frame/redis/util/RedisUtils.java b/src/main/java/com/senmesh/frame/redis/util/RedisUtils.java similarity index 98% rename from src/main/java/com/newyetai/frame/redis/util/RedisUtils.java rename to src/main/java/com/senmesh/frame/redis/util/RedisUtils.java index ced4886..75fed33 100644 --- a/src/main/java/com/newyetai/frame/redis/util/RedisUtils.java +++ b/src/main/java/com/senmesh/frame/redis/util/RedisUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.frame.redis.util; +package com.senmesh.frame.redis.util; import java.util.List; import java.util.Map; @@ -6,7 +6,6 @@ import java.util.concurrent.TimeUnit; import javax.annotation.PostConstruct; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/newyetai/frame/redis/util/RedissonHashUtils.java b/src/main/java/com/senmesh/frame/redis/util/RedissonHashUtils.java similarity index 92% rename from src/main/java/com/newyetai/frame/redis/util/RedissonHashUtils.java rename to src/main/java/com/senmesh/frame/redis/util/RedissonHashUtils.java index fd571f8..b872774 100644 --- a/src/main/java/com/newyetai/frame/redis/util/RedissonHashUtils.java +++ b/src/main/java/com/senmesh/frame/redis/util/RedissonHashUtils.java @@ -1,6 +1,6 @@ -package com.newyetai.frame.redis.util; +package com.senmesh.frame.redis.util; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.frame.redis.redisson.RedissonUtils; import java.util.Map; import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.ObjectUtils; diff --git a/src/main/java/com/newyetai/frame/redis/util/RedissonSetUtils.java b/src/main/java/com/senmesh/frame/redis/util/RedissonSetUtils.java similarity index 89% rename from src/main/java/com/newyetai/frame/redis/util/RedissonSetUtils.java rename to src/main/java/com/senmesh/frame/redis/util/RedissonSetUtils.java index 4d30b82..01eb1eb 100644 --- a/src/main/java/com/newyetai/frame/redis/util/RedissonSetUtils.java +++ b/src/main/java/com/senmesh/frame/redis/util/RedissonSetUtils.java @@ -1,6 +1,6 @@ -package com.newyetai.frame.redis.util; +package com.senmesh.frame.redis.util; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.frame.redis.redisson.RedissonUtils; import java.util.concurrent.TimeUnit; import org.redisson.api.RSet; diff --git a/src/main/java/com/newyetai/frame/redis/util/RedissonValueUtils.java b/src/main/java/com/senmesh/frame/redis/util/RedissonValueUtils.java similarity index 91% rename from src/main/java/com/newyetai/frame/redis/util/RedissonValueUtils.java rename to src/main/java/com/senmesh/frame/redis/util/RedissonValueUtils.java index f1b3bd9..097d94d 100644 --- a/src/main/java/com/newyetai/frame/redis/util/RedissonValueUtils.java +++ b/src/main/java/com/senmesh/frame/redis/util/RedissonValueUtils.java @@ -1,6 +1,6 @@ -package com.newyetai.frame.redis.util; +package com.senmesh.frame.redis.util; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.frame.redis.redisson.RedissonUtils; import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.ObjectUtils; import org.redisson.api.RBucket; diff --git a/src/main/java/com/newyetai/mq/config/ExchangeManager.java b/src/main/java/com/senmesh/mq/config/ExchangeManager.java similarity index 84% rename from src/main/java/com/newyetai/mq/config/ExchangeManager.java rename to src/main/java/com/senmesh/mq/config/ExchangeManager.java index f8231c9..dd9812b 100644 --- a/src/main/java/com/newyetai/mq/config/ExchangeManager.java +++ b/src/main/java/com/senmesh/mq/config/ExchangeManager.java @@ -1,13 +1,12 @@ -package com.newyetai.mq.config; +package com.senmesh.mq.config; -import org.springframework.amqp.core.CustomExchange; import org.springframework.amqp.core.Exchange; import org.springframework.amqp.core.TopicExchange; import org.springframework.beans.factory.annotation.Autowired; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.mq.constant.ExchangeTypeEnum; -import com.newyetai.mq.exception.MqException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.mq.constant.ExchangeTypeEnum; +import com.senmesh.mq.exception.MqException; public class ExchangeManager { diff --git a/src/main/java/com/newyetai/mq/config/QueueManager.java b/src/main/java/com/senmesh/mq/config/QueueManager.java similarity index 98% rename from src/main/java/com/newyetai/mq/config/QueueManager.java rename to src/main/java/com/senmesh/mq/config/QueueManager.java index f43c788..699e1ce 100644 --- a/src/main/java/com/newyetai/mq/config/QueueManager.java +++ b/src/main/java/com/senmesh/mq/config/QueueManager.java @@ -1,4 +1,4 @@ -package com.newyetai.mq.config; +package com.senmesh.mq.config; import org.springframework.amqp.core.*; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; diff --git a/src/main/java/com/newyetai/mq/config/RabbitCustomProperties.java b/src/main/java/com/senmesh/mq/config/RabbitCustomProperties.java similarity index 95% rename from src/main/java/com/newyetai/mq/config/RabbitCustomProperties.java rename to src/main/java/com/senmesh/mq/config/RabbitCustomProperties.java index 5a3ea35..3f82bd2 100644 --- a/src/main/java/com/newyetai/mq/config/RabbitCustomProperties.java +++ b/src/main/java/com/senmesh/mq/config/RabbitCustomProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.mq.config; +package com.senmesh.mq.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/mq/config/RabbitMqConfiguration.java b/src/main/java/com/senmesh/mq/config/RabbitMqConfiguration.java similarity index 89% rename from src/main/java/com/newyetai/mq/config/RabbitMqConfiguration.java rename to src/main/java/com/senmesh/mq/config/RabbitMqConfiguration.java index 0439c46..e3112dd 100644 --- a/src/main/java/com/newyetai/mq/config/RabbitMqConfiguration.java +++ b/src/main/java/com/senmesh/mq/config/RabbitMqConfiguration.java @@ -1,10 +1,8 @@ -package com.newyetai.mq.config; +package com.senmesh.mq.config; import java.util.List; -import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.springframework.amqp.core.CustomExchange; import org.springframework.amqp.core.TopicExchange; import org.springframework.amqp.rabbit.config.AbstractRabbitListenerContainerFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; @@ -17,16 +15,15 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.google.common.collect.Maps; -import com.newyetai.common.CommonConfiguration; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.mq.consumer.ConsumerDeliverer; -import com.newyetai.mq.consumer.InitHandler; -import com.newyetai.mq.consumer.handler.IMqHandler; -import com.newyetai.mq.producer.sender.DefaultMqSender; -import com.newyetai.mq.producer.sender.IMqSender; -import com.newyetai.mq.util.MqSendUtils; +import com.senmesh.common.CommonConfiguration; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.mq.consumer.ConsumerDeliverer; +import com.senmesh.mq.consumer.InitHandler; +import com.senmesh.mq.consumer.handler.IMqHandler; +import com.senmesh.mq.producer.sender.DefaultMqSender; +import com.senmesh.mq.producer.sender.IMqSender; +import com.senmesh.mq.util.MqSendUtils; /** * @author sr on 2020-07-22 diff --git a/src/main/java/com/newyetai/mq/constant/ExchangeTypeEnum.java b/src/main/java/com/senmesh/mq/constant/ExchangeTypeEnum.java similarity index 83% rename from src/main/java/com/newyetai/mq/constant/ExchangeTypeEnum.java rename to src/main/java/com/senmesh/mq/constant/ExchangeTypeEnum.java index 3f48541..38a7381 100644 --- a/src/main/java/com/newyetai/mq/constant/ExchangeTypeEnum.java +++ b/src/main/java/com/senmesh/mq/constant/ExchangeTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.mq.constant; +package com.senmesh.mq.constant; /** * 交换机 diff --git a/src/main/java/com/newyetai/mq/constant/MqConstant.java b/src/main/java/com/senmesh/mq/constant/MqConstant.java similarity index 82% rename from src/main/java/com/newyetai/mq/constant/MqConstant.java rename to src/main/java/com/senmesh/mq/constant/MqConstant.java index 7ec449a..4f3a0f7 100644 --- a/src/main/java/com/newyetai/mq/constant/MqConstant.java +++ b/src/main/java/com/senmesh/mq/constant/MqConstant.java @@ -1,4 +1,4 @@ -package com.newyetai.mq.constant; +package com.senmesh.mq.constant; /** * mq常数 diff --git a/src/main/java/com/newyetai/mq/consumer/ConsumerDeliverer.java b/src/main/java/com/senmesh/mq/consumer/ConsumerDeliverer.java similarity index 92% rename from src/main/java/com/newyetai/mq/consumer/ConsumerDeliverer.java rename to src/main/java/com/senmesh/mq/consumer/ConsumerDeliverer.java index 9ed5dc9..74e5908 100644 --- a/src/main/java/com/newyetai/mq/consumer/ConsumerDeliverer.java +++ b/src/main/java/com/senmesh/mq/consumer/ConsumerDeliverer.java @@ -1,4 +1,4 @@ -package com.newyetai.mq.consumer; +package com.senmesh.mq.consumer; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -17,13 +17,13 @@ import org.springframework.core.ParameterizedTypeReference; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.newyetai.common.constant.ProjectProfileEnum; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.ParameterizedTypeImpl; -import com.newyetai.mq.constant.MqConstant; -import com.newyetai.mq.consumer.handler.IMqHandler; -import com.newyetai.mq.dto.IMqMessage; +import com.senmesh.common.constant.ProjectProfileEnum; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.ParameterizedTypeImpl; +import com.senmesh.mq.constant.MqConstant; +import com.senmesh.mq.consumer.handler.IMqHandler; +import com.senmesh.mq.dto.IMqMessage; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/mq/consumer/InitHandler.java b/src/main/java/com/senmesh/mq/consumer/InitHandler.java similarity index 80% rename from src/main/java/com/newyetai/mq/consumer/InitHandler.java rename to src/main/java/com/senmesh/mq/consumer/InitHandler.java index d810d93..2058770 100644 --- a/src/main/java/com/newyetai/mq/consumer/InitHandler.java +++ b/src/main/java/com/senmesh/mq/consumer/InitHandler.java @@ -1,13 +1,13 @@ -package com.newyetai.mq.consumer; +package com.senmesh.mq.consumer; import com.google.common.collect.Lists; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.mq.config.ExchangeManager; -import com.newyetai.mq.config.QueueManager; -import com.newyetai.mq.config.RabbitCustomProperties; -import com.newyetai.mq.constant.MqConstant; -import com.newyetai.mq.consumer.handler.IMqHandler; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.mq.config.ExchangeManager; +import com.senmesh.mq.config.QueueManager; +import com.senmesh.mq.config.RabbitCustomProperties; +import com.senmesh.mq.constant.MqConstant; +import com.senmesh.mq.consumer.handler.IMqHandler; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/mq/consumer/handler/IDelayedMqHandler.java b/src/main/java/com/senmesh/mq/consumer/handler/IDelayedMqHandler.java similarity index 100% rename from src/main/java/com/newyetai/mq/consumer/handler/IDelayedMqHandler.java rename to src/main/java/com/senmesh/mq/consumer/handler/IDelayedMqHandler.java diff --git a/src/main/java/com/newyetai/mq/consumer/handler/IMqHandler.java b/src/main/java/com/senmesh/mq/consumer/handler/IMqHandler.java similarity index 89% rename from src/main/java/com/newyetai/mq/consumer/handler/IMqHandler.java rename to src/main/java/com/senmesh/mq/consumer/handler/IMqHandler.java index 0a0a5c3..c0ad74b 100644 --- a/src/main/java/com/newyetai/mq/consumer/handler/IMqHandler.java +++ b/src/main/java/com/senmesh/mq/consumer/handler/IMqHandler.java @@ -1,7 +1,7 @@ -package com.newyetai.mq.consumer.handler; +package com.senmesh.mq.consumer.handler; -import com.newyetai.mq.constant.ExchangeTypeEnum; -import com.newyetai.mq.dto.IMqMessage; +import com.senmesh.mq.constant.ExchangeTypeEnum; +import com.senmesh.mq.dto.IMqMessage; /** * 消费者处理类 diff --git a/src/main/java/com/newyetai/mq/consumer/handler/ITopicMqHandler.java b/src/main/java/com/senmesh/mq/consumer/handler/ITopicMqHandler.java similarity index 77% rename from src/main/java/com/newyetai/mq/consumer/handler/ITopicMqHandler.java rename to src/main/java/com/senmesh/mq/consumer/handler/ITopicMqHandler.java index b6ebe85..5bb8aab 100644 --- a/src/main/java/com/newyetai/mq/consumer/handler/ITopicMqHandler.java +++ b/src/main/java/com/senmesh/mq/consumer/handler/ITopicMqHandler.java @@ -1,7 +1,7 @@ -package com.newyetai.mq.consumer.handler; +package com.senmesh.mq.consumer.handler; -import com.newyetai.mq.constant.ExchangeTypeEnum; -import com.newyetai.mq.dto.TopicMqMessage; +import com.senmesh.mq.constant.ExchangeTypeEnum; +import com.senmesh.mq.dto.TopicMqMessage; /** * 消费者处理类(通用交换机) diff --git a/src/main/java/com/newyetai/mq/dto/AbstractMqMessage.java b/src/main/java/com/senmesh/mq/dto/AbstractMqMessage.java similarity index 96% rename from src/main/java/com/newyetai/mq/dto/AbstractMqMessage.java rename to src/main/java/com/senmesh/mq/dto/AbstractMqMessage.java index c5d166e..24f7586 100644 --- a/src/main/java/com/newyetai/mq/dto/AbstractMqMessage.java +++ b/src/main/java/com/senmesh/mq/dto/AbstractMqMessage.java @@ -1,4 +1,4 @@ -package com.newyetai.mq.dto; +package com.senmesh.mq.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/mq/dto/DelayedMqMessage.java b/src/main/java/com/senmesh/mq/dto/DelayedMqMessage.java similarity index 84% rename from src/main/java/com/newyetai/mq/dto/DelayedMqMessage.java rename to src/main/java/com/senmesh/mq/dto/DelayedMqMessage.java index deac3ed..9e8054a 100644 --- a/src/main/java/com/newyetai/mq/dto/DelayedMqMessage.java +++ b/src/main/java/com/senmesh/mq/dto/DelayedMqMessage.java @@ -1,9 +1,6 @@ -package com.newyetai.mq.dto; +package com.senmesh.mq.dto; -import java.util.Optional; -import java.util.concurrent.TimeUnit; - -import com.newyetai.mq.constant.ExchangeTypeEnum; +import com.senmesh.mq.constant.ExchangeTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder.Default; diff --git a/src/main/java/com/newyetai/mq/dto/IMqMessage.java b/src/main/java/com/senmesh/mq/dto/IMqMessage.java similarity index 84% rename from src/main/java/com/newyetai/mq/dto/IMqMessage.java rename to src/main/java/com/senmesh/mq/dto/IMqMessage.java index b045daa..5a5a31e 100644 --- a/src/main/java/com/newyetai/mq/dto/IMqMessage.java +++ b/src/main/java/com/senmesh/mq/dto/IMqMessage.java @@ -1,6 +1,6 @@ -package com.newyetai.mq.dto; +package com.senmesh.mq.dto; -import com.newyetai.mq.constant.ExchangeTypeEnum; +import com.senmesh.mq.constant.ExchangeTypeEnum; /** * 消息 diff --git a/src/main/java/com/newyetai/mq/dto/TopicMqMessage.java b/src/main/java/com/senmesh/mq/dto/TopicMqMessage.java similarity index 82% rename from src/main/java/com/newyetai/mq/dto/TopicMqMessage.java rename to src/main/java/com/senmesh/mq/dto/TopicMqMessage.java index 9171767..ee12132 100644 --- a/src/main/java/com/newyetai/mq/dto/TopicMqMessage.java +++ b/src/main/java/com/senmesh/mq/dto/TopicMqMessage.java @@ -1,9 +1,8 @@ -package com.newyetai.mq.dto; +package com.senmesh.mq.dto; -import com.newyetai.mq.constant.ExchangeTypeEnum; +import com.senmesh.mq.constant.ExchangeTypeEnum; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Builder.Default; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/mq/exception/MqException.java b/src/main/java/com/senmesh/mq/exception/MqException.java similarity index 82% rename from src/main/java/com/newyetai/mq/exception/MqException.java rename to src/main/java/com/senmesh/mq/exception/MqException.java index 3c2502f..c23ec96 100644 --- a/src/main/java/com/newyetai/mq/exception/MqException.java +++ b/src/main/java/com/senmesh/mq/exception/MqException.java @@ -1,6 +1,6 @@ -package com.newyetai.mq.exception; +package com.senmesh.mq.exception; -import com.newyetai.common.exception.BusinessException; +import com.senmesh.common.exception.BusinessException; /** * 异常 diff --git a/src/main/java/com/newyetai/mq/producer/sender/DefaultMqSender.java b/src/main/java/com/senmesh/mq/producer/sender/DefaultMqSender.java similarity index 85% rename from src/main/java/com/newyetai/mq/producer/sender/DefaultMqSender.java rename to src/main/java/com/senmesh/mq/producer/sender/DefaultMqSender.java index 034dec3..3a05b1e 100644 --- a/src/main/java/com/newyetai/mq/producer/sender/DefaultMqSender.java +++ b/src/main/java/com/senmesh/mq/producer/sender/DefaultMqSender.java @@ -1,15 +1,13 @@ -package com.newyetai.mq.producer.sender; +package com.senmesh.mq.producer.sender; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.mq.config.ExchangeManager; -import com.newyetai.mq.config.RabbitCustomProperties; -import com.newyetai.mq.dto.AbstractMqMessage; -import com.newyetai.mq.dto.DelayedMqMessage; -import com.newyetai.mq.dto.IMqMessage; -import com.newyetai.mq.dto.TopicMqMessage; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.mq.config.ExchangeManager; +import com.senmesh.mq.config.RabbitCustomProperties; +import com.senmesh.mq.dto.AbstractMqMessage; +import com.senmesh.mq.dto.TopicMqMessage; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.AmqpException; diff --git a/src/main/java/com/newyetai/mq/producer/sender/IMqSender.java b/src/main/java/com/senmesh/mq/producer/sender/IMqSender.java similarity index 82% rename from src/main/java/com/newyetai/mq/producer/sender/IMqSender.java rename to src/main/java/com/senmesh/mq/producer/sender/IMqSender.java index 3f9c734..606d68f 100644 --- a/src/main/java/com/newyetai/mq/producer/sender/IMqSender.java +++ b/src/main/java/com/senmesh/mq/producer/sender/IMqSender.java @@ -1,10 +1,9 @@ -package com.newyetai.mq.producer.sender; +package com.senmesh.mq.producer.sender; import java.util.concurrent.TimeUnit; -import com.newyetai.common.AlitaResult; -import com.newyetai.mq.dto.AbstractMqMessage; -import com.newyetai.mq.dto.IMqMessage; +import com.senmesh.common.AlitaResult; +import com.senmesh.mq.dto.AbstractMqMessage; /** * 消息发送者 diff --git a/src/main/java/com/newyetai/mq/util/MqSendUtils.java b/src/main/java/com/senmesh/mq/util/MqSendUtils.java similarity index 84% rename from src/main/java/com/newyetai/mq/util/MqSendUtils.java rename to src/main/java/com/senmesh/mq/util/MqSendUtils.java index f91f374..e98ef60 100644 --- a/src/main/java/com/newyetai/mq/util/MqSendUtils.java +++ b/src/main/java/com/senmesh/mq/util/MqSendUtils.java @@ -1,10 +1,8 @@ -package com.newyetai.mq.util; +package com.senmesh.mq.util; -import java.util.concurrent.TimeUnit; - -import com.newyetai.common.AlitaResult; -import com.newyetai.mq.dto.AbstractMqMessage; -import com.newyetai.mq.producer.sender.IMqSender; +import com.senmesh.common.AlitaResult; +import com.senmesh.mq.dto.AbstractMqMessage; +import com.senmesh.mq.producer.sender.IMqSender; /** * @Author dylanyuan diff --git a/src/main/java/com/newyetai/mybatis/config/MybatisConfig.java b/src/main/java/com/senmesh/mybatis/config/MybatisConfig.java similarity index 90% rename from src/main/java/com/newyetai/mybatis/config/MybatisConfig.java rename to src/main/java/com/senmesh/mybatis/config/MybatisConfig.java index cbc900d..b22ce6d 100644 --- a/src/main/java/com/newyetai/mybatis/config/MybatisConfig.java +++ b/src/main/java/com/senmesh/mybatis/config/MybatisConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.mybatis.config; +package com.senmesh.mybatis.config; import java.util.List; @@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration; -import com.newyetai.mybatis.handle.BaseEnumTypeHandler; -import com.newyetai.mybatis.interceptor.MyPageInterceptor; +import com.senmesh.mybatis.handle.BaseEnumTypeHandler; +import com.senmesh.mybatis.interceptor.MyPageInterceptor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/mybatis/converters/ObjectToBaseEnumConverter.java b/src/main/java/com/senmesh/mybatis/converters/ObjectToBaseEnumConverter.java similarity index 93% rename from src/main/java/com/newyetai/mybatis/converters/ObjectToBaseEnumConverter.java rename to src/main/java/com/senmesh/mybatis/converters/ObjectToBaseEnumConverter.java index 8d482c4..633558e 100644 --- a/src/main/java/com/newyetai/mybatis/converters/ObjectToBaseEnumConverter.java +++ b/src/main/java/com/senmesh/mybatis/converters/ObjectToBaseEnumConverter.java @@ -1,7 +1,7 @@ -package com.newyetai.mybatis.converters; +package com.senmesh.mybatis.converters; import com.google.common.collect.Sets; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; import java.util.Arrays; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/newyetai/mybatis/handle/BaseEnum.java b/src/main/java/com/senmesh/mybatis/handle/BaseEnum.java similarity index 77% rename from src/main/java/com/newyetai/mybatis/handle/BaseEnum.java rename to src/main/java/com/senmesh/mybatis/handle/BaseEnum.java index eaed3da..72282f4 100644 --- a/src/main/java/com/newyetai/mybatis/handle/BaseEnum.java +++ b/src/main/java/com/senmesh/mybatis/handle/BaseEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.mybatis.handle; +package com.senmesh.mybatis.handle; public interface BaseEnum { diff --git a/src/main/java/com/newyetai/mybatis/handle/BaseEnumTypeHandler.java b/src/main/java/com/senmesh/mybatis/handle/BaseEnumTypeHandler.java similarity index 98% rename from src/main/java/com/newyetai/mybatis/handle/BaseEnumTypeHandler.java rename to src/main/java/com/senmesh/mybatis/handle/BaseEnumTypeHandler.java index a9c296d..2b9e5cc 100644 --- a/src/main/java/com/newyetai/mybatis/handle/BaseEnumTypeHandler.java +++ b/src/main/java/com/senmesh/mybatis/handle/BaseEnumTypeHandler.java @@ -1,4 +1,4 @@ -package com.newyetai.mybatis.handle; +package com.senmesh.mybatis.handle; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; diff --git a/src/main/java/com/newyetai/mybatis/interceptor/MyPageInterceptor.java b/src/main/java/com/senmesh/mybatis/interceptor/MyPageInterceptor.java similarity index 95% rename from src/main/java/com/newyetai/mybatis/interceptor/MyPageInterceptor.java rename to src/main/java/com/senmesh/mybatis/interceptor/MyPageInterceptor.java index 3e302f1..2714299 100644 --- a/src/main/java/com/newyetai/mybatis/interceptor/MyPageInterceptor.java +++ b/src/main/java/com/senmesh/mybatis/interceptor/MyPageInterceptor.java @@ -1,9 +1,9 @@ -package com.newyetai.mybatis.interceptor; +package com.senmesh.mybatis.interceptor; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageRowBounds; -import com.newyetai.common.dto.IPage; +import com.senmesh.common.dto.IPage; import org.apache.ibatis.cache.CacheKey; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.mapping.BoundSql; @@ -14,7 +14,6 @@ import org.apache.ibatis.session.RowBounds; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Properties; /** diff --git a/src/main/java/com/newyetai/mybatisplus/config/AutoMetaObjectHandler.java b/src/main/java/com/senmesh/mybatisplus/config/AutoMetaObjectHandler.java similarity index 85% rename from src/main/java/com/newyetai/mybatisplus/config/AutoMetaObjectHandler.java rename to src/main/java/com/senmesh/mybatisplus/config/AutoMetaObjectHandler.java index 721dfb1..a8c7fdf 100644 --- a/src/main/java/com/newyetai/mybatisplus/config/AutoMetaObjectHandler.java +++ b/src/main/java/com/senmesh/mybatisplus/config/AutoMetaObjectHandler.java @@ -1,10 +1,9 @@ -package com.newyetai.mybatisplus.config; +package com.senmesh.mybatisplus.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.util.UserContextHolder; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; -import org.springframework.stereotype.Component; import java.util.Date; diff --git a/src/main/java/com/newyetai/mybatisplus/config/MybatisPlusConfig.java b/src/main/java/com/senmesh/mybatisplus/config/MybatisPlusConfig.java similarity index 91% rename from src/main/java/com/newyetai/mybatisplus/config/MybatisPlusConfig.java rename to src/main/java/com/senmesh/mybatisplus/config/MybatisPlusConfig.java index 3960857..17d7288 100644 --- a/src/main/java/com/newyetai/mybatisplus/config/MybatisPlusConfig.java +++ b/src/main/java/com/senmesh/mybatisplus/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.mybatisplus.config; +package com.senmesh.mybatisplus.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration -@MapperScan(basePackages = {"com.newyetai.**.dao.**"}) +@MapperScan(basePackages = {"com.senmesh.**.dao.**"}) public class MybatisPlusConfig { @Bean diff --git a/src/main/java/com/newyetai/mybatisplus/injector/Exists.java b/src/main/java/com/senmesh/mybatisplus/injector/Exists.java similarity index 97% rename from src/main/java/com/newyetai/mybatisplus/injector/Exists.java rename to src/main/java/com/senmesh/mybatisplus/injector/Exists.java index 0db4139..d8a634c 100644 --- a/src/main/java/com/newyetai/mybatisplus/injector/Exists.java +++ b/src/main/java/com/senmesh/mybatisplus/injector/Exists.java @@ -1,4 +1,4 @@ -package com.newyetai.mybatisplus.injector; +package com.senmesh.mybatisplus.injector; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; diff --git a/src/main/java/com/newyetai/mybatisplus/injector/MySqlInjector.java b/src/main/java/com/senmesh/mybatisplus/injector/MySqlInjector.java similarity index 95% rename from src/main/java/com/newyetai/mybatisplus/injector/MySqlInjector.java rename to src/main/java/com/senmesh/mybatisplus/injector/MySqlInjector.java index 8de6ca2..967e6b8 100644 --- a/src/main/java/com/newyetai/mybatisplus/injector/MySqlInjector.java +++ b/src/main/java/com/senmesh/mybatisplus/injector/MySqlInjector.java @@ -1,4 +1,4 @@ -package com.newyetai.mybatisplus.injector; +package com.senmesh.mybatisplus.injector; import java.util.List; diff --git a/src/main/java/com/newyetai/mybatisplus/util/MybatisPlusUtils.java b/src/main/java/com/senmesh/mybatisplus/util/MybatisPlusUtils.java similarity index 95% rename from src/main/java/com/newyetai/mybatisplus/util/MybatisPlusUtils.java rename to src/main/java/com/senmesh/mybatisplus/util/MybatisPlusUtils.java index f427b71..594316f 100644 --- a/src/main/java/com/newyetai/mybatisplus/util/MybatisPlusUtils.java +++ b/src/main/java/com/senmesh/mybatisplus/util/MybatisPlusUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.mybatisplus.util; +package com.senmesh.mybatisplus.util; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/src/main/java/com/newyetai/sdk/ai/config/AiProperties.java b/src/main/java/com/senmesh/sdk/ai/config/AiProperties.java similarity index 94% rename from src/main/java/com/newyetai/sdk/ai/config/AiProperties.java rename to src/main/java/com/senmesh/sdk/ai/config/AiProperties.java index 7d35636..fdc740a 100644 --- a/src/main/java/com/newyetai/sdk/ai/config/AiProperties.java +++ b/src/main/java/com/senmesh/sdk/ai/config/AiProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ai.config; +package com.senmesh.sdk.ai.config; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/senmesh/sdk/ai/service/service/AiProvider.java b/src/main/java/com/senmesh/sdk/ai/service/service/AiProvider.java new file mode 100644 index 0000000..0712f1b --- /dev/null +++ b/src/main/java/com/senmesh/sdk/ai/service/service/AiProvider.java @@ -0,0 +1,37 @@ +package com.senmesh.sdk.ai.service.service; + +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.ai.config.AiProperties; +import com.senmesh.sdk.deepseek.service.DeepSeekProvider; +import com.senmesh.sdk.xf.config.XfProperties; +import com.senmesh.sdk.xf.model.ChatReq; +import com.senmesh.sdk.xf.service.XfSparkProvider; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class AiProvider { + + private static AiProperties aiProperties; + + @Autowired + private DeepSeekProvider deepSeekProvider; + @Autowired + private XfSparkProvider xfSparkProvider; + + private AiProvider(AiProperties aiProperties) { + AiProvider.aiProperties = aiProperties; + } + + public static AlitaResult httpChat(ChatReq req) { + if (aiProperties.getChatProvider().equals(XfProperties.PREFIX)) { + return XfSparkProvider.httpChat(req); + } else { + req.setModel("deepseek-chat"); + return DeepSeekProvider.httpChat(req); + } + } + +} diff --git a/src/main/java/com/newyetai/sdk/ai/util/AIUtils.java b/src/main/java/com/senmesh/sdk/ai/util/AIUtils.java similarity index 60% rename from src/main/java/com/newyetai/sdk/ai/util/AIUtils.java rename to src/main/java/com/senmesh/sdk/ai/util/AIUtils.java index dd32f08..e00fc34 100644 --- a/src/main/java/com/newyetai/sdk/ai/util/AIUtils.java +++ b/src/main/java/com/senmesh/sdk/ai/util/AIUtils.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.ai.util; +package com.senmesh.sdk.ai.util; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.sdk.ai.service.service.AiProvider; -import com.newyetai.sdk.xf.model.ChatReq; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.sdk.ai.service.service.AiProvider; +import com.senmesh.sdk.xf.model.ChatReq; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/newyetai/sdk/ali/config/AliProperties.java b/src/main/java/com/senmesh/sdk/ali/config/AliProperties.java similarity index 89% rename from src/main/java/com/newyetai/sdk/ali/config/AliProperties.java rename to src/main/java/com/senmesh/sdk/ali/config/AliProperties.java index 3a96b40..5627464 100644 --- a/src/main/java/com/newyetai/sdk/ali/config/AliProperties.java +++ b/src/main/java/com/senmesh/sdk/ali/config/AliProperties.java @@ -1,6 +1,5 @@ -package com.newyetai.sdk.ali.config; +package com.senmesh.sdk.ali.config; -import com.newyetai.sdk.chuanglan.config.ChuangLanCommonProperties; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Builder.Default; diff --git a/src/main/java/com/newyetai/sdk/ali/dto/IdCardReq.java b/src/main/java/com/senmesh/sdk/ali/dto/IdCardReq.java similarity index 87% rename from src/main/java/com/newyetai/sdk/ali/dto/IdCardReq.java rename to src/main/java/com/senmesh/sdk/ali/dto/IdCardReq.java index 149fa6c..444d7d4 100644 --- a/src/main/java/com/newyetai/sdk/ali/dto/IdCardReq.java +++ b/src/main/java/com/senmesh/sdk/ali/dto/IdCardReq.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.ali.dto; +package com.senmesh.sdk.ali.dto; -import com.newyetai.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.common.dto.ISdkRequest; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/ali/dto/IdCardRes.java b/src/main/java/com/senmesh/sdk/ali/dto/IdCardRes.java similarity index 94% rename from src/main/java/com/newyetai/sdk/ali/dto/IdCardRes.java rename to src/main/java/com/senmesh/sdk/ali/dto/IdCardRes.java index 2a56c40..ab98a72 100644 --- a/src/main/java/com/newyetai/sdk/ali/dto/IdCardRes.java +++ b/src/main/java/com/senmesh/sdk/ali/dto/IdCardRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ali.dto; +package com.senmesh.sdk.ali.dto; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/ali/dto/VerifyRes.java b/src/main/java/com/senmesh/sdk/ali/dto/VerifyRes.java similarity index 88% rename from src/main/java/com/newyetai/sdk/ali/dto/VerifyRes.java rename to src/main/java/com/senmesh/sdk/ali/dto/VerifyRes.java index 10f7c7a..fe874bd 100644 --- a/src/main/java/com/newyetai/sdk/ali/dto/VerifyRes.java +++ b/src/main/java/com/senmesh/sdk/ali/dto/VerifyRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ali.dto; +package com.senmesh.sdk.ali.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/ali/service/AliVerifyService.java b/src/main/java/com/senmesh/sdk/ali/service/AliVerifyService.java similarity index 52% rename from src/main/java/com/newyetai/sdk/ali/service/AliVerifyService.java rename to src/main/java/com/senmesh/sdk/ali/service/AliVerifyService.java index 5124cd1..a91384a 100644 --- a/src/main/java/com/newyetai/sdk/ali/service/AliVerifyService.java +++ b/src/main/java/com/senmesh/sdk/ali/service/AliVerifyService.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.ali.service; +package com.senmesh.sdk.ali.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.ali.dto.IdCardReq; -import com.newyetai.sdk.ali.dto.IdCardRes; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.ali.dto.IdCardReq; +import com.senmesh.sdk.ali.dto.IdCardRes; public interface AliVerifyService { diff --git a/src/main/java/com/newyetai/sdk/ali/service/impl/AliVerifyServiceImpl.java b/src/main/java/com/senmesh/sdk/ali/service/impl/AliVerifyServiceImpl.java similarity index 78% rename from src/main/java/com/newyetai/sdk/ali/service/impl/AliVerifyServiceImpl.java rename to src/main/java/com/senmesh/sdk/ali/service/impl/AliVerifyServiceImpl.java index 6849020..d02008c 100644 --- a/src/main/java/com/newyetai/sdk/ali/service/impl/AliVerifyServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/ali/service/impl/AliVerifyServiceImpl.java @@ -1,18 +1,18 @@ -package com.newyetai.sdk.ali.service.impl; +package com.senmesh.sdk.ali.service.impl; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.annotation.CheckAndMock; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.StrUtils; -import com.newyetai.sdk.ali.config.AliProperties; -import com.newyetai.sdk.ali.config.AliProperties.IdcardProperties; -import com.newyetai.sdk.ali.dto.IdCardReq; -import com.newyetai.sdk.ali.dto.IdCardRes; -import com.newyetai.sdk.ali.dto.VerifyRes; -import com.newyetai.sdk.ali.service.AliVerifyService; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.util.HttpUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.annotation.CheckAndMock; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.StrUtils; +import com.senmesh.sdk.ali.config.AliProperties; +import com.senmesh.sdk.ali.config.AliProperties.IdcardProperties; +import com.senmesh.sdk.ali.dto.IdCardReq; +import com.senmesh.sdk.ali.dto.IdCardRes; +import com.senmesh.sdk.ali.dto.VerifyRes; +import com.senmesh.sdk.ali.service.AliVerifyService; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.dto.DefaultSdkInvokeLogDTO; +import com.senmesh.sdk.common.util.HttpUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; diff --git a/src/main/java/com/newyetai/sdk/ali/service/impl/MockAliVerifyServiceImpl.java b/src/main/java/com/senmesh/sdk/ali/service/impl/MockAliVerifyServiceImpl.java similarity index 64% rename from src/main/java/com/newyetai/sdk/ali/service/impl/MockAliVerifyServiceImpl.java rename to src/main/java/com/senmesh/sdk/ali/service/impl/MockAliVerifyServiceImpl.java index f5297ee..ec7f8e0 100644 --- a/src/main/java/com/newyetai/sdk/ali/service/impl/MockAliVerifyServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/ali/service/impl/MockAliVerifyServiceImpl.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.ali.service.impl; +package com.senmesh.sdk.ali.service.impl; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.ali.dto.IdCardReq; -import com.newyetai.sdk.ali.dto.IdCardRes; -import com.newyetai.sdk.ali.service.AliVerifyService; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.ali.dto.IdCardReq; +import com.senmesh.sdk.ali.dto.IdCardRes; +import com.senmesh.sdk.ali.service.AliVerifyService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/sdk/bytedance/ByteDanceUtils.java b/src/main/java/com/senmesh/sdk/bytedance/ByteDanceUtils.java similarity index 60% rename from src/main/java/com/newyetai/sdk/bytedance/ByteDanceUtils.java rename to src/main/java/com/senmesh/sdk/bytedance/ByteDanceUtils.java index 760dbfb..6b5614c 100644 --- a/src/main/java/com/newyetai/sdk/bytedance/ByteDanceUtils.java +++ b/src/main/java/com/senmesh/sdk/bytedance/ByteDanceUtils.java @@ -1,12 +1,12 @@ -package com.newyetai.sdk.bytedance; +package com.senmesh.sdk.bytedance; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.bytedance.constant.ByteDanceConstants; -import com.newyetai.sdk.bytedance.model.BaseByteDanceDTO; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.common.exception.SdkException; -import com.newyetai.sdk.common.util.HttpUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.bytedance.constant.ByteDanceConstants; +import com.senmesh.sdk.bytedance.model.BaseByteDanceDTO; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.common.exception.SdkException; +import com.senmesh.sdk.common.util.HttpUtils; /** * @author sr on 2021-11-25 diff --git a/src/main/java/com/newyetai/sdk/bytedance/constant/ByteDanceConstants.java b/src/main/java/com/senmesh/sdk/bytedance/constant/ByteDanceConstants.java similarity index 73% rename from src/main/java/com/newyetai/sdk/bytedance/constant/ByteDanceConstants.java rename to src/main/java/com/senmesh/sdk/bytedance/constant/ByteDanceConstants.java index b52b663..74fdde3 100644 --- a/src/main/java/com/newyetai/sdk/bytedance/constant/ByteDanceConstants.java +++ b/src/main/java/com/senmesh/sdk/bytedance/constant/ByteDanceConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.bytedance.constant; +package com.senmesh.sdk.bytedance.constant; /** * 字节常量 diff --git a/src/main/java/com/newyetai/sdk/bytedance/model/AccessTokenDataDTO.java b/src/main/java/com/senmesh/sdk/bytedance/model/AccessTokenDataDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/bytedance/model/AccessTokenDataDTO.java rename to src/main/java/com/senmesh/sdk/bytedance/model/AccessTokenDataDTO.java index 05f870b..7438001 100644 --- a/src/main/java/com/newyetai/sdk/bytedance/model/AccessTokenDataDTO.java +++ b/src/main/java/com/senmesh/sdk/bytedance/model/AccessTokenDataDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.bytedance.model; +package com.senmesh.sdk.bytedance.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/newyetai/sdk/bytedance/model/AccessTokenReqDTO.java b/src/main/java/com/senmesh/sdk/bytedance/model/AccessTokenReqDTO.java similarity index 89% rename from src/main/java/com/newyetai/sdk/bytedance/model/AccessTokenReqDTO.java rename to src/main/java/com/senmesh/sdk/bytedance/model/AccessTokenReqDTO.java index d807559..2df732a 100644 --- a/src/main/java/com/newyetai/sdk/bytedance/model/AccessTokenReqDTO.java +++ b/src/main/java/com/senmesh/sdk/bytedance/model/AccessTokenReqDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.sdk.bytedance.model; +package com.senmesh.sdk.bytedance.model; import org.springframework.core.ParameterizedTypeReference; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.common.annotation.Mask; -import com.newyetai.sdk.common.dto.ISdkRequest; +import com.senmesh.common.annotation.Mask; +import com.senmesh.sdk.common.dto.ISdkRequest; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/bytedance/model/BaseByteDanceDTO.java b/src/main/java/com/senmesh/sdk/bytedance/model/BaseByteDanceDTO.java similarity index 79% rename from src/main/java/com/newyetai/sdk/bytedance/model/BaseByteDanceDTO.java rename to src/main/java/com/senmesh/sdk/bytedance/model/BaseByteDanceDTO.java index 39e73c0..18cf53c 100644 --- a/src/main/java/com/newyetai/sdk/bytedance/model/BaseByteDanceDTO.java +++ b/src/main/java/com/senmesh/sdk/bytedance/model/BaseByteDanceDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.sdk.bytedance.model; +package com.senmesh.sdk.bytedance.model; import lombok.Data; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.common.dto.ISdkResponse; +import com.senmesh.sdk.common.dto.ISdkResponse; @Data public class BaseByteDanceDTO implements ISdkResponse, Serializable { diff --git a/src/main/java/com/newyetai/sdk/bytedance/model/Code2SessionDataDTO.java b/src/main/java/com/senmesh/sdk/bytedance/model/Code2SessionDataDTO.java similarity index 96% rename from src/main/java/com/newyetai/sdk/bytedance/model/Code2SessionDataDTO.java rename to src/main/java/com/senmesh/sdk/bytedance/model/Code2SessionDataDTO.java index 14db37a..e590186 100644 --- a/src/main/java/com/newyetai/sdk/bytedance/model/Code2SessionDataDTO.java +++ b/src/main/java/com/senmesh/sdk/bytedance/model/Code2SessionDataDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.bytedance.model; +package com.senmesh.sdk.bytedance.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/bytedance/model/Code2SessionReqDTO.java b/src/main/java/com/senmesh/sdk/bytedance/model/Code2SessionReqDTO.java similarity index 90% rename from src/main/java/com/newyetai/sdk/bytedance/model/Code2SessionReqDTO.java rename to src/main/java/com/senmesh/sdk/bytedance/model/Code2SessionReqDTO.java index 3e53a61..af1b1e2 100644 --- a/src/main/java/com/newyetai/sdk/bytedance/model/Code2SessionReqDTO.java +++ b/src/main/java/com/senmesh/sdk/bytedance/model/Code2SessionReqDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.sdk.bytedance.model; +package com.senmesh.sdk.bytedance.model; import org.springframework.core.ParameterizedTypeReference; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.common.annotation.Mask; -import com.newyetai.sdk.common.dto.ISdkRequest; +import com.senmesh.common.annotation.Mask; +import com.senmesh.sdk.common.dto.ISdkRequest; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/captcha/config/CaptchaConfiguration.java b/src/main/java/com/senmesh/sdk/captcha/config/CaptchaConfiguration.java similarity index 83% rename from src/main/java/com/newyetai/sdk/captcha/config/CaptchaConfiguration.java rename to src/main/java/com/senmesh/sdk/captcha/config/CaptchaConfiguration.java index eae9750..cd3e874 100644 --- a/src/main/java/com/newyetai/sdk/captcha/config/CaptchaConfiguration.java +++ b/src/main/java/com/senmesh/sdk/captcha/config/CaptchaConfiguration.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.captcha.config; +package com.senmesh.sdk.captcha.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -6,9 +6,9 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.newyetai.sdk.captcha.service.ITencentCaptchaService; -import com.newyetai.sdk.captcha.service.impl.LoginCaptchaAppProvider; -import com.newyetai.sdk.captcha.service.impl.TencentCaptchaServiceImpl; +import com.senmesh.sdk.captcha.service.ITencentCaptchaService; +import com.senmesh.sdk.captcha.service.impl.LoginCaptchaAppProvider; +import com.senmesh.sdk.captcha.service.impl.TencentCaptchaServiceImpl; import com.tencentcloudapi.common.Credential; /** diff --git a/src/main/java/com/newyetai/sdk/captcha/config/CaptchaProperties.java b/src/main/java/com/senmesh/sdk/captcha/config/CaptchaProperties.java similarity index 91% rename from src/main/java/com/newyetai/sdk/captcha/config/CaptchaProperties.java rename to src/main/java/com/senmesh/sdk/captcha/config/CaptchaProperties.java index e4670b9..ab1c034 100644 --- a/src/main/java/com/newyetai/sdk/captcha/config/CaptchaProperties.java +++ b/src/main/java/com/senmesh/sdk/captcha/config/CaptchaProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.captcha.config; +package com.senmesh.sdk.captcha.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/newyetai/sdk/captcha/config/TencentAppProperties.java b/src/main/java/com/senmesh/sdk/captcha/config/TencentAppProperties.java similarity index 85% rename from src/main/java/com/newyetai/sdk/captcha/config/TencentAppProperties.java rename to src/main/java/com/senmesh/sdk/captcha/config/TencentAppProperties.java index 9b8d4ff..b33e8c5 100644 --- a/src/main/java/com/newyetai/sdk/captcha/config/TencentAppProperties.java +++ b/src/main/java/com/senmesh/sdk/captcha/config/TencentAppProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.captcha.config; +package com.senmesh.sdk.captcha.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/captcha/config/TencentProperties.java b/src/main/java/com/senmesh/sdk/captcha/config/TencentProperties.java similarity index 90% rename from src/main/java/com/newyetai/sdk/captcha/config/TencentProperties.java rename to src/main/java/com/senmesh/sdk/captcha/config/TencentProperties.java index 2a69a3b..7548486 100644 --- a/src/main/java/com/newyetai/sdk/captcha/config/TencentProperties.java +++ b/src/main/java/com/senmesh/sdk/captcha/config/TencentProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.captcha.config; +package com.senmesh.sdk.captcha.config; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/newyetai/sdk/captcha/dto/TencentCaptchaDTO.java b/src/main/java/com/senmesh/sdk/captcha/dto/TencentCaptchaDTO.java similarity index 98% rename from src/main/java/com/newyetai/sdk/captcha/dto/TencentCaptchaDTO.java rename to src/main/java/com/senmesh/sdk/captcha/dto/TencentCaptchaDTO.java index ccf324b..aac9ec2 100644 --- a/src/main/java/com/newyetai/sdk/captcha/dto/TencentCaptchaDTO.java +++ b/src/main/java/com/senmesh/sdk/captcha/dto/TencentCaptchaDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.captcha.dto; +package com.senmesh.sdk.captcha.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/captcha/mapstruct/CaptchaRequestMapMapper.java b/src/main/java/com/senmesh/sdk/captcha/mapstruct/CaptchaRequestMapMapper.java similarity index 85% rename from src/main/java/com/newyetai/sdk/captcha/mapstruct/CaptchaRequestMapMapper.java rename to src/main/java/com/senmesh/sdk/captcha/mapstruct/CaptchaRequestMapMapper.java index cf495db..541b285 100644 --- a/src/main/java/com/newyetai/sdk/captcha/mapstruct/CaptchaRequestMapMapper.java +++ b/src/main/java/com/senmesh/sdk/captcha/mapstruct/CaptchaRequestMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.sdk.captcha.mapstruct; +package com.senmesh.sdk.captcha.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.newyetai.sdk.captcha.dto.TencentCaptchaDTO; +import com.senmesh.sdk.captcha.dto.TencentCaptchaDTO; import com.tencentcloudapi.captcha.v20190722.models.DescribeCaptchaResultRequest; /** diff --git a/src/main/java/com/newyetai/sdk/captcha/service/AbstractTencentCaptchaAppProvider.java b/src/main/java/com/senmesh/sdk/captcha/service/AbstractTencentCaptchaAppProvider.java similarity index 85% rename from src/main/java/com/newyetai/sdk/captcha/service/AbstractTencentCaptchaAppProvider.java rename to src/main/java/com/senmesh/sdk/captcha/service/AbstractTencentCaptchaAppProvider.java index 34f0312..81c2d2e 100644 --- a/src/main/java/com/newyetai/sdk/captcha/service/AbstractTencentCaptchaAppProvider.java +++ b/src/main/java/com/senmesh/sdk/captcha/service/AbstractTencentCaptchaAppProvider.java @@ -1,14 +1,14 @@ -package com.newyetai.sdk.captcha.service; +package com.senmesh.sdk.captcha.service; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.sdk.captcha.config.CaptchaProperties; -import com.newyetai.sdk.captcha.dto.TencentCaptchaDTO; -import com.newyetai.sdk.captcha.mapstruct.CaptchaRequestMapMapper; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.sdk.captcha.config.CaptchaProperties; +import com.senmesh.sdk.captcha.dto.TencentCaptchaDTO; +import com.senmesh.sdk.captcha.mapstruct.CaptchaRequestMapMapper; import com.tencentcloudapi.captcha.v20190722.models.DescribeCaptchaResultRequest; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/captcha/service/ITencentCaptchaAppProvider.java b/src/main/java/com/senmesh/sdk/captcha/service/ITencentCaptchaAppProvider.java similarity index 74% rename from src/main/java/com/newyetai/sdk/captcha/service/ITencentCaptchaAppProvider.java rename to src/main/java/com/senmesh/sdk/captcha/service/ITencentCaptchaAppProvider.java index 452e79e..6bbc226 100644 --- a/src/main/java/com/newyetai/sdk/captcha/service/ITencentCaptchaAppProvider.java +++ b/src/main/java/com/senmesh/sdk/captcha/service/ITencentCaptchaAppProvider.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.captcha.service; +package com.senmesh.sdk.captcha.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.captcha.dto.TencentCaptchaDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.captcha.dto.TencentCaptchaDTO; /** * @author sr on 2020-08-10 diff --git a/src/main/java/com/newyetai/sdk/captcha/service/ITencentCaptchaService.java b/src/main/java/com/senmesh/sdk/captcha/service/ITencentCaptchaService.java similarity index 80% rename from src/main/java/com/newyetai/sdk/captcha/service/ITencentCaptchaService.java rename to src/main/java/com/senmesh/sdk/captcha/service/ITencentCaptchaService.java index 92311fd..153540c 100644 --- a/src/main/java/com/newyetai/sdk/captcha/service/ITencentCaptchaService.java +++ b/src/main/java/com/senmesh/sdk/captcha/service/ITencentCaptchaService.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.captcha.service; +package com.senmesh.sdk.captcha.service; -import com.newyetai.common.AlitaResult; +import com.senmesh.common.AlitaResult; import com.tencentcloudapi.captcha.v20190722.models.DescribeCaptchaResultRequest; /** diff --git a/src/main/java/com/newyetai/sdk/captcha/service/impl/LoginCaptchaAppProvider.java b/src/main/java/com/senmesh/sdk/captcha/service/impl/LoginCaptchaAppProvider.java similarity index 61% rename from src/main/java/com/newyetai/sdk/captcha/service/impl/LoginCaptchaAppProvider.java rename to src/main/java/com/senmesh/sdk/captcha/service/impl/LoginCaptchaAppProvider.java index 3fbb141..d235268 100644 --- a/src/main/java/com/newyetai/sdk/captcha/service/impl/LoginCaptchaAppProvider.java +++ b/src/main/java/com/senmesh/sdk/captcha/service/impl/LoginCaptchaAppProvider.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.captcha.service.impl; +package com.senmesh.sdk.captcha.service.impl; -import com.newyetai.sdk.captcha.config.CaptchaProperties; -import com.newyetai.sdk.captcha.service.AbstractTencentCaptchaAppProvider; -import com.newyetai.sdk.captcha.service.ITencentCaptchaService; +import com.senmesh.sdk.captcha.config.CaptchaProperties; +import com.senmesh.sdk.captcha.service.AbstractTencentCaptchaAppProvider; +import com.senmesh.sdk.captcha.service.ITencentCaptchaService; /** * 登录防水墙 diff --git a/src/main/java/com/newyetai/sdk/captcha/service/impl/TencentCaptchaServiceImpl.java b/src/main/java/com/senmesh/sdk/captcha/service/impl/TencentCaptchaServiceImpl.java similarity index 92% rename from src/main/java/com/newyetai/sdk/captcha/service/impl/TencentCaptchaServiceImpl.java rename to src/main/java/com/senmesh/sdk/captcha/service/impl/TencentCaptchaServiceImpl.java index 6afe663..2e2f2a1 100644 --- a/src/main/java/com/newyetai/sdk/captcha/service/impl/TencentCaptchaServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/captcha/service/impl/TencentCaptchaServiceImpl.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.captcha.service.impl; +package com.senmesh.sdk.captcha.service.impl; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.captcha.service.ITencentCaptchaService; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.captcha.service.ITencentCaptchaService; import com.tencentcloudapi.captcha.v20190722.CaptchaClient; import com.tencentcloudapi.captcha.v20190722.models.DescribeCaptchaResultRequest; import com.tencentcloudapi.captcha.v20190722.models.DescribeCaptchaResultResponse; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/config/ChuangLanCommonProperties.java b/src/main/java/com/senmesh/sdk/chuanglan/config/ChuangLanCommonProperties.java similarity index 89% rename from src/main/java/com/newyetai/sdk/chuanglan/config/ChuangLanCommonProperties.java rename to src/main/java/com/senmesh/sdk/chuanglan/config/ChuangLanCommonProperties.java index 7d1d6af..1e02f38 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/config/ChuangLanCommonProperties.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/config/ChuangLanCommonProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.config; +package com.senmesh.sdk.chuanglan.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/config/ChuangLanProperties.java b/src/main/java/com/senmesh/sdk/chuanglan/config/ChuangLanProperties.java similarity index 97% rename from src/main/java/com/newyetai/sdk/chuanglan/config/ChuangLanProperties.java rename to src/main/java/com/senmesh/sdk/chuanglan/config/ChuangLanProperties.java index c345a68..9a8afd6 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/config/ChuangLanProperties.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/config/ChuangLanProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.config; +package com.senmesh.sdk.chuanglan.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/constant/BankCardVerifyStateEnum.java b/src/main/java/com/senmesh/sdk/chuanglan/constant/BankCardVerifyStateEnum.java similarity index 90% rename from src/main/java/com/newyetai/sdk/chuanglan/constant/BankCardVerifyStateEnum.java rename to src/main/java/com/senmesh/sdk/chuanglan/constant/BankCardVerifyStateEnum.java index d56dec2..da48fdb 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/constant/BankCardVerifyStateEnum.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/constant/BankCardVerifyStateEnum.java @@ -1,10 +1,10 @@ -package com.newyetai.sdk.chuanglan.constant; +package com.senmesh.sdk.chuanglan.constant; import com.google.common.collect.Maps; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.chuanglan.dto.ChuangLanResponseDTO; -import com.newyetai.sdk.chuanglan.dto.ChuangLanResultDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.chuanglan.dto.ChuangLanResponseDTO; +import com.senmesh.sdk.chuanglan.dto.ChuangLanResultDTO; import java.util.Map; /** diff --git a/src/main/java/com/newyetai/sdk/chuanglan/constant/ChuangLanConstants.java b/src/main/java/com/senmesh/sdk/chuanglan/constant/ChuangLanConstants.java similarity index 85% rename from src/main/java/com/newyetai/sdk/chuanglan/constant/ChuangLanConstants.java rename to src/main/java/com/senmesh/sdk/chuanglan/constant/ChuangLanConstants.java index b4276cd..987ff78 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/constant/ChuangLanConstants.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/constant/ChuangLanConstants.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.chuanglan.constant; +package com.senmesh.sdk.chuanglan.constant; -import com.newyetai.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.constant.SdkConstants; /** * @author sr on 2020-04-10 diff --git a/src/main/java/com/newyetai/sdk/chuanglan/constant/ChuangLanErrorCodeEnum.java b/src/main/java/com/senmesh/sdk/chuanglan/constant/ChuangLanErrorCodeEnum.java similarity index 93% rename from src/main/java/com/newyetai/sdk/chuanglan/constant/ChuangLanErrorCodeEnum.java rename to src/main/java/com/senmesh/sdk/chuanglan/constant/ChuangLanErrorCodeEnum.java index 83c7c73..02f9f9a 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/constant/ChuangLanErrorCodeEnum.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/constant/ChuangLanErrorCodeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.constant; +package com.senmesh.sdk.chuanglan.constant; /** * sdk创蓝错误码枚举;标识：创蓝(01) diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/BankCardFourRequestDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/BankCardFourRequestDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/BankCardFourRequestDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/BankCardFourRequestDTO.java index 266c003..b422600 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/BankCardFourRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/BankCardFourRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; import lombok.*; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/BankCardThreeRequestDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/BankCardThreeRequestDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/BankCardThreeRequestDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/BankCardThreeRequestDTO.java index a5caaa5..5dc4738 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/BankCardThreeRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/BankCardThreeRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; import lombok.*; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanRequestDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanRequestDTO.java similarity index 91% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanRequestDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanRequestDTO.java index 1337ae1..0b09a07 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanResponseDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanResponseDTO.java similarity index 89% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanResponseDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanResponseDTO.java index 0436a50..36b0127 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanResponseDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.fangxinqian.constant.FxqConstants; -import com.newyetai.sdk.fangxinqian.constant.FxqErrorCodeEnum; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.fangxinqian.constant.FxqConstants; +import com.senmesh.sdk.fangxinqian.constant.FxqErrorCodeEnum; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.util.StringUtils; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanResultDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanResultDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanResultDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanResultDTO.java index 4498245..c47f837 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/ChuangLanResultDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/ChuangLanResultDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/PhoneThreeRequestDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/PhoneThreeRequestDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/PhoneThreeRequestDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/PhoneThreeRequestDTO.java index 5013a73..ab0eb61 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/PhoneThreeRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/PhoneThreeRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/RealNameTwoBaseRequestDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/RealNameTwoBaseRequestDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/RealNameTwoBaseRequestDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/RealNameTwoBaseRequestDTO.java index b73983c..71e502e 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/RealNameTwoBaseRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/RealNameTwoBaseRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; import lombok.*; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/RealNameTwoRequestDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/RealNameTwoRequestDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/RealNameTwoRequestDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/RealNameTwoRequestDTO.java index f6d476f..4e5f2af 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/RealNameTwoRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/RealNameTwoRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; import lombok.*; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/dto/StatusDataDTO.java b/src/main/java/com/senmesh/sdk/chuanglan/dto/StatusDataDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/chuanglan/dto/StatusDataDTO.java rename to src/main/java/com/senmesh/sdk/chuanglan/dto/StatusDataDTO.java index c4d5feb..ea1b8da 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/dto/StatusDataDTO.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/dto/StatusDataDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.chuanglan.dto; +package com.senmesh.sdk.chuanglan.dto; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/service/ChuangLanService.java b/src/main/java/com/senmesh/sdk/chuanglan/service/ChuangLanService.java similarity index 94% rename from src/main/java/com/newyetai/sdk/chuanglan/service/ChuangLanService.java rename to src/main/java/com/senmesh/sdk/chuanglan/service/ChuangLanService.java index 712aa0a..52b6fa7 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/service/ChuangLanService.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/service/ChuangLanService.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.chuanglan.service; +package com.senmesh.sdk.chuanglan.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.chuanglan.dto.*; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.chuanglan.dto.*; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/service/impl/ChuangLanServiceImpl.java b/src/main/java/com/senmesh/sdk/chuanglan/service/impl/ChuangLanServiceImpl.java similarity index 82% rename from src/main/java/com/newyetai/sdk/chuanglan/service/impl/ChuangLanServiceImpl.java rename to src/main/java/com/senmesh/sdk/chuanglan/service/impl/ChuangLanServiceImpl.java index 0e18224..e71456b 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/service/impl/ChuangLanServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/service/impl/ChuangLanServiceImpl.java @@ -1,17 +1,16 @@ -package com.newyetai.sdk.chuanglan.service.impl; +package com.senmesh.sdk.chuanglan.service.impl; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.annotation.CheckAndMock; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.sdk.chuanglan.config.ChuangLanCommonProperties; -import com.newyetai.sdk.chuanglan.config.ChuangLanProperties; -import com.newyetai.sdk.chuanglan.constant.BankCardVerifyStateEnum; -import com.newyetai.sdk.chuanglan.constant.ChuangLanConstants; -import com.newyetai.sdk.chuanglan.dto.*; -import com.newyetai.sdk.chuanglan.service.ChuangLanService; -import com.newyetai.sdk.chuanglan.util.ChuangLanUtils; -import com.newyetai.sdk.chuanglan.util.HttpUtilCl; -import com.newyetai.sdk.common.constant.SdkConstants; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.annotation.CheckAndMock; +import com.senmesh.sdk.chuanglan.config.ChuangLanCommonProperties; +import com.senmesh.sdk.chuanglan.config.ChuangLanProperties; +import com.senmesh.sdk.chuanglan.constant.BankCardVerifyStateEnum; +import com.senmesh.sdk.chuanglan.constant.ChuangLanConstants; +import com.senmesh.sdk.chuanglan.dto.*; +import com.senmesh.sdk.chuanglan.service.ChuangLanService; +import com.senmesh.sdk.chuanglan.util.ChuangLanUtils; +import com.senmesh.sdk.chuanglan.util.HttpUtilCl; +import com.senmesh.sdk.common.constant.SdkConstants; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/service/impl/MockChuangLanServiceImpl.java b/src/main/java/com/senmesh/sdk/chuanglan/service/impl/MockChuangLanServiceImpl.java similarity index 86% rename from src/main/java/com/newyetai/sdk/chuanglan/service/impl/MockChuangLanServiceImpl.java rename to src/main/java/com/senmesh/sdk/chuanglan/service/impl/MockChuangLanServiceImpl.java index f408153..dfcf22b 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/service/impl/MockChuangLanServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/service/impl/MockChuangLanServiceImpl.java @@ -1,10 +1,10 @@ -package com.newyetai.sdk.chuanglan.service.impl; +package com.senmesh.sdk.chuanglan.service.impl; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.chuanglan.config.ChuangLanProperties; -import com.newyetai.sdk.chuanglan.dto.*; -import com.newyetai.sdk.chuanglan.service.ChuangLanService; -import com.newyetai.sdk.common.constant.SdkConstants; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.chuanglan.config.ChuangLanProperties; +import com.senmesh.sdk.chuanglan.dto.*; +import com.senmesh.sdk.chuanglan.service.ChuangLanService; +import com.senmesh.sdk.common.constant.SdkConstants; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/chuanglan/util/ChuangLanUtils.java b/src/main/java/com/senmesh/sdk/chuanglan/util/ChuangLanUtils.java similarity index 84% rename from src/main/java/com/newyetai/sdk/chuanglan/util/ChuangLanUtils.java rename to src/main/java/com/senmesh/sdk/chuanglan/util/ChuangLanUtils.java index 07feba3..c0d7e61 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/util/ChuangLanUtils.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/util/ChuangLanUtils.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.chuanglan.util; +package com.senmesh.sdk.chuanglan.util; -import com.newyetai.sdk.chuanglan.config.ChuangLanCommonProperties; -import com.newyetai.sdk.chuanglan.config.ChuangLanProperties; -import com.newyetai.sdk.chuanglan.dto.ChuangLanRequestDTO; +import com.senmesh.sdk.chuanglan.config.ChuangLanCommonProperties; +import com.senmesh.sdk.chuanglan.config.ChuangLanProperties; +import com.senmesh.sdk.chuanglan.dto.ChuangLanRequestDTO; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/com/newyetai/sdk/chuanglan/util/HttpUtilCl.java b/src/main/java/com/senmesh/sdk/chuanglan/util/HttpUtilCl.java similarity index 92% rename from src/main/java/com/newyetai/sdk/chuanglan/util/HttpUtilCl.java rename to src/main/java/com/senmesh/sdk/chuanglan/util/HttpUtilCl.java index 8a7070e..9f140f5 100644 --- a/src/main/java/com/newyetai/sdk/chuanglan/util/HttpUtilCl.java +++ b/src/main/java/com/senmesh/sdk/chuanglan/util/HttpUtilCl.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.chuanglan.util; +package com.senmesh.sdk.chuanglan.util; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.chuanglan.constant.ChuangLanConstants; -import com.newyetai.sdk.chuanglan.dto.ChuangLanResponseDTO; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.chuanglan.constant.ChuangLanConstants; +import com.senmesh.sdk.chuanglan.dto.ChuangLanResponseDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +13,6 @@ import org.springframework.stereotype.Component; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StopWatch; -import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; import java.util.LinkedHashMap; diff --git a/src/main/java/com/newyetai/sdk/common/config/ApiConfig.java b/src/main/java/com/senmesh/sdk/common/config/ApiConfig.java similarity index 98% rename from src/main/java/com/newyetai/sdk/common/config/ApiConfig.java rename to src/main/java/com/senmesh/sdk/common/config/ApiConfig.java index 621add4..b116f0f 100644 --- a/src/main/java/com/newyetai/sdk/common/config/ApiConfig.java +++ b/src/main/java/com/senmesh/sdk/common/config/ApiConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.config; +package com.senmesh.sdk.common.config; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/common/config/ValidConfig.java b/src/main/java/com/senmesh/sdk/common/config/ValidConfig.java similarity index 93% rename from src/main/java/com/newyetai/sdk/common/config/ValidConfig.java rename to src/main/java/com/senmesh/sdk/common/config/ValidConfig.java index 424d7e6..d25d96d 100644 --- a/src/main/java/com/newyetai/sdk/common/config/ValidConfig.java +++ b/src/main/java/com/senmesh/sdk/common/config/ValidConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.config; +package com.senmesh.sdk.common.config; import org.springframework.context.annotation.Configuration; import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; diff --git a/src/main/java/com/newyetai/sdk/common/constant/SdkConstants.java b/src/main/java/com/senmesh/sdk/common/constant/SdkConstants.java similarity index 96% rename from src/main/java/com/newyetai/sdk/common/constant/SdkConstants.java rename to src/main/java/com/senmesh/sdk/common/constant/SdkConstants.java index 8ca31a0..97fa9e9 100644 --- a/src/main/java/com/newyetai/sdk/common/constant/SdkConstants.java +++ b/src/main/java/com/senmesh/sdk/common/constant/SdkConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.constant; +package com.senmesh.sdk.common.constant; /** * @author sr on 2020-04-10 diff --git a/src/main/java/com/newyetai/sdk/common/dto/AbstractSdkInvokeLogDTO.java b/src/main/java/com/senmesh/sdk/common/dto/AbstractSdkInvokeLogDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/common/dto/AbstractSdkInvokeLogDTO.java rename to src/main/java/com/senmesh/sdk/common/dto/AbstractSdkInvokeLogDTO.java index 9aab707..cc976f0 100644 --- a/src/main/java/com/newyetai/sdk/common/dto/AbstractSdkInvokeLogDTO.java +++ b/src/main/java/com/senmesh/sdk/common/dto/AbstractSdkInvokeLogDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.common.dto; +package com.senmesh.sdk.common.dto; import java.io.Serializable; import java.util.Date; -import com.newyetai.common.util.RandomUtils; +import com.senmesh.common.util.RandomUtils; import lombok.AllArgsConstructor; import lombok.Builder.Default; diff --git a/src/main/java/com/newyetai/sdk/common/dto/DefaultSdkInvokeLogDTO.java b/src/main/java/com/senmesh/sdk/common/dto/DefaultSdkInvokeLogDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/common/dto/DefaultSdkInvokeLogDTO.java rename to src/main/java/com/senmesh/sdk/common/dto/DefaultSdkInvokeLogDTO.java index b3a8701..90489f3 100644 --- a/src/main/java/com/newyetai/sdk/common/dto/DefaultSdkInvokeLogDTO.java +++ b/src/main/java/com/senmesh/sdk/common/dto/DefaultSdkInvokeLogDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.dto; +package com.senmesh.sdk.common.dto; import org.springframework.data.annotation.Transient; diff --git a/src/main/java/com/newyetai/sdk/common/dto/ISdkRequest.java b/src/main/java/com/senmesh/sdk/common/dto/ISdkRequest.java similarity index 96% rename from src/main/java/com/newyetai/sdk/common/dto/ISdkRequest.java rename to src/main/java/com/senmesh/sdk/common/dto/ISdkRequest.java index 977d534..bcab465 100644 --- a/src/main/java/com/newyetai/sdk/common/dto/ISdkRequest.java +++ b/src/main/java/com/senmesh/sdk/common/dto/ISdkRequest.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.dto; +package com.senmesh.sdk.common.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/common/dto/ISdkResponse.java b/src/main/java/com/senmesh/sdk/common/dto/ISdkResponse.java similarity index 78% rename from src/main/java/com/newyetai/sdk/common/dto/ISdkResponse.java rename to src/main/java/com/senmesh/sdk/common/dto/ISdkResponse.java index 1c0a071..5e8c410 100644 --- a/src/main/java/com/newyetai/sdk/common/dto/ISdkResponse.java +++ b/src/main/java/com/senmesh/sdk/common/dto/ISdkResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.dto; +package com.senmesh.sdk.common.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/common/dto/LiteUserPhoneDTO.java b/src/main/java/com/senmesh/sdk/common/dto/LiteUserPhoneDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/common/dto/LiteUserPhoneDTO.java rename to src/main/java/com/senmesh/sdk/common/dto/LiteUserPhoneDTO.java index 37e3050..87b8938 100644 --- a/src/main/java/com/newyetai/sdk/common/dto/LiteUserPhoneDTO.java +++ b/src/main/java/com/senmesh/sdk/common/dto/LiteUserPhoneDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.common.dto; +package com.senmesh.sdk.common.dto; import java.io.Serializable; -import com.newyetai.sdk.wechat.model.Watermark; +import com.senmesh.sdk.wechat.model.Watermark; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/common/exception/SdkException.java b/src/main/java/com/senmesh/sdk/common/exception/SdkException.java similarity index 93% rename from src/main/java/com/newyetai/sdk/common/exception/SdkException.java rename to src/main/java/com/senmesh/sdk/common/exception/SdkException.java index 61ffe16..025e540 100644 --- a/src/main/java/com/newyetai/sdk/common/exception/SdkException.java +++ b/src/main/java/com/senmesh/sdk/common/exception/SdkException.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.exception; +package com.senmesh.sdk.common.exception; /** * @author sr on 2020-04-09 diff --git a/src/main/java/com/newyetai/sdk/common/util/HttpUtils.java b/src/main/java/com/senmesh/sdk/common/util/HttpUtils.java similarity index 92% rename from src/main/java/com/newyetai/sdk/common/util/HttpUtils.java rename to src/main/java/com/senmesh/sdk/common/util/HttpUtils.java index db771d1..a1078fb 100644 --- a/src/main/java/com/newyetai/sdk/common/util/HttpUtils.java +++ b/src/main/java/com/senmesh/sdk/common/util/HttpUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.util; +package com.senmesh.sdk.common.util; import java.util.List; @@ -13,11 +13,11 @@ import org.springframework.util.StopWatch; import org.springframework.web.client.RestTemplate; import com.google.common.collect.Lists; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.common.dto.ISdkResponse; -import com.newyetai.sdk.common.exception.SdkException; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.dto.DefaultSdkInvokeLogDTO; +import com.senmesh.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.common.dto.ISdkResponse; +import com.senmesh.sdk.common.exception.SdkException; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/common/util/LiteEncryptor.java b/src/main/java/com/senmesh/sdk/common/util/LiteEncryptor.java similarity index 90% rename from src/main/java/com/newyetai/sdk/common/util/LiteEncryptor.java rename to src/main/java/com/senmesh/sdk/common/util/LiteEncryptor.java index fe7aa7e..78808a4 100644 --- a/src/main/java/com/newyetai/sdk/common/util/LiteEncryptor.java +++ b/src/main/java/com/senmesh/sdk/common/util/LiteEncryptor.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.common.util; +package com.senmesh.sdk.common.util; import java.nio.charset.StandardCharsets; import java.security.AlgorithmParameters; @@ -8,8 +8,8 @@ import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.util.JsonUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/common/util/PKCS7Encoder.java b/src/main/java/com/senmesh/sdk/common/util/PKCS7Encoder.java similarity index 97% rename from src/main/java/com/newyetai/sdk/common/util/PKCS7Encoder.java rename to src/main/java/com/senmesh/sdk/common/util/PKCS7Encoder.java index 9b12011..0161fef 100644 --- a/src/main/java/com/newyetai/sdk/common/util/PKCS7Encoder.java +++ b/src/main/java/com/senmesh/sdk/common/util/PKCS7Encoder.java @@ -6,7 +6,7 @@ // ------------------------------------------------------------------------ -package com.newyetai.sdk.common.util; +package com.senmesh.sdk.common.util; import java.nio.charset.Charset; import java.util.Arrays; diff --git a/src/main/java/com/newyetai/sdk/deepseek/config/DeepSeekProperties.java b/src/main/java/com/senmesh/sdk/deepseek/config/DeepSeekProperties.java similarity index 94% rename from src/main/java/com/newyetai/sdk/deepseek/config/DeepSeekProperties.java rename to src/main/java/com/senmesh/sdk/deepseek/config/DeepSeekProperties.java index 3c4daf6..3740b78 100644 --- a/src/main/java/com/newyetai/sdk/deepseek/config/DeepSeekProperties.java +++ b/src/main/java/com/senmesh/sdk/deepseek/config/DeepSeekProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.deepseek.config; +package com.senmesh.sdk.deepseek.config; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/deepseek/service/DeepSeekProvider.java b/src/main/java/com/senmesh/sdk/deepseek/service/DeepSeekProvider.java similarity index 81% rename from src/main/java/com/newyetai/sdk/deepseek/service/DeepSeekProvider.java rename to src/main/java/com/senmesh/sdk/deepseek/service/DeepSeekProvider.java index 36787d7..0f2a74b 100644 --- a/src/main/java/com/newyetai/sdk/deepseek/service/DeepSeekProvider.java +++ b/src/main/java/com/senmesh/sdk/deepseek/service/DeepSeekProvider.java @@ -1,13 +1,13 @@ -package com.newyetai.sdk.deepseek.service; +package com.senmesh.sdk.deepseek.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.util.HttpUtils; -import com.newyetai.sdk.deepseek.config.DeepSeekProperties; -import com.newyetai.sdk.xf.model.ChatReq; -import com.newyetai.sdk.xf.model.ChatRes; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.dto.DefaultSdkInvokeLogDTO; +import com.senmesh.sdk.common.util.HttpUtils; +import com.senmesh.sdk.deepseek.config.DeepSeekProperties; +import com.senmesh.sdk.xf.model.ChatReq; +import com.senmesh.sdk.xf.model.ChatRes; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/config/FxqCommonProperties.java b/src/main/java/com/senmesh/sdk/fangxinqian/config/FxqCommonProperties.java similarity index 89% rename from src/main/java/com/newyetai/sdk/fangxinqian/config/FxqCommonProperties.java rename to src/main/java/com/senmesh/sdk/fangxinqian/config/FxqCommonProperties.java index 26b9d87..cf93715 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/config/FxqCommonProperties.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/config/FxqCommonProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.config; +package com.senmesh.sdk.fangxinqian.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/config/FxqContractExtensionProperties.java b/src/main/java/com/senmesh/sdk/fangxinqian/config/FxqContractExtensionProperties.java similarity index 88% rename from src/main/java/com/newyetai/sdk/fangxinqian/config/FxqContractExtensionProperties.java rename to src/main/java/com/senmesh/sdk/fangxinqian/config/FxqContractExtensionProperties.java index 4b77cf5..cf3a441 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/config/FxqContractExtensionProperties.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/config/FxqContractExtensionProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.config; +package com.senmesh.sdk.fangxinqian.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/config/FxqContractProperties.java b/src/main/java/com/senmesh/sdk/fangxinqian/config/FxqContractProperties.java similarity index 95% rename from src/main/java/com/newyetai/sdk/fangxinqian/config/FxqContractProperties.java rename to src/main/java/com/senmesh/sdk/fangxinqian/config/FxqContractProperties.java index e75e678..ee5af9c 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/config/FxqContractProperties.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/config/FxqContractProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.config; +package com.senmesh.sdk.fangxinqian.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/config/FxqProperties.java b/src/main/java/com/senmesh/sdk/fangxinqian/config/FxqProperties.java similarity index 97% rename from src/main/java/com/newyetai/sdk/fangxinqian/config/FxqProperties.java rename to src/main/java/com/senmesh/sdk/fangxinqian/config/FxqProperties.java index 9f5d354..a2d4586 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/config/FxqProperties.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/config/FxqProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.config; +package com.senmesh.sdk.fangxinqian.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/constant/BankCardFourStateEnum.java b/src/main/java/com/senmesh/sdk/fangxinqian/constant/BankCardFourStateEnum.java similarity index 94% rename from src/main/java/com/newyetai/sdk/fangxinqian/constant/BankCardFourStateEnum.java rename to src/main/java/com/senmesh/sdk/fangxinqian/constant/BankCardFourStateEnum.java index c869607..4de5719 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/constant/BankCardFourStateEnum.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/constant/BankCardFourStateEnum.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.fangxinqian.constant; +package com.senmesh.sdk.fangxinqian.constant; import java.util.Map; import com.google.common.collect.Maps; -import com.newyetai.common.AlitaResult; +import com.senmesh.common.AlitaResult; /** * 银行三要素验证结果枚举 diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/constant/BankCardThreeStateEnum.java b/src/main/java/com/senmesh/sdk/fangxinqian/constant/BankCardThreeStateEnum.java similarity index 94% rename from src/main/java/com/newyetai/sdk/fangxinqian/constant/BankCardThreeStateEnum.java rename to src/main/java/com/senmesh/sdk/fangxinqian/constant/BankCardThreeStateEnum.java index ea7c259..75d3910 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/constant/BankCardThreeStateEnum.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/constant/BankCardThreeStateEnum.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.fangxinqian.constant; +package com.senmesh.sdk.fangxinqian.constant; import java.util.Map; import com.google.common.collect.Maps; -import com.newyetai.common.AlitaResult; +import com.senmesh.common.AlitaResult; /** * 银行三要素验证结果枚举 diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/constant/FxqConstants.java b/src/main/java/com/senmesh/sdk/fangxinqian/constant/FxqConstants.java similarity index 82% rename from src/main/java/com/newyetai/sdk/fangxinqian/constant/FxqConstants.java rename to src/main/java/com/senmesh/sdk/fangxinqian/constant/FxqConstants.java index ca63dee..d85fdb9 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/constant/FxqConstants.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/constant/FxqConstants.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.fangxinqian.constant; +package com.senmesh.sdk.fangxinqian.constant; -import com.newyetai.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.constant.SdkConstants; /** * @author sr on 2020-04-10 diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/constant/FxqErrorCodeEnum.java b/src/main/java/com/senmesh/sdk/fangxinqian/constant/FxqErrorCodeEnum.java similarity index 93% rename from src/main/java/com/newyetai/sdk/fangxinqian/constant/FxqErrorCodeEnum.java rename to src/main/java/com/senmesh/sdk/fangxinqian/constant/FxqErrorCodeEnum.java index a431fcf..51995ad 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/constant/FxqErrorCodeEnum.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/constant/FxqErrorCodeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.constant; +package com.senmesh.sdk.fangxinqian.constant; /** * sdk放心签错误码枚举;标识：放心签(01) diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardFourRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardFourRequestDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardFourRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardFourRequestDTO.java index 07e2e2d..446ea8c 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardFourRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardFourRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardFourResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardFourResponseDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardFourResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardFourResponseDTO.java index 9fe991b..a4705ff 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardFourResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardFourResponseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardThreeRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardThreeRequestDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardThreeRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardThreeRequestDTO.java index 363006f..ba156ae 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardThreeRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardThreeRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardThreeResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardThreeResponseDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardThreeResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardThreeResponseDTO.java index 4facd04..c63e596 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/BankCardThreeResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/BankCardThreeResponseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/ContractRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/ContractRequestDTO.java similarity index 98% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/ContractRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/ContractRequestDTO.java index 671e5fe..15b8464 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/ContractRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/ContractRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.*; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/ContractResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/ContractResponseDTO.java similarity index 85% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/ContractResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/ContractResponseDTO.java index 5d96225..a674b2d 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/ContractResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/ContractResponseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceGetRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceGetRequestDTO.java similarity index 91% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceGetRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceGetRequestDTO.java index 80c7d0b..61cdc34 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceGetRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceGetRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.*; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceGetResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceGetResponseDTO.java similarity index 85% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceGetResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceGetResponseDTO.java index 72ee44e..b4c48b1 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceGetResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceGetResponseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceSaveRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceSaveRequestDTO.java similarity index 98% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceSaveRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceSaveRequestDTO.java index 298ac2c..5cf0f18 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceSaveRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceSaveRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.*; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceSaveResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceSaveResponseDTO.java similarity index 87% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceSaveResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceSaveResponseDTO.java index 21b3c09..3de48ff 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/EvidenceSaveResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/EvidenceSaveResponseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/FxqRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/FxqRequestDTO.java similarity index 90% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/FxqRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/FxqRequestDTO.java index 6ef9b7c..7aa43ff 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/FxqRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/FxqRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/FxqResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/FxqResponseDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/FxqResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/FxqResponseDTO.java index 7c31828..8eed6a9 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/FxqResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/FxqResponseDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.fangxinqian.constant.FxqConstants; -import com.newyetai.sdk.fangxinqian.constant.FxqErrorCodeEnum; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.fangxinqian.constant.FxqConstants; +import com.senmesh.sdk.fangxinqian.constant.FxqErrorCodeEnum; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.util.StringUtils; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/GovernmentAuthRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/GovernmentAuthRequestDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/GovernmentAuthRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/GovernmentAuthRequestDTO.java index f732ada..e5d3146 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/GovernmentAuthRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/GovernmentAuthRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/GovernmentAuthResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/GovernmentAuthResponseDTO.java similarity index 98% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/GovernmentAuthResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/GovernmentAuthResponseDTO.java index 72d0790..f5765dd 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/GovernmentAuthResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/GovernmentAuthResponseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/OfficialSealGenerateRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/OfficialSealGenerateRequestDTO.java similarity index 96% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/OfficialSealGenerateRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/OfficialSealGenerateRequestDTO.java index bc00ed3..ef8e525 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/OfficialSealGenerateRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/OfficialSealGenerateRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/PersonalSealGenerateRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/PersonalSealGenerateRequestDTO.java similarity index 96% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/PersonalSealGenerateRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/PersonalSealGenerateRequestDTO.java index e6442cf..2789dd1 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/PersonalSealGenerateRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/PersonalSealGenerateRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/PersonalSealGenerateResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/PersonalSealGenerateResponseDTO.java similarity index 76% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/PersonalSealGenerateResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/PersonalSealGenerateResponseDTO.java index 21aa025..83e6039 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/PersonalSealGenerateResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/PersonalSealGenerateResponseDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; -import com.newyetai.common.annotation.Mask; +import com.senmesh.common.annotation.Mask; import lombok.Data; @Data diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/RealnameAuthRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/RealnameAuthRequestDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/RealnameAuthRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/RealnameAuthRequestDTO.java index b2b5a49..7684903 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/RealnameAuthRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/RealnameAuthRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/RealnameAuthResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/RealnameAuthResponseDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/RealnameAuthResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/RealnameAuthResponseDTO.java index 4272749..8c632e9 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/RealnameAuthResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/RealnameAuthResponseDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; -import com.newyetai.sdk.fangxinqian.enums.RealnameResultEnum; +import com.senmesh.sdk.fangxinqian.enums.RealnameResultEnum; import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/SealGenerateResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/SealGenerateResponseDTO.java similarity index 86% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/SealGenerateResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/SealGenerateResponseDTO.java index b7926fa..bea8ba4 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/SealGenerateResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/SealGenerateResponseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/StateDataDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/StateDataDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/StateDataDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/StateDataDTO.java index f0b1699..3dd30ee 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/StateDataDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/StateDataDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/TextReplaceRequestDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/TextReplaceRequestDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/TextReplaceRequestDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/TextReplaceRequestDTO.java index 229a269..d0d2133 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/TextReplaceRequestDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/TextReplaceRequestDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; -import com.newyetai.common.annotation.Mask; +import com.senmesh.common.annotation.Mask; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/dto/TextReplaceResponseDTO.java b/src/main/java/com/senmesh/sdk/fangxinqian/dto/TextReplaceResponseDTO.java similarity index 74% rename from src/main/java/com/newyetai/sdk/fangxinqian/dto/TextReplaceResponseDTO.java rename to src/main/java/com/senmesh/sdk/fangxinqian/dto/TextReplaceResponseDTO.java index 12622c6..d1dc827 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/dto/TextReplaceResponseDTO.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/dto/TextReplaceResponseDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.fangxinqian.dto; +package com.senmesh.sdk.fangxinqian.dto; -import com.newyetai.common.annotation.Mask; +import com.senmesh.common.annotation.Mask; import lombok.Data; @Data diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/enums/RealnameResultEnum.java b/src/main/java/com/senmesh/sdk/fangxinqian/enums/RealnameResultEnum.java similarity index 91% rename from src/main/java/com/newyetai/sdk/fangxinqian/enums/RealnameResultEnum.java rename to src/main/java/com/senmesh/sdk/fangxinqian/enums/RealnameResultEnum.java index cf4240d..a16b621 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/enums/RealnameResultEnum.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/enums/RealnameResultEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.fangxinqian.enums; +package com.senmesh.sdk.fangxinqian.enums; /** * 实名认证状态枚举类 diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/service/FangXinQianService.java b/src/main/java/com/senmesh/sdk/fangxinqian/service/FangXinQianService.java similarity index 96% rename from src/main/java/com/newyetai/sdk/fangxinqian/service/FangXinQianService.java rename to src/main/java/com/senmesh/sdk/fangxinqian/service/FangXinQianService.java index 39abb01..8227544 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/service/FangXinQianService.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/service/FangXinQianService.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.fangxinqian.service; +package com.senmesh.sdk.fangxinqian.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.fangxinqian.dto.*; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.fangxinqian.dto.*; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/service/impl/FangXinQianServiceImpl.java b/src/main/java/com/senmesh/sdk/fangxinqian/service/impl/FangXinQianServiceImpl.java similarity index 92% rename from src/main/java/com/newyetai/sdk/fangxinqian/service/impl/FangXinQianServiceImpl.java rename to src/main/java/com/senmesh/sdk/fangxinqian/service/impl/FangXinQianServiceImpl.java index 3dc8fa6..7ef9449 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/service/impl/FangXinQianServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/service/impl/FangXinQianServiceImpl.java @@ -1,19 +1,19 @@ -package com.newyetai.sdk.fangxinqian.service.impl; +package com.senmesh.sdk.fangxinqian.service.impl; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.annotation.CheckAndMock; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.fangxinqian.config.FxqCommonProperties; -import com.newyetai.sdk.fangxinqian.config.FxqContractProperties; -import com.newyetai.sdk.fangxinqian.config.FxqProperties; -import com.newyetai.sdk.fangxinqian.constant.BankCardFourStateEnum; -import com.newyetai.sdk.fangxinqian.constant.BankCardThreeStateEnum; -import com.newyetai.sdk.fangxinqian.constant.FxqConstants; -import com.newyetai.sdk.fangxinqian.constant.FxqErrorCodeEnum; -import com.newyetai.sdk.fangxinqian.dto.*; -import com.newyetai.sdk.fangxinqian.service.FangXinQianService; -import com.newyetai.sdk.fangxinqian.util.FxqUtils; -import com.newyetai.sdk.fangxinqian.util.HttpUtil; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.annotation.CheckAndMock; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.fangxinqian.config.FxqCommonProperties; +import com.senmesh.sdk.fangxinqian.config.FxqContractProperties; +import com.senmesh.sdk.fangxinqian.config.FxqProperties; +import com.senmesh.sdk.fangxinqian.constant.BankCardFourStateEnum; +import com.senmesh.sdk.fangxinqian.constant.BankCardThreeStateEnum; +import com.senmesh.sdk.fangxinqian.constant.FxqConstants; +import com.senmesh.sdk.fangxinqian.constant.FxqErrorCodeEnum; +import com.senmesh.sdk.fangxinqian.dto.*; +import com.senmesh.sdk.fangxinqian.service.FangXinQianService; +import com.senmesh.sdk.fangxinqian.util.FxqUtils; +import com.senmesh.sdk.fangxinqian.util.HttpUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/service/impl/MockFangXinQianServiceImpl.java b/src/main/java/com/senmesh/sdk/fangxinqian/service/impl/MockFangXinQianServiceImpl.java similarity index 94% rename from src/main/java/com/newyetai/sdk/fangxinqian/service/impl/MockFangXinQianServiceImpl.java rename to src/main/java/com/senmesh/sdk/fangxinqian/service/impl/MockFangXinQianServiceImpl.java index f49d5de..e7b00ce 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/service/impl/MockFangXinQianServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/service/impl/MockFangXinQianServiceImpl.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.fangxinqian.service.impl; +package com.senmesh.sdk.fangxinqian.service.impl; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.fangxinqian.dto.*; -import com.newyetai.sdk.fangxinqian.service.FangXinQianService; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.fangxinqian.dto.*; +import com.senmesh.sdk.fangxinqian.service.FangXinQianService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/util/FxqUtils.java b/src/main/java/com/senmesh/sdk/fangxinqian/util/FxqUtils.java similarity index 89% rename from src/main/java/com/newyetai/sdk/fangxinqian/util/FxqUtils.java rename to src/main/java/com/senmesh/sdk/fangxinqian/util/FxqUtils.java index 0aad8f0..241a643 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/util/FxqUtils.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/util/FxqUtils.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.fangxinqian.util; +package com.senmesh.sdk.fangxinqian.util; import org.apache.commons.lang3.StringUtils; -import com.newyetai.sdk.fangxinqian.config.FxqCommonProperties; -import com.newyetai.sdk.fangxinqian.dto.FxqRequestDTO; +import com.senmesh.sdk.fangxinqian.config.FxqCommonProperties; +import com.senmesh.sdk.fangxinqian.dto.FxqRequestDTO; /** * 工具类 diff --git a/src/main/java/com/newyetai/sdk/fangxinqian/util/HttpUtil.java b/src/main/java/com/senmesh/sdk/fangxinqian/util/HttpUtil.java similarity index 93% rename from src/main/java/com/newyetai/sdk/fangxinqian/util/HttpUtil.java rename to src/main/java/com/senmesh/sdk/fangxinqian/util/HttpUtil.java index 3e8b632..5021428 100644 --- a/src/main/java/com/newyetai/sdk/fangxinqian/util/HttpUtil.java +++ b/src/main/java/com/senmesh/sdk/fangxinqian/util/HttpUtil.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.fangxinqian.util; +package com.senmesh.sdk.fangxinqian.util; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.fangxinqian.dto.FxqResponseDTO; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.fangxinqian.dto.FxqResponseDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; diff --git a/src/main/java/com/newyetai/sdk/mbti/config/MbtiProperties.java b/src/main/java/com/senmesh/sdk/mbti/config/MbtiProperties.java similarity index 93% rename from src/main/java/com/newyetai/sdk/mbti/config/MbtiProperties.java rename to src/main/java/com/senmesh/sdk/mbti/config/MbtiProperties.java index eaf9704..72666c7 100644 --- a/src/main/java/com/newyetai/sdk/mbti/config/MbtiProperties.java +++ b/src/main/java/com/senmesh/sdk/mbti/config/MbtiProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.config; +package com.senmesh.sdk.mbti.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/AnswerReq.java b/src/main/java/com/senmesh/sdk/mbti/mobel/AnswerReq.java similarity index 95% rename from src/main/java/com/newyetai/sdk/mbti/mobel/AnswerReq.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/AnswerReq.java index ad82b2a..74c4396 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/AnswerReq.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/AnswerReq.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/AnswerReqDTO.java b/src/main/java/com/senmesh/sdk/mbti/mobel/AnswerReqDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/mbti/mobel/AnswerReqDTO.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/AnswerReqDTO.java index faead9b..da44950 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/AnswerReqDTO.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/AnswerReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/AnswerRes.java b/src/main/java/com/senmesh/sdk/mbti/mobel/AnswerRes.java similarity index 90% rename from src/main/java/com/newyetai/sdk/mbti/mobel/AnswerRes.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/AnswerRes.java index 31175b6..823615f 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/AnswerRes.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/AnswerRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/AnwserDTO.java b/src/main/java/com/senmesh/sdk/mbti/mobel/AnwserDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/mbti/mobel/AnwserDTO.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/AnwserDTO.java index 7f795c7..47a0217 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/AnwserDTO.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/AnwserDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/MbtiRes.java b/src/main/java/com/senmesh/sdk/mbti/mobel/MbtiRes.java similarity index 91% rename from src/main/java/com/newyetai/sdk/mbti/mobel/MbtiRes.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/MbtiRes.java index c75e998..9aa989a 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/MbtiRes.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/MbtiRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/MbtiTokenReq.java b/src/main/java/com/senmesh/sdk/mbti/mobel/MbtiTokenReq.java similarity index 77% rename from src/main/java/com/newyetai/sdk/mbti/mobel/MbtiTokenReq.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/MbtiTokenReq.java index 6ab6ba8..2a30ca9 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/MbtiTokenReq.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/MbtiTokenReq.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.common.dto.ISdkRequest; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/OrderQueryReq.java b/src/main/java/com/senmesh/sdk/mbti/mobel/OrderQueryReq.java similarity index 95% rename from src/main/java/com/newyetai/sdk/mbti/mobel/OrderQueryReq.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/OrderQueryReq.java index ee026cc..5bb133d 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/OrderQueryReq.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/OrderQueryReq.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/OrderQueryRes.java b/src/main/java/com/senmesh/sdk/mbti/mobel/OrderQueryRes.java similarity index 90% rename from src/main/java/com/newyetai/sdk/mbti/mobel/OrderQueryRes.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/OrderQueryRes.java index c6b50db..1a284e9 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/OrderQueryRes.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/OrderQueryRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/QuestionReq.java b/src/main/java/com/senmesh/sdk/mbti/mobel/QuestionReq.java similarity index 95% rename from src/main/java/com/newyetai/sdk/mbti/mobel/QuestionReq.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/QuestionReq.java index 64572c7..c567eaa 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/QuestionReq.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/QuestionReq.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/QuestionRes.java b/src/main/java/com/senmesh/sdk/mbti/mobel/QuestionRes.java similarity index 93% rename from src/main/java/com/newyetai/sdk/mbti/mobel/QuestionRes.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/QuestionRes.java index 8c04eb4..f72f008 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/QuestionRes.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/QuestionRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/ReportReq.java b/src/main/java/com/senmesh/sdk/mbti/mobel/ReportReq.java similarity index 95% rename from src/main/java/com/newyetai/sdk/mbti/mobel/ReportReq.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/ReportReq.java index 8432d3d..c0701c5 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/ReportReq.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/ReportReq.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/ReportRes.java b/src/main/java/com/senmesh/sdk/mbti/mobel/ReportRes.java similarity index 91% rename from src/main/java/com/newyetai/sdk/mbti/mobel/ReportRes.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/ReportRes.java index 3d114a7..a247a74 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/ReportRes.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/ReportRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/TokenReq.java b/src/main/java/com/senmesh/sdk/mbti/mobel/TokenReq.java similarity index 89% rename from src/main/java/com/newyetai/sdk/mbti/mobel/TokenReq.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/TokenReq.java index fb8b78e..9442433 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/TokenReq.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/TokenReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import org.springframework.core.ParameterizedTypeReference; -import com.newyetai.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.common.dto.ISdkRequest; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/mbti/mobel/TokenRes.java b/src/main/java/com/senmesh/sdk/mbti/mobel/TokenRes.java similarity index 91% rename from src/main/java/com/newyetai/sdk/mbti/mobel/TokenRes.java rename to src/main/java/com/senmesh/sdk/mbti/mobel/TokenRes.java index 2f450c5..a6aa62d 100644 --- a/src/main/java/com/newyetai/sdk/mbti/mobel/TokenRes.java +++ b/src/main/java/com/senmesh/sdk/mbti/mobel/TokenRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.mobel; +package com.senmesh.sdk.mbti.mobel; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/mbti/service/MbtiProvider.java b/src/main/java/com/senmesh/sdk/mbti/service/MbtiProvider.java similarity index 79% rename from src/main/java/com/newyetai/sdk/mbti/service/MbtiProvider.java rename to src/main/java/com/senmesh/sdk/mbti/service/MbtiProvider.java index bdc0b10..99a8924 100644 --- a/src/main/java/com/newyetai/sdk/mbti/service/MbtiProvider.java +++ b/src/main/java/com/senmesh/sdk/mbti/service/MbtiProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.mbti.service; +package com.senmesh.sdk.mbti.service; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -6,17 +6,17 @@ import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.common.util.HttpUtils; -import com.newyetai.sdk.mbti.config.MbtiProperties; -import com.newyetai.sdk.mbti.mobel.MbtiRes; -import com.newyetai.sdk.mbti.mobel.MbtiTokenReq; -import com.newyetai.sdk.mbti.mobel.TokenReq; -import com.newyetai.sdk.mbti.mobel.TokenRes; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.dto.DefaultSdkInvokeLogDTO; +import com.senmesh.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.common.util.HttpUtils; +import com.senmesh.sdk.mbti.config.MbtiProperties; +import com.senmesh.sdk.mbti.mobel.MbtiRes; +import com.senmesh.sdk.mbti.mobel.MbtiTokenReq; +import com.senmesh.sdk.mbti.mobel.TokenReq; +import com.senmesh.sdk.mbti.mobel.TokenRes; import io.jsonwebtoken.lang.Assert; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/robot/constant/DingTalkMsgTypeEnum.java b/src/main/java/com/senmesh/sdk/robot/constant/DingTalkMsgTypeEnum.java similarity index 90% rename from src/main/java/com/newyetai/sdk/robot/constant/DingTalkMsgTypeEnum.java rename to src/main/java/com/senmesh/sdk/robot/constant/DingTalkMsgTypeEnum.java index e64373e..d8e6bf3 100644 --- a/src/main/java/com/newyetai/sdk/robot/constant/DingTalkMsgTypeEnum.java +++ b/src/main/java/com/senmesh/sdk/robot/constant/DingTalkMsgTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.robot.constant; +package com.senmesh.sdk.robot.constant; /** * @author sr on 2020-09-30 diff --git a/src/main/java/com/newyetai/sdk/robot/constant/RobotTypeEnum.java b/src/main/java/com/senmesh/sdk/robot/constant/RobotTypeEnum.java similarity index 77% rename from src/main/java/com/newyetai/sdk/robot/constant/RobotTypeEnum.java rename to src/main/java/com/senmesh/sdk/robot/constant/RobotTypeEnum.java index d00e47b..4132971 100644 --- a/src/main/java/com/newyetai/sdk/robot/constant/RobotTypeEnum.java +++ b/src/main/java/com/senmesh/sdk/robot/constant/RobotTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.robot.constant; +package com.senmesh.sdk.robot.constant; /** * @author sr on 2020-09-30 diff --git a/src/main/java/com/newyetai/sdk/robot/constant/WorkWechatMsgTypeEnum.java b/src/main/java/com/senmesh/sdk/robot/constant/WorkWechatMsgTypeEnum.java similarity index 89% rename from src/main/java/com/newyetai/sdk/robot/constant/WorkWechatMsgTypeEnum.java rename to src/main/java/com/senmesh/sdk/robot/constant/WorkWechatMsgTypeEnum.java index cda557d..1179b14 100644 --- a/src/main/java/com/newyetai/sdk/robot/constant/WorkWechatMsgTypeEnum.java +++ b/src/main/java/com/senmesh/sdk/robot/constant/WorkWechatMsgTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.robot.constant; +package com.senmesh.sdk.robot.constant; /** * @author sr on 2020-09-30 diff --git a/src/main/java/com/newyetai/sdk/robot/model/IDingTalkMsg.java b/src/main/java/com/senmesh/sdk/robot/model/IDingTalkMsg.java similarity index 71% rename from src/main/java/com/newyetai/sdk/robot/model/IDingTalkMsg.java rename to src/main/java/com/senmesh/sdk/robot/model/IDingTalkMsg.java index 8e2f769..a7cfd79 100644 --- a/src/main/java/com/newyetai/sdk/robot/model/IDingTalkMsg.java +++ b/src/main/java/com/senmesh/sdk/robot/model/IDingTalkMsg.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.robot.model; +package com.senmesh.sdk.robot.model; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/robot/model/IMsg.java b/src/main/java/com/senmesh/sdk/robot/model/IMsg.java similarity index 81% rename from src/main/java/com/newyetai/sdk/robot/model/IMsg.java rename to src/main/java/com/senmesh/sdk/robot/model/IMsg.java index ecb02cb..d531a17 100644 --- a/src/main/java/com/newyetai/sdk/robot/model/IMsg.java +++ b/src/main/java/com/senmesh/sdk/robot/model/IMsg.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.robot.model; +package com.senmesh.sdk.robot.model; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; /** * @author sr on 2020-09-30 diff --git a/src/main/java/com/newyetai/sdk/robot/model/IRobot.java b/src/main/java/com/senmesh/sdk/robot/model/IRobot.java similarity index 75% rename from src/main/java/com/newyetai/sdk/robot/model/IRobot.java rename to src/main/java/com/senmesh/sdk/robot/model/IRobot.java index c5fb924..bc1d383 100644 --- a/src/main/java/com/newyetai/sdk/robot/model/IRobot.java +++ b/src/main/java/com/senmesh/sdk/robot/model/IRobot.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.robot.model; +package com.senmesh.sdk.robot.model; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; /** * @author sr on 2020-09-30 diff --git a/src/main/java/com/newyetai/sdk/robot/model/IWorkWechatMsg.java b/src/main/java/com/senmesh/sdk/robot/model/IWorkWechatMsg.java similarity index 72% rename from src/main/java/com/newyetai/sdk/robot/model/IWorkWechatMsg.java rename to src/main/java/com/senmesh/sdk/robot/model/IWorkWechatMsg.java index f8265b9..c55fd09 100644 --- a/src/main/java/com/newyetai/sdk/robot/model/IWorkWechatMsg.java +++ b/src/main/java/com/senmesh/sdk/robot/model/IWorkWechatMsg.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.robot.model; +package com.senmesh.sdk.robot.model; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/robot/model/MarkdownMsg.java b/src/main/java/com/senmesh/sdk/robot/model/MarkdownMsg.java similarity index 85% rename from src/main/java/com/newyetai/sdk/robot/model/MarkdownMsg.java rename to src/main/java/com/senmesh/sdk/robot/model/MarkdownMsg.java index 336bfe0..0bb1e03 100644 --- a/src/main/java/com/newyetai/sdk/robot/model/MarkdownMsg.java +++ b/src/main/java/com/senmesh/sdk/robot/model/MarkdownMsg.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.robot.model; +package com.senmesh.sdk.robot.model; import com.google.common.collect.Lists; -import com.newyetai.sdk.robot.constant.DingTalkMsgTypeEnum; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.constant.DingTalkMsgTypeEnum; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Builder.Default; diff --git a/src/main/java/com/newyetai/sdk/robot/model/TextMsg.java b/src/main/java/com/senmesh/sdk/robot/model/TextMsg.java similarity index 85% rename from src/main/java/com/newyetai/sdk/robot/model/TextMsg.java rename to src/main/java/com/senmesh/sdk/robot/model/TextMsg.java index 4076c90..d8b1204 100644 --- a/src/main/java/com/newyetai/sdk/robot/model/TextMsg.java +++ b/src/main/java/com/senmesh/sdk/robot/model/TextMsg.java @@ -1,11 +1,11 @@ -package com.newyetai.sdk.robot.model; +package com.senmesh.sdk.robot.model; import java.io.Serializable; import java.util.List; import com.google.common.collect.Lists; -import com.newyetai.sdk.robot.constant.DingTalkMsgTypeEnum; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.constant.DingTalkMsgTypeEnum; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/robot/service/IRobotService.java b/src/main/java/com/senmesh/sdk/robot/service/IRobotService.java similarity index 70% rename from src/main/java/com/newyetai/sdk/robot/service/IRobotService.java rename to src/main/java/com/senmesh/sdk/robot/service/IRobotService.java index b926b4f..72a81a7 100644 --- a/src/main/java/com/newyetai/sdk/robot/service/IRobotService.java +++ b/src/main/java/com/senmesh/sdk/robot/service/IRobotService.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.robot.service; +package com.senmesh.sdk.robot.service; -import com.newyetai.sdk.robot.model.IDingTalkMsg; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; -import com.newyetai.sdk.robot.model.MarkdownMsg; -import com.newyetai.sdk.robot.model.TextMsg; +import com.senmesh.sdk.robot.model.IDingTalkMsg; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.robot.model.MarkdownMsg; +import com.senmesh.sdk.robot.model.TextMsg; /** * @author sr on 2020-09-30 diff --git a/src/main/java/com/newyetai/sdk/robot/service/impl/RobotDevopsProvider.java b/src/main/java/com/senmesh/sdk/robot/service/impl/RobotDevopsProvider.java similarity index 64% rename from src/main/java/com/newyetai/sdk/robot/service/impl/RobotDevopsProvider.java rename to src/main/java/com/senmesh/sdk/robot/service/impl/RobotDevopsProvider.java index 5acb7eb..dc8d14f 100644 --- a/src/main/java/com/newyetai/sdk/robot/service/impl/RobotDevopsProvider.java +++ b/src/main/java/com/senmesh/sdk/robot/service/impl/RobotDevopsProvider.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.robot.service.impl; +package com.senmesh.sdk.robot.service.impl; import org.springframework.stereotype.Service; -import com.newyetai.common.exception.IDevopsProvider; -import com.newyetai.sdk.robot.util.RobotUtils; +import com.senmesh.common.exception.IDevopsProvider; +import com.senmesh.sdk.robot.util.RobotUtils; /** * 机器人运维工具类 diff --git a/src/main/java/com/newyetai/sdk/robot/service/impl/RobotServiceImpl.java b/src/main/java/com/senmesh/sdk/robot/service/impl/RobotServiceImpl.java similarity index 87% rename from src/main/java/com/newyetai/sdk/robot/service/impl/RobotServiceImpl.java rename to src/main/java/com/senmesh/sdk/robot/service/impl/RobotServiceImpl.java index e5ea60a..4862c03 100644 --- a/src/main/java/com/newyetai/sdk/robot/service/impl/RobotServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/robot/service/impl/RobotServiceImpl.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.robot.service.impl; +package com.senmesh.sdk.robot.service.impl; -import com.newyetai.sdk.robot.model.MarkdownMsg; +import com.senmesh.sdk.robot.model.MarkdownMsg; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; @@ -9,14 +9,14 @@ import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiRobotSendRequest; import com.dingtalk.api.response.OapiRobotSendResponse; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; -import com.newyetai.sdk.robot.model.IDingTalkMsg; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; -import com.newyetai.sdk.robot.model.TextMsg; -import com.newyetai.sdk.robot.service.IRobotService; -import com.newyetai.sdk.workwechat.constant.WorkWechatConstants; -import com.newyetai.sdk.workwechat.model.WwrTextMsg; -import com.newyetai.sdk.workwechat.util.WorkWechatUtils; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.model.IDingTalkMsg; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.robot.model.TextMsg; +import com.senmesh.sdk.robot.service.IRobotService; +import com.senmesh.sdk.workwechat.constant.WorkWechatConstants; +import com.senmesh.sdk.workwechat.model.WwrTextMsg; +import com.senmesh.sdk.workwechat.util.WorkWechatUtils; import com.taobao.api.ApiException; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/robot/util/MarkdownMsgUtils.java b/src/main/java/com/senmesh/sdk/robot/util/MarkdownMsgUtils.java similarity index 92% rename from src/main/java/com/newyetai/sdk/robot/util/MarkdownMsgUtils.java rename to src/main/java/com/senmesh/sdk/robot/util/MarkdownMsgUtils.java index 1e98c9b..24ae8d9 100644 --- a/src/main/java/com/newyetai/sdk/robot/util/MarkdownMsgUtils.java +++ b/src/main/java/com/senmesh/sdk/robot/util/MarkdownMsgUtils.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.robot.util; +package com.senmesh.sdk.robot.util; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; -import com.newyetai.sdk.robot.model.MarkdownMsg; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.model.MarkdownMsg; import org.apache.commons.lang3.StringUtils; import java.util.Arrays; diff --git a/src/main/java/com/newyetai/sdk/robot/util/RobotUtils.java b/src/main/java/com/senmesh/sdk/robot/util/RobotUtils.java similarity index 93% rename from src/main/java/com/newyetai/sdk/robot/util/RobotUtils.java rename to src/main/java/com/senmesh/sdk/robot/util/RobotUtils.java index fc266e6..91a1b34 100644 --- a/src/main/java/com/newyetai/sdk/robot/util/RobotUtils.java +++ b/src/main/java/com/senmesh/sdk/robot/util/RobotUtils.java @@ -1,10 +1,10 @@ -package com.newyetai.sdk.robot.util; +package com.senmesh.sdk.robot.util; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.sdk.robot.model.MarkdownMsg; -import com.newyetai.sdk.robot.model.TextMsg; -import com.newyetai.sdk.robot.service.IRobotService; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.sdk.robot.model.MarkdownMsg; +import com.senmesh.sdk.robot.model.TextMsg; +import com.senmesh.sdk.robot.service.IRobotService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/robot/util/TextMsgUtils.java b/src/main/java/com/senmesh/sdk/robot/util/TextMsgUtils.java similarity index 90% rename from src/main/java/com/newyetai/sdk/robot/util/TextMsgUtils.java rename to src/main/java/com/senmesh/sdk/robot/util/TextMsgUtils.java index 90423ca..390c101 100644 --- a/src/main/java/com/newyetai/sdk/robot/util/TextMsgUtils.java +++ b/src/main/java/com/senmesh/sdk/robot/util/TextMsgUtils.java @@ -1,14 +1,14 @@ -package com.newyetai.sdk.robot.util; +package com.senmesh.sdk.robot.util; import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.sdk.robot.constant.RobotTypeEnum; -import com.newyetai.sdk.robot.model.TextMsg; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.sdk.robot.constant.RobotTypeEnum; +import com.senmesh.sdk.robot.model.TextMsg; /** * @author sr on 2020-10-12 diff --git a/src/main/java/com/newyetai/sdk/sms/config/SmsConfig.java b/src/main/java/com/senmesh/sdk/sms/config/SmsConfig.java similarity index 96% rename from src/main/java/com/newyetai/sdk/sms/config/SmsConfig.java rename to src/main/java/com/senmesh/sdk/sms/config/SmsConfig.java index ad3c6c9..abce16c 100644 --- a/src/main/java/com/newyetai/sdk/sms/config/SmsConfig.java +++ b/src/main/java/com/senmesh/sdk/sms/config/SmsConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.config; +package com.senmesh.sdk.sms.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/newyetai/sdk/sms/constant/AliSmsActionEnum.java b/src/main/java/com/senmesh/sdk/sms/constant/AliSmsActionEnum.java similarity index 96% rename from src/main/java/com/newyetai/sdk/sms/constant/AliSmsActionEnum.java rename to src/main/java/com/senmesh/sdk/sms/constant/AliSmsActionEnum.java index 4419002..10f9cb3 100644 --- a/src/main/java/com/newyetai/sdk/sms/constant/AliSmsActionEnum.java +++ b/src/main/java/com/senmesh/sdk/sms/constant/AliSmsActionEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.constant; +package com.senmesh.sdk.sms.constant; /** * 阿里云action diff --git a/src/main/java/com/newyetai/sdk/sms/constant/SmsConstants.java b/src/main/java/com/senmesh/sdk/sms/constant/SmsConstants.java similarity index 91% rename from src/main/java/com/newyetai/sdk/sms/constant/SmsConstants.java rename to src/main/java/com/senmesh/sdk/sms/constant/SmsConstants.java index 7e97599..4c75783 100644 --- a/src/main/java/com/newyetai/sdk/sms/constant/SmsConstants.java +++ b/src/main/java/com/senmesh/sdk/sms/constant/SmsConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.constant; +package com.senmesh.sdk.sms.constant; /** * 短信常量类 diff --git a/src/main/java/com/newyetai/sdk/sms/constant/SmsProviderEnum.java b/src/main/java/com/senmesh/sdk/sms/constant/SmsProviderEnum.java similarity index 89% rename from src/main/java/com/newyetai/sdk/sms/constant/SmsProviderEnum.java rename to src/main/java/com/senmesh/sdk/sms/constant/SmsProviderEnum.java index ab7f433..98ce908 100644 --- a/src/main/java/com/newyetai/sdk/sms/constant/SmsProviderEnum.java +++ b/src/main/java/com/senmesh/sdk/sms/constant/SmsProviderEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.constant; +package com.senmesh.sdk.sms.constant; /** * 短信服务提供者 diff --git a/src/main/java/com/newyetai/sdk/sms/dto/ISendDTO.java b/src/main/java/com/senmesh/sdk/sms/dto/ISendDTO.java similarity index 91% rename from src/main/java/com/newyetai/sdk/sms/dto/ISendDTO.java rename to src/main/java/com/senmesh/sdk/sms/dto/ISendDTO.java index 1ea39e7..a444fc3 100644 --- a/src/main/java/com/newyetai/sdk/sms/dto/ISendDTO.java +++ b/src/main/java/com/senmesh/sdk/sms/dto/ISendDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.sms.dto; +package com.senmesh.sdk.sms.dto; -import com.newyetai.sdk.sms.constant.SmsProviderEnum; +import com.senmesh.sdk.sms.constant.SmsProviderEnum; /** * 发送短信对象接口 diff --git a/src/main/java/com/newyetai/sdk/sms/dto/ITemplateCode.java b/src/main/java/com/senmesh/sdk/sms/dto/ITemplateCode.java similarity index 87% rename from src/main/java/com/newyetai/sdk/sms/dto/ITemplateCode.java rename to src/main/java/com/senmesh/sdk/sms/dto/ITemplateCode.java index ce488e3..d78e0e9 100644 --- a/src/main/java/com/newyetai/sdk/sms/dto/ITemplateCode.java +++ b/src/main/java/com/senmesh/sdk/sms/dto/ITemplateCode.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.dto; +package com.senmesh.sdk.sms.dto; /** * 短信模版对象 diff --git a/src/main/java/com/newyetai/sdk/sms/dto/SimpleSendDTO.java b/src/main/java/com/senmesh/sdk/sms/dto/SimpleSendDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/sms/dto/SimpleSendDTO.java rename to src/main/java/com/senmesh/sdk/sms/dto/SimpleSendDTO.java index 73dcb4f..5453c8f 100644 --- a/src/main/java/com/newyetai/sdk/sms/dto/SimpleSendDTO.java +++ b/src/main/java/com/senmesh/sdk/sms/dto/SimpleSendDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.dto; +package com.senmesh.sdk.sms.dto; import java.util.Map; diff --git a/src/main/java/com/newyetai/sdk/sms/dto/VerificationCodeParamDTO.java b/src/main/java/com/senmesh/sdk/sms/dto/VerificationCodeParamDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/sms/dto/VerificationCodeParamDTO.java rename to src/main/java/com/senmesh/sdk/sms/dto/VerificationCodeParamDTO.java index 9ffe8f7..10914f0 100644 --- a/src/main/java/com/newyetai/sdk/sms/dto/VerificationCodeParamDTO.java +++ b/src/main/java/com/senmesh/sdk/sms/dto/VerificationCodeParamDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.dto; +package com.senmesh.sdk.sms.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/dto/VerificationCodeSendDTO.java b/src/main/java/com/senmesh/sdk/sms/dto/VerificationCodeSendDTO.java similarity index 96% rename from src/main/java/com/newyetai/sdk/sms/dto/VerificationCodeSendDTO.java rename to src/main/java/com/senmesh/sdk/sms/dto/VerificationCodeSendDTO.java index 526ce9d..dc93eba 100644 --- a/src/main/java/com/newyetai/sdk/sms/dto/VerificationCodeSendDTO.java +++ b/src/main/java/com/senmesh/sdk/sms/dto/VerificationCodeSendDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.dto; +package com.senmesh.sdk.sms.dto; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/com/newyetai/sdk/sms/model/AddSmsSign.java b/src/main/java/com/senmesh/sdk/sms/model/AddSmsSign.java similarity index 98% rename from src/main/java/com/newyetai/sdk/sms/model/AddSmsSign.java rename to src/main/java/com/senmesh/sdk/sms/model/AddSmsSign.java index ba555f4..04f757b 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/AddSmsSign.java +++ b/src/main/java/com/senmesh/sdk/sms/model/AddSmsSign.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/AddSmsSignResponse.java b/src/main/java/com/senmesh/sdk/sms/model/AddSmsSignResponse.java similarity index 96% rename from src/main/java/com/newyetai/sdk/sms/model/AddSmsSignResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/AddSmsSignResponse.java index 3119052..bed0459 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/AddSmsSignResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/AddSmsSignResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/AddSmsTemplate.java b/src/main/java/com/senmesh/sdk/sms/model/AddSmsTemplate.java similarity index 97% rename from src/main/java/com/newyetai/sdk/sms/model/AddSmsTemplate.java rename to src/main/java/com/senmesh/sdk/sms/model/AddSmsTemplate.java index ddd97e1..205b759 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/AddSmsTemplate.java +++ b/src/main/java/com/senmesh/sdk/sms/model/AddSmsTemplate.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/DeleteSmsSign.java b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSign.java similarity index 93% rename from src/main/java/com/newyetai/sdk/sms/model/DeleteSmsSign.java rename to src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSign.java index 151704a..0eb2e2f 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/DeleteSmsSign.java +++ b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSign.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/DeleteSmsSignResponse.java b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSignResponse.java similarity index 96% rename from src/main/java/com/newyetai/sdk/sms/model/DeleteSmsSignResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSignResponse.java index 8270de4..1e3d7c0 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/DeleteSmsSignResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSignResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/DeleteSmsTemplate.java b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsTemplate.java similarity index 94% rename from src/main/java/com/newyetai/sdk/sms/model/DeleteSmsTemplate.java rename to src/main/java/com/senmesh/sdk/sms/model/DeleteSmsTemplate.java index 97563dd..0e82162 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/DeleteSmsTemplate.java +++ b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsTemplate.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/ModifySmsSign.java b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSign.java similarity index 98% rename from src/main/java/com/newyetai/sdk/sms/model/ModifySmsSign.java rename to src/main/java/com/senmesh/sdk/sms/model/ModifySmsSign.java index 10b1ef5..ffdba23 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/ModifySmsSign.java +++ b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSign.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/ModifySmsSignResponse.java b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSignResponse.java similarity index 96% rename from src/main/java/com/newyetai/sdk/sms/model/ModifySmsSignResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/ModifySmsSignResponse.java index 34454d9..1c89ee8 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/ModifySmsSignResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSignResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/ModifySmsTemplate.java b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsTemplate.java similarity index 98% rename from src/main/java/com/newyetai/sdk/sms/model/ModifySmsTemplate.java rename to src/main/java/com/senmesh/sdk/sms/model/ModifySmsTemplate.java index 3d0af5a..e4d600e 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/ModifySmsTemplate.java +++ b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsTemplate.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/QuerySendDetails.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySendDetails.java similarity index 97% rename from src/main/java/com/newyetai/sdk/sms/model/QuerySendDetails.java rename to src/main/java/com/senmesh/sdk/sms/model/QuerySendDetails.java index 4b1609c..2ba0115 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/QuerySendDetails.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySendDetails.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/QuerySmsSign.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSign.java similarity index 92% rename from src/main/java/com/newyetai/sdk/sms/model/QuerySmsSign.java rename to src/main/java/com/senmesh/sdk/sms/model/QuerySmsSign.java index fe3cad2..2356c42 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/QuerySmsSign.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSign.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/QuerySmsSignResponse.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSignResponse.java similarity index 98% rename from src/main/java/com/newyetai/sdk/sms/model/QuerySmsSignResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/QuerySmsSignResponse.java index b3b8a4d..8687da1 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/QuerySmsSignResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSignResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/QuerySmsTemplate.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplate.java similarity index 94% rename from src/main/java/com/newyetai/sdk/sms/model/QuerySmsTemplate.java rename to src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplate.java index 8e39c5e..cbe4a11 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/QuerySmsTemplate.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplate.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/QuerySmsTemplateResponse.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplateResponse.java similarity index 98% rename from src/main/java/com/newyetai/sdk/sms/model/QuerySmsTemplateResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplateResponse.java index 434982a..438d470 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/QuerySmsTemplateResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplateResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/newyetai/sdk/sms/model/SendBatchSms.java b/src/main/java/com/senmesh/sdk/sms/model/SendBatchSms.java similarity index 98% rename from src/main/java/com/newyetai/sdk/sms/model/SendBatchSms.java rename to src/main/java/com/senmesh/sdk/sms/model/SendBatchSms.java index 592f956..0442858 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/SendBatchSms.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SendBatchSms.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/sms/model/SendSms.java b/src/main/java/com/senmesh/sdk/sms/model/SendSms.java similarity index 98% rename from src/main/java/com/newyetai/sdk/sms/model/SendSms.java rename to src/main/java/com/senmesh/sdk/sms/model/SendSms.java index 5087ffb..921447d 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/SendSms.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SendSms.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/sms/model/SendSmsResponse.java b/src/main/java/com/senmesh/sdk/sms/model/SendSmsResponse.java similarity index 89% rename from src/main/java/com/newyetai/sdk/sms/model/SendSmsResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/SendSmsResponse.java index cb5b927..390f1b8 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/SendSmsResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SendSmsResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/sms/model/SmsResponse.java b/src/main/java/com/senmesh/sdk/sms/model/SmsResponse.java similarity index 95% rename from src/main/java/com/newyetai/sdk/sms/model/SmsResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/SmsResponse.java index a0b9527..779adc6 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/SmsResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SmsResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/newyetai/sdk/sms/model/SmsSendDetailResponse.java b/src/main/java/com/senmesh/sdk/sms/model/SmsSendDetailResponse.java similarity index 98% rename from src/main/java/com/newyetai/sdk/sms/model/SmsSendDetailResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/SmsSendDetailResponse.java index 02f973c..fb26a91 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/SmsSendDetailResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SmsSendDetailResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/sms/model/SmsTemplateResponse.java b/src/main/java/com/senmesh/sdk/sms/model/SmsTemplateResponse.java similarity index 94% rename from src/main/java/com/newyetai/sdk/sms/model/SmsTemplateResponse.java rename to src/main/java/com/senmesh/sdk/sms/model/SmsTemplateResponse.java index b78b66a..a94eca6 100644 --- a/src/main/java/com/newyetai/sdk/sms/model/SmsTemplateResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SmsTemplateResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.model; +package com.senmesh.sdk.sms.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/newyetai/sdk/sms/service/SdkSmsProvider.java b/src/main/java/com/senmesh/sdk/sms/service/SdkSmsProvider.java similarity index 69% rename from src/main/java/com/newyetai/sdk/sms/service/SdkSmsProvider.java rename to src/main/java/com/senmesh/sdk/sms/service/SdkSmsProvider.java index 15701f7..5e36835 100644 --- a/src/main/java/com/newyetai/sdk/sms/service/SdkSmsProvider.java +++ b/src/main/java/com/senmesh/sdk/sms/service/SdkSmsProvider.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.sms.service; +package com.senmesh.sdk.sms.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.sms.constant.SmsProviderEnum; -import com.newyetai.sdk.sms.dto.ISendDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.sms.constant.SmsProviderEnum; +import com.senmesh.sdk.sms.dto.ISendDTO; /** * 短信服务提供者 diff --git a/src/main/java/com/newyetai/sdk/sms/service/SdkSmsService.java b/src/main/java/com/senmesh/sdk/sms/service/SdkSmsService.java similarity index 95% rename from src/main/java/com/newyetai/sdk/sms/service/SdkSmsService.java rename to src/main/java/com/senmesh/sdk/sms/service/SdkSmsService.java index 2583479..006ae80 100644 --- a/src/main/java/com/newyetai/sdk/sms/service/SdkSmsService.java +++ b/src/main/java/com/senmesh/sdk/sms/service/SdkSmsService.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.sms.service; +package com.senmesh.sdk.sms.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.sms.dto.ISendDTO; -import com.newyetai.sdk.sms.dto.ITemplateCode; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.sms.dto.ISendDTO; +import com.senmesh.sdk.sms.dto.ITemplateCode; import java.util.Map; diff --git a/src/main/java/com/newyetai/sdk/sms/service/impl/SdkSmsServiceImpl.java b/src/main/java/com/senmesh/sdk/sms/service/impl/SdkSmsServiceImpl.java similarity index 87% rename from src/main/java/com/newyetai/sdk/sms/service/impl/SdkSmsServiceImpl.java rename to src/main/java/com/senmesh/sdk/sms/service/impl/SdkSmsServiceImpl.java index 19675d8..c253757 100644 --- a/src/main/java/com/newyetai/sdk/sms/service/impl/SdkSmsServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/sms/service/impl/SdkSmsServiceImpl.java @@ -1,13 +1,13 @@ -package com.newyetai.sdk.sms.service.impl; +package com.senmesh.sdk.sms.service.impl; import com.google.common.collect.Maps; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.sdk.sms.config.SmsConfig; -import com.newyetai.sdk.sms.constant.SmsProviderEnum; -import com.newyetai.sdk.sms.dto.*; -import com.newyetai.sdk.sms.service.SdkSmsProvider; -import com.newyetai.sdk.sms.service.SdkSmsService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.sdk.sms.config.SmsConfig; +import com.senmesh.sdk.sms.constant.SmsProviderEnum; +import com.senmesh.sdk.sms.dto.*; +import com.senmesh.sdk.sms.service.SdkSmsProvider; +import com.senmesh.sdk.sms.service.SdkSmsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/sdk/sms/service/provider/AliyunSmsInvoker.java b/src/main/java/com/senmesh/sdk/sms/service/provider/AliyunSmsInvoker.java similarity index 84% rename from src/main/java/com/newyetai/sdk/sms/service/provider/AliyunSmsInvoker.java rename to src/main/java/com/senmesh/sdk/sms/service/provider/AliyunSmsInvoker.java index 9f13acd..e3039a4 100644 --- a/src/main/java/com/newyetai/sdk/sms/service/provider/AliyunSmsInvoker.java +++ b/src/main/java/com/senmesh/sdk/sms/service/provider/AliyunSmsInvoker.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.sms.service.provider; +package com.senmesh.sdk.sms.service.provider; import java.util.Map; @@ -11,12 +11,12 @@ import com.aliyuncs.CommonResponse; import com.aliyuncs.IAcsClient; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.http.MethodType; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.annotation.CheckAndMock; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.sms.config.SmsConfig; -import com.newyetai.sdk.sms.constant.AliSmsActionEnum; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.annotation.CheckAndMock; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.sms.config.SmsConfig; +import com.senmesh.sdk.sms.constant.AliSmsActionEnum; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/sms/service/provider/AliyunSmsProvider.java b/src/main/java/com/senmesh/sdk/sms/service/provider/AliyunSmsProvider.java similarity index 77% rename from src/main/java/com/newyetai/sdk/sms/service/provider/AliyunSmsProvider.java rename to src/main/java/com/senmesh/sdk/sms/service/provider/AliyunSmsProvider.java index e62a815..0f97bf0 100644 --- a/src/main/java/com/newyetai/sdk/sms/service/provider/AliyunSmsProvider.java +++ b/src/main/java/com/senmesh/sdk/sms/service/provider/AliyunSmsProvider.java @@ -1,19 +1,18 @@ -package com.newyetai.sdk.sms.service.provider; +package com.senmesh.sdk.sms.service.provider; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.sms.config.SmsConfig; -import com.newyetai.sdk.sms.constant.AliSmsActionEnum; -import com.newyetai.sdk.sms.constant.SmsConstants; -import com.newyetai.sdk.sms.constant.SmsProviderEnum; -import com.newyetai.sdk.sms.dto.ISendDTO; -import com.newyetai.sdk.sms.model.SendSms; -import com.newyetai.sdk.sms.model.SendSmsResponse; -import com.newyetai.sdk.sms.service.SdkSmsProvider; -import com.newyetai.sdk.sms.util.SmsUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.sms.config.SmsConfig; +import com.senmesh.sdk.sms.constant.AliSmsActionEnum; +import com.senmesh.sdk.sms.constant.SmsConstants; +import com.senmesh.sdk.sms.constant.SmsProviderEnum; +import com.senmesh.sdk.sms.dto.ISendDTO; +import com.senmesh.sdk.sms.model.SendSms; +import com.senmesh.sdk.sms.model.SendSmsResponse; +import com.senmesh.sdk.sms.service.SdkSmsProvider; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/sdk/sms/service/provider/MockAliyunSmsInvoker.java b/src/main/java/com/senmesh/sdk/sms/service/provider/MockAliyunSmsInvoker.java similarity index 69% rename from src/main/java/com/newyetai/sdk/sms/service/provider/MockAliyunSmsInvoker.java rename to src/main/java/com/senmesh/sdk/sms/service/provider/MockAliyunSmsInvoker.java index e5a72de..811d8cf 100644 --- a/src/main/java/com/newyetai/sdk/sms/service/provider/MockAliyunSmsInvoker.java +++ b/src/main/java/com/senmesh/sdk/sms/service/provider/MockAliyunSmsInvoker.java @@ -1,12 +1,12 @@ -package com.newyetai.sdk.sms.service.provider; +package com.senmesh.sdk.sms.service.provider; import org.springframework.stereotype.Service; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.sms.config.SmsConfig; -import com.newyetai.sdk.sms.constant.AliSmsActionEnum; -import com.newyetai.sdk.sms.constant.SmsConstants; -import com.newyetai.sdk.sms.model.SendSmsResponse; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.sms.config.SmsConfig; +import com.senmesh.sdk.sms.constant.AliSmsActionEnum; +import com.senmesh.sdk.sms.constant.SmsConstants; +import com.senmesh.sdk.sms.model.SendSmsResponse; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/sms/util/SmsUtils.java b/src/main/java/com/senmesh/sdk/sms/util/SmsUtils.java similarity index 81% rename from src/main/java/com/newyetai/sdk/sms/util/SmsUtils.java rename to src/main/java/com/senmesh/sdk/sms/util/SmsUtils.java index e2f572f..6547a31 100644 --- a/src/main/java/com/newyetai/sdk/sms/util/SmsUtils.java +++ b/src/main/java/com/senmesh/sdk/sms/util/SmsUtils.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.sms.util; +package com.senmesh.sdk.sms.util; import org.springframework.stereotype.Component; -import com.newyetai.sdk.sms.service.SdkSmsService; +import com.senmesh.sdk.sms.service.SdkSmsService; /** * sms工具类 diff --git a/src/main/java/com/newyetai/sdk/ssb/SsbProperties.java b/src/main/java/com/senmesh/sdk/ssb/SsbProperties.java similarity index 92% rename from src/main/java/com/newyetai/sdk/ssb/SsbProperties.java rename to src/main/java/com/senmesh/sdk/ssb/SsbProperties.java index 9ebac56..ea9af6c 100644 --- a/src/main/java/com/newyetai/sdk/ssb/SsbProperties.java +++ b/src/main/java/com/senmesh/sdk/ssb/SsbProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb; +package com.senmesh.sdk.ssb; import lombok.Data; import lombok.NoArgsConstructor; @@ -8,9 +8,9 @@ import java.security.NoSuchAlgorithmException; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.sdk.ssb.util.AESEncryption; -import com.newyetai.sdk.ssb.util.SsbRsaUtils; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.sdk.ssb.util.AESEncryption; +import com.senmesh.sdk.ssb.util.SsbRsaUtils; /** * 随申办配置 diff --git a/src/main/java/com/newyetai/sdk/ssb/constant/SsbConstants.java b/src/main/java/com/senmesh/sdk/ssb/constant/SsbConstants.java similarity index 80% rename from src/main/java/com/newyetai/sdk/ssb/constant/SsbConstants.java rename to src/main/java/com/senmesh/sdk/ssb/constant/SsbConstants.java index 9fc0a30..4542f34 100644 --- a/src/main/java/com/newyetai/sdk/ssb/constant/SsbConstants.java +++ b/src/main/java/com/senmesh/sdk/ssb/constant/SsbConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.constant; +package com.senmesh.sdk.ssb.constant; public interface SsbConstants { diff --git a/src/main/java/com/newyetai/sdk/ssb/constant/SsbPlatformEnum.java b/src/main/java/com/senmesh/sdk/ssb/constant/SsbPlatformEnum.java similarity index 91% rename from src/main/java/com/newyetai/sdk/ssb/constant/SsbPlatformEnum.java rename to src/main/java/com/senmesh/sdk/ssb/constant/SsbPlatformEnum.java index a0e4677..34cdc65 100644 --- a/src/main/java/com/newyetai/sdk/ssb/constant/SsbPlatformEnum.java +++ b/src/main/java/com/senmesh/sdk/ssb/constant/SsbPlatformEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.constant; +package com.senmesh.sdk.ssb.constant; public enum SsbPlatformEnum{ /** 随申办APP **/ diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppAccessTokenDTO.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppAccessTokenDTO.java similarity index 96% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbAppAccessTokenDTO.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbAppAccessTokenDTO.java index 42509b8..fe454b4 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppAccessTokenDTO.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppAccessTokenDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppAccessTokenReq.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppAccessTokenReq.java similarity index 87% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbAppAccessTokenReq.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbAppAccessTokenReq.java index ce4dca2..751f3d7 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppAccessTokenReq.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppAccessTokenReq.java @@ -1,7 +1,6 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.common.dto.ISdkRequest; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppReq.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppReq.java similarity index 84% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbAppReq.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbAppReq.java index c372c56..b74ef79 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppReq.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppReq.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppRes.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppRes.java similarity index 92% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbAppRes.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbAppRes.java index 9bed3fa..8e4cf4f 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppRes.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppUserInfoDTO.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppUserInfoDTO.java similarity index 96% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbAppUserInfoDTO.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbAppUserInfoDTO.java index f8b589b..b52240a 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppUserInfoDTO.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppUserInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppUserInfoReq.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppUserInfoReq.java similarity index 88% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbAppUserInfoReq.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbAppUserInfoReq.java index 2f4aae1..f66f229 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbAppUserInfoReq.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbAppUserInfoReq.java @@ -1,7 +1,6 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.common.dto.ISdkRequest; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbRes.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbRes.java similarity index 94% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbRes.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbRes.java index 1aa192f..fbd9e42 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbRes.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbUserDTO.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbUserDTO.java similarity index 98% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbUserDTO.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbUserDTO.java index e6b480e..f3399b8 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbUserDTO.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbUserDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbUserDataDTO.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbUserDataDTO.java similarity index 91% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbUserDataDTO.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbUserDataDTO.java index f05c1c0..6265da5 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbUserDataDTO.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbUserDataDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/ssb/dto/SsbUserReq.java b/src/main/java/com/senmesh/sdk/ssb/dto/SsbUserReq.java similarity index 93% rename from src/main/java/com/newyetai/sdk/ssb/dto/SsbUserReq.java rename to src/main/java/com/senmesh/sdk/ssb/dto/SsbUserReq.java index bcf97d8..39f0833 100644 --- a/src/main/java/com/newyetai/sdk/ssb/dto/SsbUserReq.java +++ b/src/main/java/com/senmesh/sdk/ssb/dto/SsbUserReq.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.dto; +package com.senmesh.sdk.ssb.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/ssb/service/SsbInvoker.java b/src/main/java/com/senmesh/sdk/ssb/service/SsbInvoker.java similarity index 85% rename from src/main/java/com/newyetai/sdk/ssb/service/SsbInvoker.java rename to src/main/java/com/senmesh/sdk/ssb/service/SsbInvoker.java index 7cdc156..4adfe20 100644 --- a/src/main/java/com/newyetai/sdk/ssb/service/SsbInvoker.java +++ b/src/main/java/com/senmesh/sdk/ssb/service/SsbInvoker.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.service; +package com.senmesh.sdk.ssb.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; @@ -7,25 +7,25 @@ import org.springframework.http.MediaType; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.ssb.SsbProperties; -import com.newyetai.sdk.ssb.constant.SsbConstants; -import com.newyetai.sdk.ssb.dto.SsbAppAccessTokenDTO; -import com.newyetai.sdk.ssb.dto.SsbAppAccessTokenReq; -import com.newyetai.sdk.ssb.dto.SsbAppRes; -import com.newyetai.sdk.ssb.dto.SsbAppUserInfoDTO; -import com.newyetai.sdk.ssb.dto.SsbAppUserInfoReq; -import com.newyetai.sdk.ssb.dto.SsbRes; -import com.newyetai.sdk.ssb.dto.SsbUserDataDTO; -import com.newyetai.sdk.ssb.dto.SsbUserReq; -import com.newyetai.sdk.ssb.util.SM2Utils; -import com.newyetai.sdk.ssb.util.SsbRsaUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.dto.DefaultSdkInvokeLogDTO; +import com.senmesh.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.ssb.SsbProperties; +import com.senmesh.sdk.ssb.constant.SsbConstants; +import com.senmesh.sdk.ssb.dto.SsbAppAccessTokenDTO; +import com.senmesh.sdk.ssb.dto.SsbAppAccessTokenReq; +import com.senmesh.sdk.ssb.dto.SsbAppRes; +import com.senmesh.sdk.ssb.dto.SsbAppUserInfoDTO; +import com.senmesh.sdk.ssb.dto.SsbAppUserInfoReq; +import com.senmesh.sdk.ssb.dto.SsbRes; +import com.senmesh.sdk.ssb.dto.SsbUserDataDTO; +import com.senmesh.sdk.ssb.dto.SsbUserReq; +import com.senmesh.sdk.ssb.util.SM2Utils; +import com.senmesh.sdk.ssb.util.SsbRsaUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/ssb/util/AESEncryption.java b/src/main/java/com/senmesh/sdk/ssb/util/AESEncryption.java similarity index 81% rename from src/main/java/com/newyetai/sdk/ssb/util/AESEncryption.java rename to src/main/java/com/senmesh/sdk/ssb/util/AESEncryption.java index d030e51..cd4f3f9 100644 --- a/src/main/java/com/newyetai/sdk/ssb/util/AESEncryption.java +++ b/src/main/java/com/senmesh/sdk/ssb/util/AESEncryption.java @@ -1,19 +1,11 @@ -package com.newyetai.sdk.ssb.util; +package com.senmesh.sdk.ssb.util; -import javax.crypto.BadPaddingException; import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.nio.charset.StandardCharsets; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.KeyFactory; import java.security.NoSuchAlgorithmException; -import java.security.PublicKey; -import java.security.spec.X509EncodedKeySpec; import java.util.Base64; diff --git a/src/main/java/com/newyetai/sdk/ssb/util/Cipher.java b/src/main/java/com/senmesh/sdk/ssb/util/Cipher.java similarity index 98% rename from src/main/java/com/newyetai/sdk/ssb/util/Cipher.java rename to src/main/java/com/senmesh/sdk/ssb/util/Cipher.java index ded9724..06b109d 100644 --- a/src/main/java/com/newyetai/sdk/ssb/util/Cipher.java +++ b/src/main/java/com/senmesh/sdk/ssb/util/Cipher.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.util; +package com.senmesh.sdk.ssb.util; import java.math.BigInteger; import org.bouncycastle.crypto.AsymmetricCipherKeyPair; diff --git a/src/main/java/com/newyetai/sdk/ssb/util/SM2.java b/src/main/java/com/senmesh/sdk/ssb/util/SM2.java similarity index 99% rename from src/main/java/com/newyetai/sdk/ssb/util/SM2.java rename to src/main/java/com/senmesh/sdk/ssb/util/SM2.java index 362dbf2..e140569 100644 --- a/src/main/java/com/newyetai/sdk/ssb/util/SM2.java +++ b/src/main/java/com/senmesh/sdk/ssb/util/SM2.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.util; +package com.senmesh.sdk.ssb.util; import java.math.BigInteger; import java.security.SecureRandom; diff --git a/src/main/java/com/newyetai/sdk/ssb/util/SM2Result.java b/src/main/java/com/senmesh/sdk/ssb/util/SM2Result.java similarity index 90% rename from src/main/java/com/newyetai/sdk/ssb/util/SM2Result.java rename to src/main/java/com/senmesh/sdk/ssb/util/SM2Result.java index 0d55510..f9f8193 100644 --- a/src/main/java/com/newyetai/sdk/ssb/util/SM2Result.java +++ b/src/main/java/com/senmesh/sdk/ssb/util/SM2Result.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.util; +package com.senmesh.sdk.ssb.util; import java.math.BigInteger; import org.bouncycastle.math.ec.ECPoint; diff --git a/src/main/java/com/newyetai/sdk/ssb/util/SM2Utils.java b/src/main/java/com/senmesh/sdk/ssb/util/SM2Utils.java similarity index 99% rename from src/main/java/com/newyetai/sdk/ssb/util/SM2Utils.java rename to src/main/java/com/senmesh/sdk/ssb/util/SM2Utils.java index 351572d..04b829f 100644 --- a/src/main/java/com/newyetai/sdk/ssb/util/SM2Utils.java +++ b/src/main/java/com/senmesh/sdk/ssb/util/SM2Utils.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.util; +package com.senmesh.sdk.ssb.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/com/newyetai/sdk/ssb/util/SsbRsaUtils.java b/src/main/java/com/senmesh/sdk/ssb/util/SsbRsaUtils.java similarity index 97% rename from src/main/java/com/newyetai/sdk/ssb/util/SsbRsaUtils.java rename to src/main/java/com/senmesh/sdk/ssb/util/SsbRsaUtils.java index a5c746f..72c61d3 100644 --- a/src/main/java/com/newyetai/sdk/ssb/util/SsbRsaUtils.java +++ b/src/main/java/com/senmesh/sdk/ssb/util/SsbRsaUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.util; +package com.senmesh.sdk.ssb.util; import org.apache.commons.codec.binary.Base64; diff --git a/src/main/java/com/newyetai/sdk/ssb/util/Util.java b/src/main/java/com/senmesh/sdk/ssb/util/Util.java similarity index 99% rename from src/main/java/com/newyetai/sdk/ssb/util/Util.java rename to src/main/java/com/senmesh/sdk/ssb/util/Util.java index 64e6b7a..affc3be 100644 --- a/src/main/java/com/newyetai/sdk/ssb/util/Util.java +++ b/src/main/java/com/senmesh/sdk/ssb/util/Util.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.ssb.util; +package com.senmesh.sdk.ssb.util; import java.math.BigInteger; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/IRequestPostProcess.java b/src/main/java/com/senmesh/sdk/tencent/map/IRequestPostProcess.java similarity index 82% rename from src/main/java/com/newyetai/sdk/tencent/map/IRequestPostProcess.java rename to src/main/java/com/senmesh/sdk/tencent/map/IRequestPostProcess.java index 8e43456..2f922f4 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/IRequestPostProcess.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/IRequestPostProcess.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map; +package com.senmesh.sdk.tencent.map; /** * 请求发布过程 diff --git a/src/main/java/com/newyetai/sdk/tencent/map/TencentMapContext.java b/src/main/java/com/senmesh/sdk/tencent/map/TencentMapContext.java similarity index 89% rename from src/main/java/com/newyetai/sdk/tencent/map/TencentMapContext.java rename to src/main/java/com/senmesh/sdk/tencent/map/TencentMapContext.java index d36bb68..379a562 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/TencentMapContext.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/TencentMapContext.java @@ -1,20 +1,20 @@ -package com.newyetai.sdk.tencent.map; +package com.senmesh.sdk.tencent.map; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.util.HttpUtils; -import com.newyetai.sdk.tencent.map.config.TencentMapProperties; -import com.newyetai.sdk.tencent.map.dto.TencentMapBaseResDTO; -import com.newyetai.sdk.tencent.map.dto.TencentMapGcoderReqDTO; -import com.newyetai.sdk.tencent.map.dto.TencentMapGeocoderReqDTO; -import com.newyetai.sdk.tencent.map.dto.TencentMapGeocoderResDTO; -import com.newyetai.sdk.tencent.map.dto.TencentMapLocationV1IpResDTO; -import com.newyetai.sdk.tencent.map.dto.TencentMapPlaceSearchReqDTO; -import com.newyetai.sdk.tencent.map.dto.TencentMapPlaceSearchResDTO; -import com.newyetai.sdk.tencent.map.dto.TencentMapWsDistanceV1MatrixReqDTO; -import com.newyetai.sdk.tencent.map.dto.TencentMapWsLocationV1IpReqDTO; -import com.newyetai.sdk.tencent.map.dto.TencentWsDistanceV1MatrixResDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.dto.DefaultSdkInvokeLogDTO; +import com.senmesh.sdk.common.util.HttpUtils; +import com.senmesh.sdk.tencent.map.config.TencentMapProperties; +import com.senmesh.sdk.tencent.map.dto.TencentMapBaseResDTO; +import com.senmesh.sdk.tencent.map.dto.TencentMapGcoderReqDTO; +import com.senmesh.sdk.tencent.map.dto.TencentMapGeocoderReqDTO; +import com.senmesh.sdk.tencent.map.dto.TencentMapGeocoderResDTO; +import com.senmesh.sdk.tencent.map.dto.TencentMapLocationV1IpResDTO; +import com.senmesh.sdk.tencent.map.dto.TencentMapPlaceSearchReqDTO; +import com.senmesh.sdk.tencent.map.dto.TencentMapPlaceSearchResDTO; +import com.senmesh.sdk.tencent.map.dto.TencentMapWsDistanceV1MatrixReqDTO; +import com.senmesh.sdk.tencent.map.dto.TencentMapWsLocationV1IpReqDTO; +import com.senmesh.sdk.tencent.map.dto.TencentWsDistanceV1MatrixResDTO; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/config/TencentMapProperties.java b/src/main/java/com/senmesh/sdk/tencent/map/config/TencentMapProperties.java similarity index 92% rename from src/main/java/com/newyetai/sdk/tencent/map/config/TencentMapProperties.java rename to src/main/java/com/senmesh/sdk/tencent/map/config/TencentMapProperties.java index 870c23c..4cd7f4c 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/config/TencentMapProperties.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/config/TencentMapProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.config; +package com.senmesh.sdk.tencent.map.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapBaseReqDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapBaseReqDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapBaseReqDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapBaseReqDTO.java index 92e57d7..fd01770 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapBaseReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapBaseReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import java.io.Serializable; import javax.validation.constraints.NotEmpty; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapBaseResDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapBaseResDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapBaseResDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapBaseResDTO.java index 52b9859..9c2d90e 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapBaseResDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapBaseResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGcoderReqDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGcoderReqDTO.java similarity index 97% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGcoderReqDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGcoderReqDTO.java index 07ac399..1ab1c5b 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGcoderReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGcoderReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import javax.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGeocoderReqDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGeocoderReqDTO.java similarity index 91% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGeocoderReqDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGeocoderReqDTO.java index 0f703d1..6923a5c 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGeocoderReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGeocoderReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import java.net.URLEncoder; import javax.validation.constraints.NotEmpty; @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.StringUtils; -import com.newyetai.sdk.tencent.map.IRequestPostProcess; +import com.senmesh.sdk.tencent.map.IRequestPostProcess; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGeocoderResDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGeocoderResDTO.java similarity index 96% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGeocoderResDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGeocoderResDTO.java index 0062424..e0d0612 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapGeocoderResDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapGeocoderResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import java.io.Serializable; import java.math.BigDecimal; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapLocationV1IpResDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapLocationV1IpResDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapLocationV1IpResDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapLocationV1IpResDTO.java index 2ed314f..e0bf52f 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapLocationV1IpResDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapLocationV1IpResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import java.io.Serializable; import java.math.BigDecimal; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapPlaceSearchReqDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapPlaceSearchReqDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapPlaceSearchReqDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapPlaceSearchReqDTO.java index 0c05609..4e1a76b 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapPlaceSearchReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapPlaceSearchReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapPlaceSearchResDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapPlaceSearchResDTO.java similarity index 87% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapPlaceSearchResDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapPlaceSearchResDTO.java index b6fd3b9..4f2245f 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapPlaceSearchResDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapPlaceSearchResDTO.java @@ -1,6 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; - -import org.apache.poi.ss.formula.functions.T; +package com.senmesh.sdk.tencent.map.dto; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapWsDistanceV1MatrixReqDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapWsDistanceV1MatrixReqDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapWsDistanceV1MatrixReqDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapWsDistanceV1MatrixReqDTO.java index 3f0fe29..83991fd 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapWsDistanceV1MatrixReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapWsDistanceV1MatrixReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapWsLocationV1IpReqDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapWsLocationV1IpReqDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapWsLocationV1IpReqDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapWsLocationV1IpReqDTO.java index 2f423ee..0a72865 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentMapWsLocationV1IpReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentMapWsLocationV1IpReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsResDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsResDTO.java similarity index 91% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsResDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsResDTO.java index 186a351..41353b4 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsResDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsRowResDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsRowResDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsRowResDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsRowResDTO.java index c2c813f..9b53902 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsRowResDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixElementsRowResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixResDTO.java b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixResDTO.java similarity index 87% rename from src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixResDTO.java rename to src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixResDTO.java index 088e93e..0647dc9 100644 --- a/src/main/java/com/newyetai/sdk/tencent/map/dto/TencentWsDistanceV1MatrixResDTO.java +++ b/src/main/java/com/senmesh/sdk/tencent/map/dto/TencentWsDistanceV1MatrixResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tencent.map.dto; +package com.senmesh.sdk.tencent.map.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/tonglian/adapter/TongLianAdapter.java b/src/main/java/com/senmesh/sdk/tonglian/adapter/TongLianAdapter.java similarity index 93% rename from src/main/java/com/newyetai/sdk/tonglian/adapter/TongLianAdapter.java rename to src/main/java/com/senmesh/sdk/tonglian/adapter/TongLianAdapter.java index baef1b0..3cfef7d 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/adapter/TongLianAdapter.java +++ b/src/main/java/com/senmesh/sdk/tonglian/adapter/TongLianAdapter.java @@ -1,14 +1,14 @@ -package com.newyetai.sdk.tonglian.adapter; +package com.senmesh.sdk.tonglian.adapter; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.ParameterizedTypeImpl; -import com.newyetai.sdk.tonglian.config.TokenProvider; -import com.newyetai.sdk.tonglian.config.TongLianProperties; -import com.newyetai.sdk.tonglian.dto.check.RequestCheck; -import com.newyetai.sdk.tonglian.dto.common.BaseReqDTO; -import com.newyetai.sdk.tonglian.dto.common.TongLianBaseReqDTO; -import com.newyetai.sdk.tonglian.dto.common.TongLianBaseResDTO; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.ParameterizedTypeImpl; +import com.senmesh.sdk.tonglian.config.TokenProvider; +import com.senmesh.sdk.tonglian.config.TongLianProperties; +import com.senmesh.sdk.tonglian.dto.check.RequestCheck; +import com.senmesh.sdk.tonglian.dto.common.BaseReqDTO; +import com.senmesh.sdk.tonglian.dto.common.TongLianBaseReqDTO; +import com.senmesh.sdk.tonglian.dto.common.TongLianBaseResDTO; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.security.KeyFactory; diff --git a/src/main/java/com/newyetai/sdk/tonglian/config/StandardTokenProvider.java b/src/main/java/com/senmesh/sdk/tonglian/config/StandardTokenProvider.java similarity index 82% rename from src/main/java/com/newyetai/sdk/tonglian/config/StandardTokenProvider.java rename to src/main/java/com/senmesh/sdk/tonglian/config/StandardTokenProvider.java index a239869..4d212f8 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/config/StandardTokenProvider.java +++ b/src/main/java/com/senmesh/sdk/tonglian/config/StandardTokenProvider.java @@ -1,15 +1,15 @@ -package com.newyetai.sdk.tonglian.config; +package com.senmesh.sdk.tonglian.config; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.frame.redis.util.RedisUtils; -import com.newyetai.sdk.tonglian.adapter.TongLianAdapter; -import com.newyetai.sdk.tonglian.dto.GetTokenReqDTO; -import com.newyetai.sdk.tonglian.dto.GetTokenResDTO; -import com.newyetai.sdk.tonglian.dto.common.BaseReqDTO; -import com.newyetai.sdk.tonglian.dto.common.TongLianBaseResDTO; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.frame.redis.util.RedisUtils; +import com.senmesh.sdk.tonglian.adapter.TongLianAdapter; +import com.senmesh.sdk.tonglian.dto.GetTokenReqDTO; +import com.senmesh.sdk.tonglian.dto.GetTokenResDTO; +import com.senmesh.sdk.tonglian.dto.common.BaseReqDTO; +import com.senmesh.sdk.tonglian.dto.common.TongLianBaseResDTO; import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/sdk/tonglian/config/TokenProvider.java b/src/main/java/com/senmesh/sdk/tonglian/config/TokenProvider.java similarity index 69% rename from src/main/java/com/newyetai/sdk/tonglian/config/TokenProvider.java rename to src/main/java/com/senmesh/sdk/tonglian/config/TokenProvider.java index 252c8c5..ebfd972 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/config/TokenProvider.java +++ b/src/main/java/com/senmesh/sdk/tonglian/config/TokenProvider.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.tonglian.config; +package com.senmesh.sdk.tonglian.config; -import com.newyetai.sdk.tonglian.dto.common.BaseReqDTO; +import com.senmesh.sdk.tonglian.dto.common.BaseReqDTO; public interface TokenProvider { diff --git a/src/main/java/com/newyetai/sdk/tonglian/config/TongLianConfig.java b/src/main/java/com/senmesh/sdk/tonglian/config/TongLianConfig.java similarity index 87% rename from src/main/java/com/newyetai/sdk/tonglian/config/TongLianConfig.java rename to src/main/java/com/senmesh/sdk/tonglian/config/TongLianConfig.java index cc6b015..d685bec 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/config/TongLianConfig.java +++ b/src/main/java/com/senmesh/sdk/tonglian/config/TongLianConfig.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.tonglian.config; +package com.senmesh.sdk.tonglian.config; -import com.newyetai.sdk.tonglian.adapter.TongLianAdapter; +import com.senmesh.sdk.tonglian.adapter.TongLianAdapter; import lombok.Data; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Lazy; @Configuration @EnableConfigurationProperties(TongLianProperties.class) @ConditionalOnProperty(name = TongLianConfig.TONGLIAN_ENABLE, havingValue = "true") -@ComponentScan(basePackages = {"com.newyetai.sdk.tonglian"}) +@ComponentScan(basePackages = {"com.senmesh.sdk.tonglian"}) public class TongLianConfig { static final String TONGLIAN_ENABLE = "tong.lian.enable"; diff --git a/src/main/java/com/newyetai/sdk/tonglian/config/TongLianProperties.java b/src/main/java/com/senmesh/sdk/tonglian/config/TongLianProperties.java similarity index 95% rename from src/main/java/com/newyetai/sdk/tonglian/config/TongLianProperties.java rename to src/main/java/com/senmesh/sdk/tonglian/config/TongLianProperties.java index a0c53b5..2f10a52 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/config/TongLianProperties.java +++ b/src/main/java/com/senmesh/sdk/tonglian/config/TongLianProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.config; +package com.senmesh.sdk.tonglian.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/newyetai/sdk/tonglian/constants/TongLianConstants.java b/src/main/java/com/senmesh/sdk/tonglian/constants/TongLianConstants.java similarity index 82% rename from src/main/java/com/newyetai/sdk/tonglian/constants/TongLianConstants.java rename to src/main/java/com/senmesh/sdk/tonglian/constants/TongLianConstants.java index 70adf94..0a7f911 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/constants/TongLianConstants.java +++ b/src/main/java/com/senmesh/sdk/tonglian/constants/TongLianConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.constants; +package com.senmesh.sdk.tonglian.constants; /** * 通连常量 diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/GetTokenReqDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/GetTokenReqDTO.java similarity index 89% rename from src/main/java/com/newyetai/sdk/tonglian/dto/GetTokenReqDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/GetTokenReqDTO.java index f6dc2ed..4f58059 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/GetTokenReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/GetTokenReqDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.tonglian.dto; +package com.senmesh.sdk.tonglian.dto; import com.google.common.collect.Maps; -import com.newyetai.sdk.tonglian.dto.common.BaseReqDTO; +import com.senmesh.sdk.tonglian.dto.common.BaseReqDTO; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/GetTokenResDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/GetTokenResDTO.java similarity index 89% rename from src/main/java/com/newyetai/sdk/tonglian/dto/GetTokenResDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/GetTokenResDTO.java index 7ee7ee5..2bc93f2 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/GetTokenResDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/GetTokenResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.dto; +package com.senmesh.sdk.tonglian.dto; import java.io.Serializable; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletDTO.java similarity index 89% rename from src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletDTO.java index 3b4a2ac..1c5776b 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletDTO.java @@ -1,9 +1,4 @@ -package com.newyetai.sdk.tonglian.dto; - -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.util.AESUtils; - -import org.apache.commons.lang3.StringUtils; +package com.senmesh.sdk.tonglian.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletReqDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletReqDTO.java similarity index 90% rename from src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletReqDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletReqDTO.java index fda1587..48d1e7e 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletReqDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.tonglian.dto; +package com.senmesh.sdk.tonglian.dto; import com.google.common.collect.Maps; -import com.newyetai.sdk.tonglian.dto.check.RequestCheck; -import com.newyetai.sdk.tonglian.dto.common.BasePageReqDTO; +import com.senmesh.sdk.tonglian.dto.check.RequestCheck; +import com.senmesh.sdk.tonglian.dto.common.BasePageReqDTO; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletResDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletResDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletResDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletResDTO.java index 1ed8836..2eba55b 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/SynWalletResDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/SynWalletResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.dto; +package com.senmesh.sdk.tonglian.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/SysUserContractDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/SysUserContractDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/tonglian/dto/SysUserContractDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/SysUserContractDTO.java index e55e304..1f6f8a2 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/SysUserContractDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/SysUserContractDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.dto; +package com.senmesh.sdk.tonglian.dto; import java.io.Serializable; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/SysUserDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/SysUserDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/tonglian/dto/SysUserDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/SysUserDTO.java index 2415416..425f9d6 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/SysUserDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/SysUserDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.dto; +package com.senmesh.sdk.tonglian.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/SysUserReqDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/SysUserReqDTO.java similarity index 90% rename from src/main/java/com/newyetai/sdk/tonglian/dto/SysUserReqDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/SysUserReqDTO.java index ab542ca..09fc09c 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/SysUserReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/SysUserReqDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.tonglian.dto; +package com.senmesh.sdk.tonglian.dto; import com.google.common.collect.Maps; -import com.newyetai.sdk.tonglian.dto.check.RequestCheck; -import com.newyetai.sdk.tonglian.dto.common.BasePageReqDTO; +import com.senmesh.sdk.tonglian.dto.check.RequestCheck; +import com.senmesh.sdk.tonglian.dto.common.BasePageReqDTO; import java.util.Map; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/SysUserResDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/SysUserResDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/tonglian/dto/SysUserResDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/SysUserResDTO.java index abd07ed..2683229 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/SysUserResDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/SysUserResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.dto; +package com.senmesh.sdk.tonglian.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/check/RequestCheck.java b/src/main/java/com/senmesh/sdk/tonglian/dto/check/RequestCheck.java similarity index 78% rename from src/main/java/com/newyetai/sdk/tonglian/dto/check/RequestCheck.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/check/RequestCheck.java index ef930ac..3a67531 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/check/RequestCheck.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/check/RequestCheck.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.dto.check; +package com.senmesh.sdk.tonglian.dto.check; public interface RequestCheck { diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/common/BasePageReqDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/common/BasePageReqDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/tonglian/dto/common/BasePageReqDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/common/BasePageReqDTO.java index ab16ed9..be13272 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/common/BasePageReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/common/BasePageReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.dto.common; +package com.senmesh.sdk.tonglian.dto.common; import java.util.Objects; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/common/BaseReqDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/common/BaseReqDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/tonglian/dto/common/BaseReqDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/common/BaseReqDTO.java index de1bd03..0a947db 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/common/BaseReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/common/BaseReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.tonglian.dto.common; +package com.senmesh.sdk.tonglian.dto.common; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/common/TongLianBaseReqDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/common/TongLianBaseReqDTO.java similarity index 95% rename from src/main/java/com/newyetai/sdk/tonglian/dto/common/TongLianBaseReqDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/common/TongLianBaseReqDTO.java index aefd8bd..2744e80 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/common/TongLianBaseReqDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/common/TongLianBaseReqDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.tonglian.dto.common; +package com.senmesh.sdk.tonglian.dto.common; import com.google.common.collect.Maps; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.util.JsonUtils; import java.io.Serializable; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/com/newyetai/sdk/tonglian/dto/common/TongLianBaseResDTO.java b/src/main/java/com/senmesh/sdk/tonglian/dto/common/TongLianBaseResDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/tonglian/dto/common/TongLianBaseResDTO.java rename to src/main/java/com/senmesh/sdk/tonglian/dto/common/TongLianBaseResDTO.java index 841cb5f..7609baa 100644 --- a/src/main/java/com/newyetai/sdk/tonglian/dto/common/TongLianBaseResDTO.java +++ b/src/main/java/com/senmesh/sdk/tonglian/dto/common/TongLianBaseResDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.tonglian.dto.common; +package com.senmesh.sdk.tonglian.dto.common; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.tonglian.constants.TongLianConstants; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.tonglian.constants.TongLianConstants; import java.io.Serializable; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/sdk/wechat/WechatClient.java b/src/main/java/com/senmesh/sdk/wechat/WechatClient.java similarity index 75% rename from src/main/java/com/newyetai/sdk/wechat/WechatClient.java rename to src/main/java/com/senmesh/sdk/wechat/WechatClient.java index b0b0040..da2194c 100644 --- a/src/main/java/com/newyetai/sdk/wechat/WechatClient.java +++ b/src/main/java/com/senmesh/sdk/wechat/WechatClient.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat; +package com.senmesh.sdk.wechat; import java.io.Serializable; import java.util.ArrayList; @@ -15,39 +15,39 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import org.springframework.web.client.RestTemplate; import com.google.common.collect.Lists; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.convert.WechatAppletWXACodeHttpMessageConverter; -import com.newyetai.sdk.wechat.model.AccessTokenDTO; -import com.newyetai.sdk.wechat.model.AccessTokenReq; -import com.newyetai.sdk.wechat.model.BaseWeChatDTO; -import com.newyetai.sdk.wechat.model.BatchUnionDTO; -import com.newyetai.sdk.wechat.model.BatchUnionReq; -import com.newyetai.sdk.wechat.model.BufferDTO; -import com.newyetai.sdk.wechat.model.Code2SessionDTO; -import com.newyetai.sdk.wechat.model.Code2SessionReq; -import com.newyetai.sdk.wechat.model.FullUserInfoDTO; -import com.newyetai.sdk.wechat.model.JsApiTicketDTO; -import com.newyetai.sdk.wechat.model.JsApiTicketReq; -import com.newyetai.sdk.wechat.model.PhoneNumberDTO; -import com.newyetai.sdk.wechat.model.PhoneNumberReq; -import com.newyetai.sdk.wechat.model.SubscibeMessageReq; -import com.newyetai.sdk.wechat.model.TemplateMessageReq; -import com.newyetai.sdk.wechat.model.UniformMessageReq; -import com.newyetai.sdk.wechat.model.UnlimitedWxacodeReq; -import com.newyetai.sdk.wechat.model.UrlSchemeDTO; -import com.newyetai.sdk.wechat.model.UrlSchemeReq; -import com.newyetai.sdk.wechat.model.CodeUserInfoReq; -import com.newyetai.sdk.wechat.model.SubscibeUserDTO; -import com.newyetai.sdk.wechat.model.SubscibeUserReq; -import com.newyetai.sdk.wechat.model.WxacodeReq; -import com.newyetai.sdk.wechat.util.WechatConvertUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.dto.DefaultSdkInvokeLogDTO; +import com.senmesh.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.convert.WechatAppletWXACodeHttpMessageConverter; +import com.senmesh.sdk.wechat.model.AccessTokenDTO; +import com.senmesh.sdk.wechat.model.AccessTokenReq; +import com.senmesh.sdk.wechat.model.BaseWeChatDTO; +import com.senmesh.sdk.wechat.model.BatchUnionDTO; +import com.senmesh.sdk.wechat.model.BatchUnionReq; +import com.senmesh.sdk.wechat.model.BufferDTO; +import com.senmesh.sdk.wechat.model.Code2SessionDTO; +import com.senmesh.sdk.wechat.model.Code2SessionReq; +import com.senmesh.sdk.wechat.model.FullUserInfoDTO; +import com.senmesh.sdk.wechat.model.JsApiTicketDTO; +import com.senmesh.sdk.wechat.model.JsApiTicketReq; +import com.senmesh.sdk.wechat.model.PhoneNumberDTO; +import com.senmesh.sdk.wechat.model.PhoneNumberReq; +import com.senmesh.sdk.wechat.model.SubscibeMessageReq; +import com.senmesh.sdk.wechat.model.TemplateMessageReq; +import com.senmesh.sdk.wechat.model.UniformMessageReq; +import com.senmesh.sdk.wechat.model.UnlimitedWxacodeReq; +import com.senmesh.sdk.wechat.model.UrlSchemeDTO; +import com.senmesh.sdk.wechat.model.UrlSchemeReq; +import com.senmesh.sdk.wechat.model.CodeUserInfoReq; +import com.senmesh.sdk.wechat.model.SubscibeUserDTO; +import com.senmesh.sdk.wechat.model.SubscibeUserReq; +import com.senmesh.sdk.wechat.model.WxacodeReq; +import com.senmesh.sdk.wechat.util.WechatConvertUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/wechat/constants/WechatConstants.java b/src/main/java/com/senmesh/sdk/wechat/constants/WechatConstants.java similarity index 98% rename from src/main/java/com/newyetai/sdk/wechat/constants/WechatConstants.java rename to src/main/java/com/senmesh/sdk/wechat/constants/WechatConstants.java index 4c39af1..f3a777f 100644 --- a/src/main/java/com/newyetai/sdk/wechat/constants/WechatConstants.java +++ b/src/main/java/com/senmesh/sdk/wechat/constants/WechatConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.constants; +package com.senmesh.sdk.wechat.constants; public interface WechatConstants { diff --git a/src/main/java/com/newyetai/sdk/wechat/constants/WechatErrorCodeEnum.java b/src/main/java/com/senmesh/sdk/wechat/constants/WechatErrorCodeEnum.java similarity index 93% rename from src/main/java/com/newyetai/sdk/wechat/constants/WechatErrorCodeEnum.java rename to src/main/java/com/senmesh/sdk/wechat/constants/WechatErrorCodeEnum.java index 7351ff1..38ecd3e 100644 --- a/src/main/java/com/newyetai/sdk/wechat/constants/WechatErrorCodeEnum.java +++ b/src/main/java/com/senmesh/sdk/wechat/constants/WechatErrorCodeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.constants; +package com.senmesh.sdk.wechat.constants; /** * 标识：微信(04) diff --git a/src/main/java/com/newyetai/sdk/wechat/constants/WechatMethodEnum.java b/src/main/java/com/senmesh/sdk/wechat/constants/WechatMethodEnum.java similarity index 93% rename from src/main/java/com/newyetai/sdk/wechat/constants/WechatMethodEnum.java rename to src/main/java/com/senmesh/sdk/wechat/constants/WechatMethodEnum.java index 87ce0d3..fea133b 100644 --- a/src/main/java/com/newyetai/sdk/wechat/constants/WechatMethodEnum.java +++ b/src/main/java/com/senmesh/sdk/wechat/constants/WechatMethodEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.constants; +package com.senmesh.sdk.wechat.constants; /** * 微信方法 diff --git a/src/main/java/com/newyetai/sdk/wechat/convert/WechatAppletWXACodeHttpMessageConverter.java b/src/main/java/com/senmesh/sdk/wechat/convert/WechatAppletWXACodeHttpMessageConverter.java similarity index 95% rename from src/main/java/com/newyetai/sdk/wechat/convert/WechatAppletWXACodeHttpMessageConverter.java rename to src/main/java/com/senmesh/sdk/wechat/convert/WechatAppletWXACodeHttpMessageConverter.java index 1ceea9e..699d38d 100644 --- a/src/main/java/com/newyetai/sdk/wechat/convert/WechatAppletWXACodeHttpMessageConverter.java +++ b/src/main/java/com/senmesh/sdk/wechat/convert/WechatAppletWXACodeHttpMessageConverter.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.convert; +package com.senmesh.sdk.wechat.convert; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -12,7 +12,7 @@ import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotWritableException; import org.springframework.util.StreamUtils; -import com.newyetai.sdk.wechat.model.BufferDTO; +import com.senmesh.sdk.wechat.model.BufferDTO; public class WechatAppletWXACodeHttpMessageConverter extends AbstractHttpMessageConverter { diff --git a/src/main/java/com/newyetai/sdk/wechat/model/AbstractAccessTokenReq.java b/src/main/java/com/senmesh/sdk/wechat/model/AbstractAccessTokenReq.java similarity index 83% rename from src/main/java/com/newyetai/sdk/wechat/model/AbstractAccessTokenReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/AbstractAccessTokenReq.java index 7ff95d9..4a6041c 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/AbstractAccessTokenReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/AbstractAccessTokenReq.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.common.dto.ISdkRequest; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/AccessTokenDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/AccessTokenDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/wechat/model/AccessTokenDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/AccessTokenDTO.java index fdce0d2..d6cdc70 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/AccessTokenDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/AccessTokenDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/AccessTokenReq.java b/src/main/java/com/senmesh/sdk/wechat/model/AccessTokenReq.java similarity index 78% rename from src/main/java/com/newyetai/sdk/wechat/model/AccessTokenReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/AccessTokenReq.java index ac90941..f7a5e2a 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/AccessTokenReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/AccessTokenReq.java @@ -1,11 +1,11 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import org.springframework.data.annotation.Transient; -import com.newyetai.common.annotation.Mask; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.common.annotation.Mask; +import com.senmesh.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/BaseWeChatDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/BaseWeChatDTO.java similarity index 86% rename from src/main/java/com/newyetai/sdk/wechat/model/BaseWeChatDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/BaseWeChatDTO.java index 52aa248..1482ce5 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/BaseWeChatDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/BaseWeChatDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/BatchUnionDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/BatchUnionDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/wechat/model/BatchUnionDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/BatchUnionDTO.java index fd6333d..881bef6 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/BatchUnionDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/BatchUnionDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/BatchUnionReq.java b/src/main/java/com/senmesh/sdk/wechat/model/BatchUnionReq.java similarity index 80% rename from src/main/java/com/newyetai/sdk/wechat/model/BatchUnionReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/BatchUnionReq.java index 792fb1d..3e264c0 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/BatchUnionReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/BatchUnionReq.java @@ -1,17 +1,15 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.Singular; -import lombok.Builder.Default; import lombok.experimental.SuperBuilder; /** diff --git a/src/main/java/com/newyetai/sdk/wechat/model/BufferDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/BufferDTO.java similarity index 82% rename from src/main/java/com/newyetai/sdk/wechat/model/BufferDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/BufferDTO.java index 7d051ea..a6e2c47 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/BufferDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/BufferDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; -import com.newyetai.common.annotation.Mask; +import com.senmesh.common.annotation.Mask; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/Code2SessionDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/Code2SessionDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/wechat/model/Code2SessionDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/Code2SessionDTO.java index 793c5b8..5fdbec5 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/Code2SessionDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/Code2SessionDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/Code2SessionReq.java b/src/main/java/com/senmesh/sdk/wechat/model/Code2SessionReq.java similarity index 76% rename from src/main/java/com/newyetai/sdk/wechat/model/Code2SessionReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/Code2SessionReq.java index 235536f..a0014d3 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/Code2SessionReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/Code2SessionReq.java @@ -1,12 +1,11 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import org.springframework.data.annotation.Transient; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.annotation.Mask; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.common.annotation.Mask; +import com.senmesh.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/CodeUserInfoReq.java b/src/main/java/com/senmesh/sdk/wechat/model/CodeUserInfoReq.java similarity index 83% rename from src/main/java/com/newyetai/sdk/wechat/model/CodeUserInfoReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/CodeUserInfoReq.java index 11d547c..876a788 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/CodeUserInfoReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/CodeUserInfoReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/FullUserInfoDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/FullUserInfoDTO.java similarity index 84% rename from src/main/java/com/newyetai/sdk/wechat/model/FullUserInfoDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/FullUserInfoDTO.java index 9ef4b11..0619e65 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/FullUserInfoDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/FullUserInfoDTO.java @@ -1,9 +1,6 @@ -package com.newyetai.sdk.wechat.model; - -import java.io.Serializable; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.common.dto.LiteUserPhoneDTO; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/JsApiTicketDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/JsApiTicketDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/wechat/model/JsApiTicketDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/JsApiTicketDTO.java index 3136ae3..2c2de54 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/JsApiTicketDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/JsApiTicketDTO.java @@ -1,6 +1,4 @@ -package com.newyetai.sdk.wechat.model; - -import java.io.Serializable; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/JsApiTicketReq.java b/src/main/java/com/senmesh/sdk/wechat/model/JsApiTicketReq.java similarity index 79% rename from src/main/java/com/newyetai/sdk/wechat/model/JsApiTicketReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/JsApiTicketReq.java index e1cf98b..f56902a 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/JsApiTicketReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/JsApiTicketReq.java @@ -1,8 +1,7 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Builder.Default; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/JumpWxa.java b/src/main/java/com/senmesh/sdk/wechat/model/JumpWxa.java similarity index 96% rename from src/main/java/com/newyetai/sdk/wechat/model/JumpWxa.java rename to src/main/java/com/senmesh/sdk/wechat/model/JumpWxa.java index e3d2a7d..077e443 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/JumpWxa.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/JumpWxa.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/KeyData.java b/src/main/java/com/senmesh/sdk/wechat/model/KeyData.java similarity index 92% rename from src/main/java/com/newyetai/sdk/wechat/model/KeyData.java rename to src/main/java/com/senmesh/sdk/wechat/model/KeyData.java index 6a06c1d..febc390 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/KeyData.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/KeyData.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/MiniProgram.java b/src/main/java/com/senmesh/sdk/wechat/model/MiniProgram.java similarity index 95% rename from src/main/java/com/newyetai/sdk/wechat/model/MiniProgram.java rename to src/main/java/com/senmesh/sdk/wechat/model/MiniProgram.java index 75088d3..19f68c5 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/MiniProgram.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/MiniProgram.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/MpTemplateMsg.java b/src/main/java/com/senmesh/sdk/wechat/model/MpTemplateMsg.java similarity index 96% rename from src/main/java/com/newyetai/sdk/wechat/model/MpTemplateMsg.java rename to src/main/java/com/senmesh/sdk/wechat/model/MpTemplateMsg.java index f3998a8..336c60a 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/MpTemplateMsg.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/MpTemplateMsg.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/PhoneNumberDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/PhoneNumberDTO.java similarity index 82% rename from src/main/java/com/newyetai/sdk/wechat/model/PhoneNumberDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/PhoneNumberDTO.java index 06d08e7..a87442d 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/PhoneNumberDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/PhoneNumberDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.common.dto.LiteUserPhoneDTO; +import com.senmesh.sdk.common.dto.LiteUserPhoneDTO; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/PhoneNumberReq.java b/src/main/java/com/senmesh/sdk/wechat/model/PhoneNumberReq.java similarity index 82% rename from src/main/java/com/newyetai/sdk/wechat/model/PhoneNumberReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/PhoneNumberReq.java index 8243380..29731c7 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/PhoneNumberReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/PhoneNumberReq.java @@ -1,7 +1,7 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/SubscibeMessageReq.java b/src/main/java/com/senmesh/sdk/wechat/model/SubscibeMessageReq.java similarity index 91% rename from src/main/java/com/newyetai/sdk/wechat/model/SubscibeMessageReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/SubscibeMessageReq.java index 59d77f0..84716c0 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/SubscibeMessageReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/SubscibeMessageReq.java @@ -1,10 +1,10 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/SubscibeUserDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/SubscibeUserDTO.java similarity index 94% rename from src/main/java/com/newyetai/sdk/wechat/model/SubscibeUserDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/SubscibeUserDTO.java index 9f5815b..528cc6f 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/SubscibeUserDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/SubscibeUserDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/SubscibeUserReq.java b/src/main/java/com/senmesh/sdk/wechat/model/SubscibeUserReq.java similarity index 85% rename from src/main/java/com/newyetai/sdk/wechat/model/SubscibeUserReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/SubscibeUserReq.java index 4b67fa6..e25760b 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/SubscibeUserReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/SubscibeUserReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/TemplateMessageReq.java b/src/main/java/com/senmesh/sdk/wechat/model/TemplateMessageReq.java similarity index 85% rename from src/main/java/com/newyetai/sdk/wechat/model/TemplateMessageReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/TemplateMessageReq.java index ed7ea19..64d1f4d 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/TemplateMessageReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/TemplateMessageReq.java @@ -1,11 +1,10 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UniformMessageReq.java b/src/main/java/com/senmesh/sdk/wechat/model/UniformMessageReq.java similarity index 90% rename from src/main/java/com/newyetai/sdk/wechat/model/UniformMessageReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/UniformMessageReq.java index 6767e1f..b0483f8 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UniformMessageReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UniformMessageReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UnionDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/UnionDTO.java similarity index 98% rename from src/main/java/com/newyetai/sdk/wechat/model/UnionDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/UnionDTO.java index 63e2e91..7faef78 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UnionDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UnionDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UnionReq.java b/src/main/java/com/senmesh/sdk/wechat/model/UnionReq.java similarity index 82% rename from src/main/java/com/newyetai/sdk/wechat/model/UnionReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/UnionReq.java index a72ed20..442691d 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UnionReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UnionReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UnionUser.java b/src/main/java/com/senmesh/sdk/wechat/model/UnionUser.java similarity index 90% rename from src/main/java/com/newyetai/sdk/wechat/model/UnionUser.java rename to src/main/java/com/senmesh/sdk/wechat/model/UnionUser.java index 4a59376..0e58181 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UnionUser.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UnionUser.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UnlimitedWxacodeReq.java b/src/main/java/com/senmesh/sdk/wechat/model/UnlimitedWxacodeReq.java similarity index 93% rename from src/main/java/com/newyetai/sdk/wechat/model/UnlimitedWxacodeReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/UnlimitedWxacodeReq.java index 01f9cc1..0b51176 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UnlimitedWxacodeReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UnlimitedWxacodeReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UrlLinkDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/UrlLinkDTO.java similarity index 88% rename from src/main/java/com/newyetai/sdk/wechat/model/UrlLinkDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/UrlLinkDTO.java index 69d7f03..e8643f8 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UrlLinkDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UrlLinkDTO.java @@ -1,6 +1,4 @@ -package com.newyetai.sdk.wechat.model; - -import java.io.Serializable; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UrlLinkReq.java b/src/main/java/com/senmesh/sdk/wechat/model/UrlLinkReq.java similarity index 93% rename from src/main/java/com/newyetai/sdk/wechat/model/UrlLinkReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/UrlLinkReq.java index 40c8f16..26381b9 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UrlLinkReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UrlLinkReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UrlSchemeDTO.java b/src/main/java/com/senmesh/sdk/wechat/model/UrlSchemeDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/wechat/model/UrlSchemeDTO.java rename to src/main/java/com/senmesh/sdk/wechat/model/UrlSchemeDTO.java index 192731f..5f93b30 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UrlSchemeDTO.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UrlSchemeDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/UrlSchemeReq.java b/src/main/java/com/senmesh/sdk/wechat/model/UrlSchemeReq.java similarity index 89% rename from src/main/java/com/newyetai/sdk/wechat/model/UrlSchemeReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/UrlSchemeReq.java index 4d7e06e..c8083de 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/UrlSchemeReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/UrlSchemeReq.java @@ -1,9 +1,8 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/Watermark.java b/src/main/java/com/senmesh/sdk/wechat/model/Watermark.java similarity index 94% rename from src/main/java/com/newyetai/sdk/wechat/model/Watermark.java rename to src/main/java/com/senmesh/sdk/wechat/model/Watermark.java index 8539579..f635bb0 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/Watermark.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/Watermark.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/WeappTemplateMsg.java b/src/main/java/com/senmesh/sdk/wechat/model/WeappTemplateMsg.java similarity index 95% rename from src/main/java/com/newyetai/sdk/wechat/model/WeappTemplateMsg.java rename to src/main/java/com/senmesh/sdk/wechat/model/WeappTemplateMsg.java index db9aae6..2221580 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/WeappTemplateMsg.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/WeappTemplateMsg.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/wechat/model/WxacodeReq.java b/src/main/java/com/senmesh/sdk/wechat/model/WxacodeReq.java similarity index 90% rename from src/main/java/com/newyetai/sdk/wechat/model/WxacodeReq.java rename to src/main/java/com/senmesh/sdk/wechat/model/WxacodeReq.java index 3f451ad..2a5f699 100644 --- a/src/main/java/com/newyetai/sdk/wechat/model/WxacodeReq.java +++ b/src/main/java/com/senmesh/sdk/wechat/model/WxacodeReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.wechat.model; +package com.senmesh.sdk.wechat.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.constants.WechatMethodEnum; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.constants.WechatMethodEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/sdk/wechat/util/MessageParamUtils.java b/src/main/java/com/senmesh/sdk/wechat/util/MessageParamUtils.java similarity index 87% rename from src/main/java/com/newyetai/sdk/wechat/util/MessageParamUtils.java rename to src/main/java/com/senmesh/sdk/wechat/util/MessageParamUtils.java index 34bbfcf..c48c6f7 100644 --- a/src/main/java/com/newyetai/sdk/wechat/util/MessageParamUtils.java +++ b/src/main/java/com/senmesh/sdk/wechat/util/MessageParamUtils.java @@ -1,11 +1,11 @@ -package com.newyetai.sdk.wechat.util; +package com.senmesh.sdk.wechat.util; import java.util.Collections; import java.util.Map; import com.google.common.collect.Maps; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.sdk.wechat.model.KeyData; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.sdk.wechat.model.KeyData; import org.apache.commons.lang3.StringUtils; public class MessageParamUtils { diff --git a/src/main/java/com/newyetai/sdk/wechat/util/WechatConvertUtils.java b/src/main/java/com/senmesh/sdk/wechat/util/WechatConvertUtils.java similarity index 84% rename from src/main/java/com/newyetai/sdk/wechat/util/WechatConvertUtils.java rename to src/main/java/com/senmesh/sdk/wechat/util/WechatConvertUtils.java index cc3ef7e..bb9c232 100644 --- a/src/main/java/com/newyetai/sdk/wechat/util/WechatConvertUtils.java +++ b/src/main/java/com/senmesh/sdk/wechat/util/WechatConvertUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.wechat.util; +package com.senmesh.sdk.wechat.util; import java.net.URI; import java.util.Collections; @@ -10,15 +10,15 @@ import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; import org.springframework.web.util.UriComponentsBuilder; -import com.newyetai.sdk.wechat.constants.WechatConstants; -import com.newyetai.sdk.wechat.model.AbstractAccessTokenReq; -import com.newyetai.sdk.wechat.model.AccessTokenReq; -import com.newyetai.sdk.wechat.model.Code2SessionReq; -import com.newyetai.sdk.wechat.model.CodeUserInfoReq; -import com.newyetai.sdk.wechat.model.FullUserInfoDTO; -import com.newyetai.sdk.wechat.model.JsApiTicketReq; -import com.newyetai.sdk.wechat.model.SubscibeUserReq; -import com.newyetai.sdk.wechat.model.UnionReq; +import com.senmesh.sdk.wechat.constants.WechatConstants; +import com.senmesh.sdk.wechat.model.AbstractAccessTokenReq; +import com.senmesh.sdk.wechat.model.AccessTokenReq; +import com.senmesh.sdk.wechat.model.Code2SessionReq; +import com.senmesh.sdk.wechat.model.CodeUserInfoReq; +import com.senmesh.sdk.wechat.model.FullUserInfoDTO; +import com.senmesh.sdk.wechat.model.JsApiTicketReq; +import com.senmesh.sdk.wechat.model.SubscibeUserReq; +import com.senmesh.sdk.wechat.model.UnionReq; public class WechatConvertUtils { diff --git a/src/main/java/com/newyetai/sdk/workwechat/constant/WorkWechatConstants.java b/src/main/java/com/senmesh/sdk/workwechat/constant/WorkWechatConstants.java similarity index 70% rename from src/main/java/com/newyetai/sdk/workwechat/constant/WorkWechatConstants.java rename to src/main/java/com/senmesh/sdk/workwechat/constant/WorkWechatConstants.java index 63efb92..b019e95 100644 --- a/src/main/java/com/newyetai/sdk/workwechat/constant/WorkWechatConstants.java +++ b/src/main/java/com/senmesh/sdk/workwechat/constant/WorkWechatConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.workwechat.constant; +package com.senmesh.sdk.workwechat.constant; /** * @author sr on 2020-07-06 diff --git a/src/main/java/com/newyetai/sdk/workwechat/model/WwrArticleMsg.java b/src/main/java/com/senmesh/sdk/workwechat/model/WwrArticleMsg.java similarity index 87% rename from src/main/java/com/newyetai/sdk/workwechat/model/WwrArticleMsg.java rename to src/main/java/com/senmesh/sdk/workwechat/model/WwrArticleMsg.java index 0ac7c82..8ae3529 100644 --- a/src/main/java/com/newyetai/sdk/workwechat/model/WwrArticleMsg.java +++ b/src/main/java/com/senmesh/sdk/workwechat/model/WwrArticleMsg.java @@ -1,10 +1,10 @@ -package com.newyetai.sdk.workwechat.model; +package com.senmesh.sdk.workwechat.model; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.robot.constant.WorkWechatMsgTypeEnum; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.robot.constant.WorkWechatMsgTypeEnum; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/workwechat/model/WwrImageMsg.java b/src/main/java/com/senmesh/sdk/workwechat/model/WwrImageMsg.java similarity index 82% rename from src/main/java/com/newyetai/sdk/workwechat/model/WwrImageMsg.java rename to src/main/java/com/senmesh/sdk/workwechat/model/WwrImageMsg.java index 427d2b0..e0e566c 100644 --- a/src/main/java/com/newyetai/sdk/workwechat/model/WwrImageMsg.java +++ b/src/main/java/com/senmesh/sdk/workwechat/model/WwrImageMsg.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.workwechat.model; +package com.senmesh.sdk.workwechat.model; import java.io.Serializable; -import com.newyetai.sdk.robot.constant.WorkWechatMsgTypeEnum; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.robot.constant.WorkWechatMsgTypeEnum; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/workwechat/model/WwrMarkdownMsg.java b/src/main/java/com/senmesh/sdk/workwechat/model/WwrMarkdownMsg.java similarity index 81% rename from src/main/java/com/newyetai/sdk/workwechat/model/WwrMarkdownMsg.java rename to src/main/java/com/senmesh/sdk/workwechat/model/WwrMarkdownMsg.java index 6369816..10804aa 100644 --- a/src/main/java/com/newyetai/sdk/workwechat/model/WwrMarkdownMsg.java +++ b/src/main/java/com/senmesh/sdk/workwechat/model/WwrMarkdownMsg.java @@ -1,9 +1,9 @@ -package com.newyetai.sdk.workwechat.model; +package com.senmesh.sdk.workwechat.model; import java.io.Serializable; -import com.newyetai.sdk.robot.constant.WorkWechatMsgTypeEnum; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.robot.constant.WorkWechatMsgTypeEnum; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/workwechat/model/WwrTextMsg.java b/src/main/java/com/senmesh/sdk/workwechat/model/WwrTextMsg.java similarity index 85% rename from src/main/java/com/newyetai/sdk/workwechat/model/WwrTextMsg.java rename to src/main/java/com/senmesh/sdk/workwechat/model/WwrTextMsg.java index e735bc8..fdcf20d 100644 --- a/src/main/java/com/newyetai/sdk/workwechat/model/WwrTextMsg.java +++ b/src/main/java/com/senmesh/sdk/workwechat/model/WwrTextMsg.java @@ -1,11 +1,11 @@ -package com.newyetai.sdk.workwechat.model; +package com.senmesh.sdk.workwechat.model; import java.io.Serializable; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.robot.constant.WorkWechatMsgTypeEnum; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.robot.constant.WorkWechatMsgTypeEnum; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/workwechat/service/WorkWechatRobotService.java b/src/main/java/com/senmesh/sdk/workwechat/service/WorkWechatRobotService.java similarity index 72% rename from src/main/java/com/newyetai/sdk/workwechat/service/WorkWechatRobotService.java rename to src/main/java/com/senmesh/sdk/workwechat/service/WorkWechatRobotService.java index 6d1a8da..b91b004 100644 --- a/src/main/java/com/newyetai/sdk/workwechat/service/WorkWechatRobotService.java +++ b/src/main/java/com/senmesh/sdk/workwechat/service/WorkWechatRobotService.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.workwechat.service; +package com.senmesh.sdk.workwechat.service; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; /** * @author sr on 2020-07-06 diff --git a/src/main/java/com/newyetai/sdk/workwechat/service/impl/WorkWechatRobotServiceImpl.java b/src/main/java/com/senmesh/sdk/workwechat/service/impl/WorkWechatRobotServiceImpl.java similarity index 73% rename from src/main/java/com/newyetai/sdk/workwechat/service/impl/WorkWechatRobotServiceImpl.java rename to src/main/java/com/senmesh/sdk/workwechat/service/impl/WorkWechatRobotServiceImpl.java index 7786e33..aba0205 100644 --- a/src/main/java/com/newyetai/sdk/workwechat/service/impl/WorkWechatRobotServiceImpl.java +++ b/src/main/java/com/senmesh/sdk/workwechat/service/impl/WorkWechatRobotServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.workwechat.service.impl; +package com.senmesh.sdk.workwechat.service.impl; import java.util.Arrays; @@ -6,17 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; -import com.dingtalk.api.DefaultDingTalkClient; -import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiRobotSendRequest; -import com.dingtalk.api.response.OapiRobotSendResponse; -import com.newyetai.sdk.robot.model.IDingTalkMsg; -import com.newyetai.sdk.robot.model.IMsg; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; -import com.newyetai.sdk.robot.model.TextMsg; -import com.newyetai.sdk.workwechat.service.WorkWechatRobotService; -import com.newyetai.sdk.workwechat.util.WorkWechatUtils; -import com.taobao.api.ApiException; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.robot.model.TextMsg; +import com.senmesh.sdk.workwechat.service.WorkWechatRobotService; +import com.senmesh.sdk.workwechat.util.WorkWechatUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/workwechat/util/WorkWechatUtils.java b/src/main/java/com/senmesh/sdk/workwechat/util/WorkWechatUtils.java similarity index 80% rename from src/main/java/com/newyetai/sdk/workwechat/util/WorkWechatUtils.java rename to src/main/java/com/senmesh/sdk/workwechat/util/WorkWechatUtils.java index 7956692..ad9865a 100644 --- a/src/main/java/com/newyetai/sdk/workwechat/util/WorkWechatUtils.java +++ b/src/main/java/com/senmesh/sdk/workwechat/util/WorkWechatUtils.java @@ -1,11 +1,11 @@ -package com.newyetai.sdk.workwechat.util; +package com.senmesh.sdk.workwechat.util; import java.util.Map; import com.google.common.collect.Maps; -import com.newyetai.sdk.robot.constant.WorkWechatMsgTypeEnum; -import com.newyetai.sdk.robot.model.IWorkWechatMsg; -import com.newyetai.sdk.workwechat.model.WwrTextMsg; +import com.senmesh.sdk.robot.constant.WorkWechatMsgTypeEnum; +import com.senmesh.sdk.robot.model.IWorkWechatMsg; +import com.senmesh.sdk.workwechat.model.WwrTextMsg; /** * @author sr on 2020-07-06 diff --git a/src/main/java/com/newyetai/sdk/xf/config/XfProperties.java b/src/main/java/com/senmesh/sdk/xf/config/XfProperties.java similarity index 97% rename from src/main/java/com/newyetai/sdk/xf/config/XfProperties.java rename to src/main/java/com/senmesh/sdk/xf/config/XfProperties.java index 5937ba2..20b7980 100644 --- a/src/main/java/com/newyetai/sdk/xf/config/XfProperties.java +++ b/src/main/java/com/senmesh/sdk/xf/config/XfProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.config; +package com.senmesh.sdk.xf.config; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/xf/dto/InterviewContentDTO.java b/src/main/java/com/senmesh/sdk/xf/dto/InterviewContentDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/xf/dto/InterviewContentDTO.java rename to src/main/java/com/senmesh/sdk/xf/dto/InterviewContentDTO.java index 853fc9a..edf2ca4 100644 --- a/src/main/java/com/newyetai/sdk/xf/dto/InterviewContentDTO.java +++ b/src/main/java/com/senmesh/sdk/xf/dto/InterviewContentDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.dto; +package com.senmesh.sdk.xf.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/xf/dto/InterviewQaDTO.java b/src/main/java/com/senmesh/sdk/xf/dto/InterviewQaDTO.java similarity index 92% rename from src/main/java/com/newyetai/sdk/xf/dto/InterviewQaDTO.java rename to src/main/java/com/senmesh/sdk/xf/dto/InterviewQaDTO.java index 69bf9bb..49b6c7e 100644 --- a/src/main/java/com/newyetai/sdk/xf/dto/InterviewQaDTO.java +++ b/src/main/java/com/senmesh/sdk/xf/dto/InterviewQaDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.dto; +package com.senmesh.sdk.xf.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/xf/dto/RtasrReqDTO.java b/src/main/java/com/senmesh/sdk/xf/dto/RtasrReqDTO.java similarity index 93% rename from src/main/java/com/newyetai/sdk/xf/dto/RtasrReqDTO.java rename to src/main/java/com/senmesh/sdk/xf/dto/RtasrReqDTO.java index fbe0b8c..5789497 100644 --- a/src/main/java/com/newyetai/sdk/xf/dto/RtasrReqDTO.java +++ b/src/main/java/com/senmesh/sdk/xf/dto/RtasrReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.dto; +package com.senmesh.sdk.xf.dto; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/newyetai/sdk/xf/dto/TtsReqDTO.java b/src/main/java/com/senmesh/sdk/xf/dto/TtsReqDTO.java similarity index 90% rename from src/main/java/com/newyetai/sdk/xf/dto/TtsReqDTO.java rename to src/main/java/com/senmesh/sdk/xf/dto/TtsReqDTO.java index d591dfe..799e403 100644 --- a/src/main/java/com/newyetai/sdk/xf/dto/TtsReqDTO.java +++ b/src/main/java/com/senmesh/sdk/xf/dto/TtsReqDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.sdk.xf.dto; +package com.senmesh.sdk.xf.dto; -import com.newyetai.sdk.xf.util.WebTtsWS; +import com.senmesh.sdk.xf.util.WebTtsWS; import java.io.Serializable; import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/sdk/xf/model/ChatReq.java b/src/main/java/com/senmesh/sdk/xf/model/ChatReq.java similarity index 95% rename from src/main/java/com/newyetai/sdk/xf/model/ChatReq.java rename to src/main/java/com/senmesh/sdk/xf/model/ChatReq.java index 9f3eef9..9fb9a3d 100644 --- a/src/main/java/com/newyetai/sdk/xf/model/ChatReq.java +++ b/src/main/java/com/senmesh/sdk/xf/model/ChatReq.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.model; +package com.senmesh.sdk.xf.model; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/sdk/xf/model/ChatRes.java b/src/main/java/com/senmesh/sdk/xf/model/ChatRes.java similarity index 79% rename from src/main/java/com/newyetai/sdk/xf/model/ChatRes.java rename to src/main/java/com/senmesh/sdk/xf/model/ChatRes.java index 56a41ed..36baf86 100644 --- a/src/main/java/com/newyetai/sdk/xf/model/ChatRes.java +++ b/src/main/java/com/senmesh/sdk/xf/model/ChatRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.model; +package com.senmesh.sdk.xf.model; import java.io.Serializable; import java.util.List; @@ -7,8 +7,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.Singular; -import lombok.Builder.Default; @Data @AllArgsConstructor diff --git a/src/main/java/com/newyetai/sdk/xf/model/ChoiceDTO.java b/src/main/java/com/senmesh/sdk/xf/model/ChoiceDTO.java similarity index 87% rename from src/main/java/com/newyetai/sdk/xf/model/ChoiceDTO.java rename to src/main/java/com/senmesh/sdk/xf/model/ChoiceDTO.java index f3ca1e7..34d25b2 100644 --- a/src/main/java/com/newyetai/sdk/xf/model/ChoiceDTO.java +++ b/src/main/java/com/senmesh/sdk/xf/model/ChoiceDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.model; +package com.senmesh.sdk.xf.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/xf/model/MessageDTO.java b/src/main/java/com/senmesh/sdk/xf/model/MessageDTO.java similarity index 91% rename from src/main/java/com/newyetai/sdk/xf/model/MessageDTO.java rename to src/main/java/com/senmesh/sdk/xf/model/MessageDTO.java index 17998f3..aa965d0 100644 --- a/src/main/java/com/newyetai/sdk/xf/model/MessageDTO.java +++ b/src/main/java/com/senmesh/sdk/xf/model/MessageDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.model; +package com.senmesh.sdk.xf.model; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/sdk/xf/model/TranslateReq.java b/src/main/java/com/senmesh/sdk/xf/model/TranslateReq.java similarity index 91% rename from src/main/java/com/newyetai/sdk/xf/model/TranslateReq.java rename to src/main/java/com/senmesh/sdk/xf/model/TranslateReq.java index 7f79bdc..26f7430 100644 --- a/src/main/java/com/newyetai/sdk/xf/model/TranslateReq.java +++ b/src/main/java/com/senmesh/sdk/xf/model/TranslateReq.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.xf.model; +package com.senmesh.sdk.xf.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.sdk.common.dto.ISdkRequest; -import com.newyetai.sdk.xf.model.TranslateReq.TranslateRes; +import com.senmesh.sdk.common.dto.ISdkRequest; +import com.senmesh.sdk.xf.model.TranslateReq.TranslateRes; import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/xf/model/XfRes.java b/src/main/java/com/senmesh/sdk/xf/model/XfRes.java similarity index 89% rename from src/main/java/com/newyetai/sdk/xf/model/XfRes.java rename to src/main/java/com/senmesh/sdk/xf/model/XfRes.java index 4a45f85..6ca36a0 100644 --- a/src/main/java/com/newyetai/sdk/xf/model/XfRes.java +++ b/src/main/java/com/senmesh/sdk/xf/model/XfRes.java @@ -1,4 +1,4 @@ -package com.newyetai.sdk.xf.model; +package com.senmesh.sdk.xf.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/sdk/xf/service/RtasrClientApp.java b/src/main/java/com/senmesh/sdk/xf/service/RtasrClientApp.java similarity index 96% rename from src/main/java/com/newyetai/sdk/xf/service/RtasrClientApp.java rename to src/main/java/com/senmesh/sdk/xf/service/RtasrClientApp.java index 6bbd500..166773d 100644 --- a/src/main/java/com/newyetai/sdk/xf/service/RtasrClientApp.java +++ b/src/main/java/com/senmesh/sdk/xf/service/RtasrClientApp.java @@ -1,15 +1,14 @@ -package com.newyetai.sdk.xf.service; +package com.senmesh.sdk.xf.service; -import cn.hutool.json.JSON; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import cn.xfyun.api.RtasrClient; import cn.xfyun.model.response.rtasr.RtasrResponse; import cn.xfyun.service.rta.AbstractRtasrWebSocketListener; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.xf.config.XfProperties; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.xf.config.XfProperties; import java.io.InputStream; import java.util.concurrent.CountDownLatch; import okhttp3.Response; diff --git a/src/main/java/com/newyetai/sdk/xf/service/XfSparkProvider.java b/src/main/java/com/senmesh/sdk/xf/service/XfSparkProvider.java similarity index 93% rename from src/main/java/com/newyetai/sdk/xf/service/XfSparkProvider.java rename to src/main/java/com/senmesh/sdk/xf/service/XfSparkProvider.java index fd32ca0..68f12ba 100644 --- a/src/main/java/com/newyetai/sdk/xf/service/XfSparkProvider.java +++ b/src/main/java/com/senmesh/sdk/xf/service/XfSparkProvider.java @@ -1,10 +1,10 @@ -package com.newyetai.sdk.xf.service; +package com.senmesh.sdk.xf.service; import com.google.gson.JsonObject; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.sdk.xf.model.TranslateReq; -import com.newyetai.sdk.xf.model.TranslateReq.TranslateRes; -import com.newyetai.sdk.xf.model.XfRes; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.sdk.xf.model.TranslateReq; +import com.senmesh.sdk.xf.model.TranslateReq.TranslateRes; +import com.senmesh.sdk.xf.model.XfRes; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; @@ -25,14 +25,14 @@ import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.common.constant.SdkConstants; -import com.newyetai.sdk.common.dto.DefaultSdkInvokeLogDTO; -import com.newyetai.sdk.common.util.HttpUtils; -import com.newyetai.sdk.xf.config.XfProperties; -import com.newyetai.sdk.xf.model.ChatReq; -import com.newyetai.sdk.xf.model.ChatRes; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.constant.SdkConstants; +import com.senmesh.sdk.common.dto.DefaultSdkInvokeLogDTO; +import com.senmesh.sdk.common.util.HttpUtils; +import com.senmesh.sdk.xf.config.XfProperties; +import com.senmesh.sdk.xf.model.ChatReq; +import com.senmesh.sdk.xf.model.ChatRes; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/sdk/xf/util/WebIATWS.java b/src/main/java/com/senmesh/sdk/xf/util/WebIATWS.java similarity index 96% rename from src/main/java/com/newyetai/sdk/xf/util/WebIATWS.java rename to src/main/java/com/senmesh/sdk/xf/util/WebIATWS.java index 0051ac5..7aeb668 100644 --- a/src/main/java/com/newyetai/sdk/xf/util/WebIATWS.java +++ b/src/main/java/com/senmesh/sdk/xf/util/WebIATWS.java @@ -1,427 +1,426 @@ -package com.newyetai.sdk.xf.util; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.nio.charset.Charset; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Base64; -import java.util.Date; -import java.util.Locale; -import java.util.TimeZone; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; - -import com.google.gson.Gson; -import com.google.gson.JsonObject; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.xf.config.XfProperties; - -import lombok.extern.slf4j.Slf4j; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import okhttp3.WebSocket; -import okhttp3.WebSocketListener; - -/** - * 语音听写流式 WebAPI 接口调用示例 接口文档（必看）：https://doc.xfyun.cn/rest_api/语音听写（流式版）.html - * webapi 听写服务参考帖子（必看）：http://bbs.xfyun.cn/forum.php?mod=viewthread&tid=38947&extra= - * 语音听写流式WebAPI 服务，热词使用方式：登陆开放平台https://www.xfyun.cn/后，找到控制台--我的应用---语音听写---个性化热词，上传热词 - * 注意：热词只能在识别的时候会增加热词的识别权重，需要注意的是增加相应词条的识别率，但并不是绝对的，具体效果以您测试为准。 - * 错误码链接：https://www.xfyun.cn/document/error-code （code返回错误码时必看） - * 语音听写流式WebAPI 服务，方言或小语种试用方法：登陆开放平台https://www.xfyun.cn/后，在控制台--语音听写（流式）--方言/语种处添加 - * 添加后会显示该方言/语种的参数值 - * @author iflytek - */ -@Slf4j -public class WebIATWS extends WebSocketListener { - // private static final String hostUrl = "https://iat-api.xfyun.cn/v2/iat"; //中英文，http url 不支持解析 ws/wss schema - // private static final String hostUrl = "https://iat-niche-api.xfyun.cn/v2/iat";//小语种 - public static final int StatusFirstFrame = 0; - public static final int StatusContinueFrame = 1; - public static final int StatusLastFrame = 2; - public static final Gson json = new Gson(); - Decoder decoder = new Decoder(); - // 开始时间 - private static Date dateBegin = new Date(); - // 结束时间 - private static Date dateEnd = new Date(); - private static final SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss.SSS"); - - InputStream is; - private String appId; - // mp3格式 - private String encoding = "raw"; - private AlitaResult result; - - WebIATWS(InputStream is, String appId) { - this.is = is; - this.appId = appId; - } - - public AlitaResult getResult() { - return result; - } - - - @Override - public void onOpen(WebSocket webSocket, Response response) { - super.onOpen(webSocket, response); - new Thread(() -> { - //连接成功，开始发送数据 - // int frameSize = 1280; //每一帧音频的大小,建议每 40ms 发送 122B - int frameSize = 1280 * 64; //每一帧音频的大小,建议每 40ms 发送 122B - int intervel = 40; - // int intervel = 0; - int status = 0; // 音频的状态 - try { - byte[] buffer = new byte[frameSize]; - // 发送音频 - end: while (true) { - int len = is.read(buffer); - if (len == -1) { - status = StatusLastFrame; //文件读完，改变status 为 2 - } - - switch (status) { - case StatusFirstFrame: // 第一帧音频status = 0 - JsonObject frame = new JsonObject(); - JsonObject business = new JsonObject(); //第一帧必须发送 - JsonObject common = new JsonObject(); //第一帧必须发送 - JsonObject data = new JsonObject(); //每一帧都要发送 - // 填充common - common.addProperty("app_id", this.appId); - //填充business - business.addProperty("language", "zh_cn"); - //business.addProperty("language", "en_us");//英文 - //business.addProperty("language", "ja_jp");//日语，在控制台可添加试用或购买 - //business.addProperty("language", "ko_kr");//韩语，在控制台可添加试用或购买 - //business.addProperty("language", "ru-ru");//俄语，在控制台可添加试用或购买 - business.addProperty("domain", "iat"); - business.addProperty("accent", "mandarin");//中文方言请在控制台添加试用，添加后即展示相应参数值 - //business.addProperty("nunum", 0); - //business.addProperty("ptt", 0);//标点符号 - //business.addProperty("rlang", "zh-hk"); // zh-cn :简体中文（默认值）zh-hk :繁体香港(若未授权不生效，在控制台可免费开通) - //business.addProperty("vinfo", 1); - business.addProperty("dwa", "wpgs");//动态修正(若未授权不生效，在控制台可免费开通) - //business.addProperty("nbest", 5);// 句子多候选(若未授权不生效，在控制台可免费开通) - //business.addProperty("wbest", 3);// 词级多候选(若未授权不生效，在控制台可免费开通) - //填充data - data.addProperty("status", StatusFirstFrame); - data.addProperty("format", "audio/L16;rate=16000"); - // data.addProperty("encoding", "raw"); - data.addProperty("encoding", this.encoding); - data.addProperty("audio", - Base64.getEncoder().encodeToString(Arrays.copyOf(buffer, len))); - //填充frame - frame.add("common", common); - frame.add("business", business); - frame.add("data", data); - webSocket.send(frame.toString()); - status = StatusContinueFrame; // 发送完第一帧改变status 为 1 - break; - case StatusContinueFrame: //中间帧status = 1 - JsonObject frame1 = new JsonObject(); - JsonObject data1 = new JsonObject(); - data1.addProperty("status", StatusContinueFrame); - data1.addProperty("format", "audio/L16;rate=16000"); - data1.addProperty("encoding", this.encoding); - data1.addProperty("audio", - Base64.getEncoder().encodeToString(Arrays.copyOf(buffer, len))); - frame1.add("data", data1); - webSocket.send(frame1.toString()); - // log.info("send continue"); - break; - case StatusLastFrame: // 最后一帧音频status = 2 ，标志音频发送结束 - JsonObject frame2 = new JsonObject(); - JsonObject data2 = new JsonObject(); - data2.addProperty("status", StatusLastFrame); - data2.addProperty("audio", ""); - data2.addProperty("format", "audio/L16;rate=16000"); - // data2.addProperty("encoding", "raw"); - data2.addProperty("encoding", this.encoding); - frame2.add("data", data2); - webSocket.send(frame2.toString()); - log.info("sendlast"); - break end; - } - Thread.sleep(intervel); //模拟音频采样延时 - } - log.info("all data is send"); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - }).start(); - } - - @Override - public void onMessage(WebSocket webSocket, String text) { - super.onMessage(webSocket, text); - //log.info(text); - ResponseData resp = json.fromJson(text, ResponseData.class); - if (resp != null) { - if (resp.getCode() != 0) { - // log.info( "code=>" + resp.getCode() + " error=>" + resp.getMessage() + " sid=" + resp.getSid()); - // log.info( "错误码查询链接：https://www.xfyun.cn/document/error-code"); - result = AlitaResult.error(resp.getCode() + ":" + resp.getMessage()); - webSocket.close(1000, ""); - return; - } - if (resp.getData() != null) { - if (resp.getData().getResult() != null) { - Text te = resp.getData().getResult().getText(); - //log.info(te.toString()); - try { - decoder.decode(te); - log.debug("中间识别结果 ==》" + decoder.toString()); - } catch (Exception e) { - e.printStackTrace(); - } - } - if (resp.getData().getStatus() == 2) { - // todo resp.data.status ==2 说明数据全部返回完毕，可以关闭连接，释放资源 - // log.info("session end "); - dateEnd = new Date(); - log.info("开始-{},结束-{},耗时:{}", sdf.format(dateBegin), sdf.format(dateEnd), - (dateEnd.getTime() - dateBegin.getTime()) + "ms"); - String resultStr = decoder.toString(); - log.info("最终识别结果 ==》{},本次识别sid ==》{}", resultStr, resp.getSid()); - decoder.discard(); - webSocket.close(1000, ""); - result = AlitaResult.success(resultStr); - } else { - // todo 根据返回的数据处理 - } - } - } - } - - @Override - public void onFailure(WebSocket webSocket, Throwable t, Response response) { - super.onFailure(webSocket, t, response); - try { - if (null != response) { - int code = response.code(); - log.info("onFailure code:" + code); - log.info("onFailure body:" + response.body().string()); - if (101 != code) { - log.info("connection failed"); - webSocket.close(1000, ""); - } - } - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - public static AlitaResult execute(InputStream is, XfProperties xfProperties) { - try { - // 构建鉴权url - String authUrl = getAuthUrl(xfProperties.getIatHostUrl(), xfProperties.getApiKey(), - xfProperties.getApiSecret()); - OkHttpClient client = new OkHttpClient.Builder().build(); - //将url中的 schema http://和https://分别替换为ws:// 和 wss:// - String url = authUrl.toString().replace("http://", "ws://").replace("https://", "wss://"); - Request request = new Request.Builder().url(url).build(); - WebIATWS webIATWS = new WebIATWS(is, xfProperties.getAppId()); - WebSocket webSocket = client.newWebSocket(request, webIATWS); - while (webIATWS.getResult() == null) { - // 未拿到结果等待 - Thread.sleep(1000l); - } - return webIATWS.getResult(); - } catch (Exception e) { - log.info("err ", e); - return AlitaResult.error("语音听写失败：{}", e.getMessage()); - } - - } - - public static String getAuthUrl(String hostUrl, String apiKey, String apiSecret) - throws Exception { - URL url = new URL(hostUrl); - SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US); - format.setTimeZone(TimeZone.getTimeZone("GMT")); - String date = format.format(new Date()); - StringBuilder builder = new StringBuilder("host: ").append(url.getHost()).append("\n").// - append("date: ").append(date).append("\n").// - append("GET ").append(url.getPath()).append(" HTTP/1.1"); - //log.info(builder); - Charset charset = Charset.forName("UTF-8"); - Mac mac = Mac.getInstance("hmacsha256"); - SecretKeySpec spec = new SecretKeySpec(apiSecret.getBytes(charset), "hmacsha256"); - mac.init(spec); - byte[] hexDigits = mac.doFinal(builder.toString().getBytes(charset)); - String sha = Base64.getEncoder().encodeToString(hexDigits); - - //log.info(sha); - String authorization = - String.format("api_key=\"%s\", algorithm=\"%s\", headers=\"%s\", signature=\"%s\"", apiKey, - "hmac-sha256", "host date request-line", sha); - //log.info(authorization); - HttpUrl httpUrl = HttpUrl.parse("https://" + url.getHost() + url.getPath()).newBuilder().// - addQueryParameter("authorization", - Base64.getEncoder().encodeToString(authorization.getBytes(charset))) - .// - addQueryParameter("date", date).// - addQueryParameter("host", url.getHost()).// - build(); - return httpUrl.toString(); - } - - public static class ResponseData { - private int code; - private String message; - private String sid; - private Data data; - - public int getCode() { - return code; - } - - public String getMessage() { - return this.message; - } - - public String getSid() { - return sid; - } - - public Data getData() { - return data; - } - } - public static class Data { - private int status; - private Result result; - - public int getStatus() { - return status; - } - - public Result getResult() { - return result; - } - } - public static class Result { - int bg; - int ed; - String pgs; - int[] rg; - int sn; - Ws[] ws; - boolean ls; - JsonObject vad; - - public Text getText() { - Text text = new Text(); - StringBuilder sb = new StringBuilder(); - for (Ws ws : this.ws) { - sb.append(ws.cw[0].w); - } - text.sn = this.sn; - text.text = sb.toString(); - text.sn = this.sn; - text.rg = this.rg; - text.pgs = this.pgs; - text.bg = this.bg; - text.ed = this.ed; - text.ls = this.ls; - text.vad = this.vad == null ? null : this.vad; - return text; - } - } - public static class Ws { - Cw[] cw; - int bg; - int ed; - } - public static class Cw { - int sc; - String w; - } - public static class Text { - int sn; - int bg; - int ed; - String text; - String pgs; - int[] rg; - boolean deleted; - boolean ls; - JsonObject vad; - - @Override - public String toString() { - return "Text{" + - "bg=" + bg + - ", ed=" + ed + - ", ls=" + ls + - ", sn=" + sn + - ", text='" + text + '\'' + - ", pgs=" + pgs + - ", rg=" + Arrays.toString(rg) + - ", deleted=" + deleted + - ", vad=" + (vad == null ? "null" : vad.getAsJsonArray("ws").toString()) + - '}'; - } - } - //解析返回数据，仅供参考 - public static class Decoder { - private Text[] texts; - private int defc = 10; - - public Decoder() { - this.texts = new Text[this.defc]; - } - - public synchronized void decode(Text text) { - if (text.sn >= this.defc) { - this.resize(); - } - if ("rpl".equals(text.pgs)) { - for (int i = text.rg[0]; i <= text.rg[1]; i++) { - this.texts[i].deleted = true; - } - } - this.texts[text.sn] = text; - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - for (Text t : this.texts) { - if (t != null && !t.deleted) { - sb.append(t.text); - } - } - return sb.toString(); - } - - public void resize() { - int oc = this.defc; - this.defc <<= 1; - Text[] old = this.texts; - this.texts = new Text[this.defc]; - for (int i = 0; i < oc; i++) { - this.texts[i] = old[i]; - } - } - - public void discard() { - for (int i = 0; i < this.texts.length; i++) { - this.texts[i] = null; - } - } - } -} +package com.senmesh.sdk.xf.util; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.nio.charset.Charset; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Base64; +import java.util.Date; +import java.util.Locale; +import java.util.TimeZone; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.xf.config.XfProperties; + +import lombok.extern.slf4j.Slf4j; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.WebSocket; +import okhttp3.WebSocketListener; + +/** + * 语音听写流式 WebAPI 接口调用示例 接口文档（必看）：https://doc.xfyun.cn/rest_api/语音听写（流式版）.html + * webapi 听写服务参考帖子（必看）：http://bbs.xfyun.cn/forum.php?mod=viewthread&tid=38947&extra= + * 语音听写流式WebAPI 服务，热词使用方式：登陆开放平台https://www.xfyun.cn/后，找到控制台--我的应用---语音听写---个性化热词，上传热词 + * 注意：热词只能在识别的时候会增加热词的识别权重，需要注意的是增加相应词条的识别率，但并不是绝对的，具体效果以您测试为准。 + * 错误码链接：https://www.xfyun.cn/document/error-code （code返回错误码时必看） + * 语音听写流式WebAPI 服务，方言或小语种试用方法：登陆开放平台https://www.xfyun.cn/后，在控制台--语音听写（流式）--方言/语种处添加 + * 添加后会显示该方言/语种的参数值 + * @author iflytek + */ +@Slf4j +public class WebIATWS extends WebSocketListener { + // private static final String hostUrl = "https://iat-api.xfyun.cn/v2/iat"; //中英文，http url 不支持解析 ws/wss schema + // private static final String hostUrl = "https://iat-niche-api.xfyun.cn/v2/iat";//小语种 + public static final int StatusFirstFrame = 0; + public static final int StatusContinueFrame = 1; + public static final int StatusLastFrame = 2; + public static final Gson json = new Gson(); + Decoder decoder = new Decoder(); + // 开始时间 + private static Date dateBegin = new Date(); + // 结束时间 + private static Date dateEnd = new Date(); + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss.SSS"); + + InputStream is; + private String appId; + // mp3格式 + private String encoding = "raw"; + private AlitaResult result; + + WebIATWS(InputStream is, String appId) { + this.is = is; + this.appId = appId; + } + + public AlitaResult getResult() { + return result; + } + + + @Override + public void onOpen(WebSocket webSocket, Response response) { + super.onOpen(webSocket, response); + new Thread(() -> { + //连接成功，开始发送数据 + // int frameSize = 1280; //每一帧音频的大小,建议每 40ms 发送 122B + int frameSize = 1280 * 64; //每一帧音频的大小,建议每 40ms 发送 122B + int intervel = 40; + // int intervel = 0; + int status = 0; // 音频的状态 + try { + byte[] buffer = new byte[frameSize]; + // 发送音频 + end: while (true) { + int len = is.read(buffer); + if (len == -1) { + status = StatusLastFrame; //文件读完，改变status 为 2 + } + + switch (status) { + case StatusFirstFrame: // 第一帧音频status = 0 + JsonObject frame = new JsonObject(); + JsonObject business = new JsonObject(); //第一帧必须发送 + JsonObject common = new JsonObject(); //第一帧必须发送 + JsonObject data = new JsonObject(); //每一帧都要发送 + // 填充common + common.addProperty("app_id", this.appId); + //填充business + business.addProperty("language", "zh_cn"); + //business.addProperty("language", "en_us");//英文 + //business.addProperty("language", "ja_jp");//日语，在控制台可添加试用或购买 + //business.addProperty("language", "ko_kr");//韩语，在控制台可添加试用或购买 + //business.addProperty("language", "ru-ru");//俄语，在控制台可添加试用或购买 + business.addProperty("domain", "iat"); + business.addProperty("accent", "mandarin");//中文方言请在控制台添加试用，添加后即展示相应参数值 + //business.addProperty("nunum", 0); + //business.addProperty("ptt", 0);//标点符号 + //business.addProperty("rlang", "zh-hk"); // zh-cn :简体中文（默认值）zh-hk :繁体香港(若未授权不生效，在控制台可免费开通) + //business.addProperty("vinfo", 1); + business.addProperty("dwa", "wpgs");//动态修正(若未授权不生效，在控制台可免费开通) + //business.addProperty("nbest", 5);// 句子多候选(若未授权不生效，在控制台可免费开通) + //business.addProperty("wbest", 3);// 词级多候选(若未授权不生效，在控制台可免费开通) + //填充data + data.addProperty("status", StatusFirstFrame); + data.addProperty("format", "audio/L16;rate=16000"); + // data.addProperty("encoding", "raw"); + data.addProperty("encoding", this.encoding); + data.addProperty("audio", + Base64.getEncoder().encodeToString(Arrays.copyOf(buffer, len))); + //填充frame + frame.add("common", common); + frame.add("business", business); + frame.add("data", data); + webSocket.send(frame.toString()); + status = StatusContinueFrame; // 发送完第一帧改变status 为 1 + break; + case StatusContinueFrame: //中间帧status = 1 + JsonObject frame1 = new JsonObject(); + JsonObject data1 = new JsonObject(); + data1.addProperty("status", StatusContinueFrame); + data1.addProperty("format", "audio/L16;rate=16000"); + data1.addProperty("encoding", this.encoding); + data1.addProperty("audio", + Base64.getEncoder().encodeToString(Arrays.copyOf(buffer, len))); + frame1.add("data", data1); + webSocket.send(frame1.toString()); + // log.info("send continue"); + break; + case StatusLastFrame: // 最后一帧音频status = 2 ，标志音频发送结束 + JsonObject frame2 = new JsonObject(); + JsonObject data2 = new JsonObject(); + data2.addProperty("status", StatusLastFrame); + data2.addProperty("audio", ""); + data2.addProperty("format", "audio/L16;rate=16000"); + // data2.addProperty("encoding", "raw"); + data2.addProperty("encoding", this.encoding); + frame2.add("data", data2); + webSocket.send(frame2.toString()); + log.info("sendlast"); + break end; + } + Thread.sleep(intervel); //模拟音频采样延时 + } + log.info("all data is send"); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + }).start(); + } + + @Override + public void onMessage(WebSocket webSocket, String text) { + super.onMessage(webSocket, text); + //log.info(text); + ResponseData resp = json.fromJson(text, ResponseData.class); + if (resp != null) { + if (resp.getCode() != 0) { + // log.info( "code=>" + resp.getCode() + " error=>" + resp.getMessage() + " sid=" + resp.getSid()); + // log.info( "错误码查询链接：https://www.xfyun.cn/document/error-code"); + result = AlitaResult.error(resp.getCode() + ":" + resp.getMessage()); + webSocket.close(1000, ""); + return; + } + if (resp.getData() != null) { + if (resp.getData().getResult() != null) { + Text te = resp.getData().getResult().getText(); + //log.info(te.toString()); + try { + decoder.decode(te); + log.debug("中间识别结果 ==》" + decoder.toString()); + } catch (Exception e) { + e.printStackTrace(); + } + } + if (resp.getData().getStatus() == 2) { + // todo resp.data.status ==2 说明数据全部返回完毕，可以关闭连接，释放资源 + // log.info("session end "); + dateEnd = new Date(); + log.info("开始-{},结束-{},耗时:{}", sdf.format(dateBegin), sdf.format(dateEnd), + (dateEnd.getTime() - dateBegin.getTime()) + "ms"); + String resultStr = decoder.toString(); + log.info("最终识别结果 ==》{},本次识别sid ==》{}", resultStr, resp.getSid()); + decoder.discard(); + webSocket.close(1000, ""); + result = AlitaResult.success(resultStr); + } else { + // todo 根据返回的数据处理 + } + } + } + } + + @Override + public void onFailure(WebSocket webSocket, Throwable t, Response response) { + super.onFailure(webSocket, t, response); + try { + if (null != response) { + int code = response.code(); + log.info("onFailure code:" + code); + log.info("onFailure body:" + response.body().string()); + if (101 != code) { + log.info("connection failed"); + webSocket.close(1000, ""); + } + } + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public static AlitaResult execute(InputStream is, XfProperties xfProperties) { + try { + // 构建鉴权url + String authUrl = getAuthUrl(xfProperties.getIatHostUrl(), xfProperties.getApiKey(), + xfProperties.getApiSecret()); + OkHttpClient client = new OkHttpClient.Builder().build(); + //将url中的 schema http://和https://分别替换为ws:// 和 wss:// + String url = authUrl.toString().replace("http://", "ws://").replace("https://", "wss://"); + Request request = new Request.Builder().url(url).build(); + WebIATWS webIATWS = new WebIATWS(is, xfProperties.getAppId()); + WebSocket webSocket = client.newWebSocket(request, webIATWS); + while (webIATWS.getResult() == null) { + // 未拿到结果等待 + Thread.sleep(1000l); + } + return webIATWS.getResult(); + } catch (Exception e) { + log.info("err ", e); + return AlitaResult.error("语音听写失败：{}", e.getMessage()); + } + + } + + public static String getAuthUrl(String hostUrl, String apiKey, String apiSecret) + throws Exception { + URL url = new URL(hostUrl); + SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US); + format.setTimeZone(TimeZone.getTimeZone("GMT")); + String date = format.format(new Date()); + StringBuilder builder = new StringBuilder("host: ").append(url.getHost()).append("\n").// + append("date: ").append(date).append("\n").// + append("GET ").append(url.getPath()).append(" HTTP/1.1"); + //log.info(builder); + Charset charset = Charset.forName("UTF-8"); + Mac mac = Mac.getInstance("hmacsha256"); + SecretKeySpec spec = new SecretKeySpec(apiSecret.getBytes(charset), "hmacsha256"); + mac.init(spec); + byte[] hexDigits = mac.doFinal(builder.toString().getBytes(charset)); + String sha = Base64.getEncoder().encodeToString(hexDigits); + + //log.info(sha); + String authorization = + String.format("api_key=\"%s\", algorithm=\"%s\", headers=\"%s\", signature=\"%s\"", apiKey, + "hmac-sha256", "host date request-line", sha); + //log.info(authorization); + HttpUrl httpUrl = HttpUrl.parse("https://" + url.getHost() + url.getPath()).newBuilder().// + addQueryParameter("authorization", + Base64.getEncoder().encodeToString(authorization.getBytes(charset))) + .// + addQueryParameter("date", date).// + addQueryParameter("host", url.getHost()).// + build(); + return httpUrl.toString(); + } + + public static class ResponseData { + private int code; + private String message; + private String sid; + private Data data; + + public int getCode() { + return code; + } + + public String getMessage() { + return this.message; + } + + public String getSid() { + return sid; + } + + public Data getData() { + return data; + } + } + public static class Data { + private int status; + private Result result; + + public int getStatus() { + return status; + } + + public Result getResult() { + return result; + } + } + public static class Result { + int bg; + int ed; + String pgs; + int[] rg; + int sn; + Ws[] ws; + boolean ls; + JsonObject vad; + + public Text getText() { + Text text = new Text(); + StringBuilder sb = new StringBuilder(); + for (Ws ws : this.ws) { + sb.append(ws.cw[0].w); + } + text.sn = this.sn; + text.text = sb.toString(); + text.sn = this.sn; + text.rg = this.rg; + text.pgs = this.pgs; + text.bg = this.bg; + text.ed = this.ed; + text.ls = this.ls; + text.vad = this.vad == null ? null : this.vad; + return text; + } + } + public static class Ws { + Cw[] cw; + int bg; + int ed; + } + public static class Cw { + int sc; + String w; + } + public static class Text { + int sn; + int bg; + int ed; + String text; + String pgs; + int[] rg; + boolean deleted; + boolean ls; + JsonObject vad; + + @Override + public String toString() { + return "Text{" + + "bg=" + bg + + ", ed=" + ed + + ", ls=" + ls + + ", sn=" + sn + + ", text='" + text + '\'' + + ", pgs=" + pgs + + ", rg=" + Arrays.toString(rg) + + ", deleted=" + deleted + + ", vad=" + (vad == null ? "null" : vad.getAsJsonArray("ws").toString()) + + '}'; + } + } + //解析返回数据，仅供参考 + public static class Decoder { + private Text[] texts; + private int defc = 10; + + public Decoder() { + this.texts = new Text[this.defc]; + } + + public synchronized void decode(Text text) { + if (text.sn >= this.defc) { + this.resize(); + } + if ("rpl".equals(text.pgs)) { + for (int i = text.rg[0]; i <= text.rg[1]; i++) { + this.texts[i].deleted = true; + } + } + this.texts[text.sn] = text; + } + + public String toString() { + StringBuilder sb = new StringBuilder(); + for (Text t : this.texts) { + if (t != null && !t.deleted) { + sb.append(t.text); + } + } + return sb.toString(); + } + + public void resize() { + int oc = this.defc; + this.defc <<= 1; + Text[] old = this.texts; + this.texts = new Text[this.defc]; + for (int i = 0; i < oc; i++) { + this.texts[i] = old[i]; + } + } + + public void discard() { + for (int i = 0; i < this.texts.length; i++) { + this.texts[i] = null; + } + } + } +} diff --git a/src/main/java/com/newyetai/sdk/xf/util/WebTtsWS.java b/src/main/java/com/senmesh/sdk/xf/util/WebTtsWS.java similarity index 93% rename from src/main/java/com/newyetai/sdk/xf/util/WebTtsWS.java rename to src/main/java/com/senmesh/sdk/xf/util/WebTtsWS.java index 14639bf..1be83f2 100644 --- a/src/main/java/com/newyetai/sdk/xf/util/WebTtsWS.java +++ b/src/main/java/com/senmesh/sdk/xf/util/WebTtsWS.java @@ -1,229 +1,224 @@ -package com.newyetai.sdk.xf.util; - -import java.io.ByteArrayInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.URL; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; -import java.util.Base64; -import java.util.Date; -import java.util.Locale; -import java.util.TimeZone; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; - -import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream; - -import com.google.gson.Gson; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.xf.config.XfProperties; -import com.newyetai.sdk.xf.dto.TtsReqDTO; - -import lombok.extern.slf4j.Slf4j; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import okhttp3.WebSocket; -import okhttp3.WebSocketListener; - -/** - * 语音合成流式 WebAPI 接口调用示例 接口文档（必看）：https://www.xfyun.cn/doc/tts/online_tts/API.html - * 发音人使用方式：登陆开放平台https://www.xfyun.cn/后，到控制台-我的应用-语音合成-添加试用或购买发音人，添加后即显示该发音人参数值 - * 错误码链接：https://www.xfyun.cn/document/error-code （code返回错误码时必看） - * 小语种需要传输小语种文本、使用小语种发音人vcn、tte=unicode以及修改文本编码方式 - * - * @author xlliu24 - */ -@Slf4j -public class WebTtsWS extends WebSocketListener { - public static final int StatusFirstFrame = 0; - public static final int StatusContinueFrame = 1; - public static final int StatusLastFrame = 2; - public static final String TTL_UTF8 = "UTF8"; - public static final String TTL_UNICODE = "UNICODE"; - - public static final Gson json = new Gson(); - // mp3格式 - private String encoding = "lame"; - private AlitaResult result; - - private String text; - private String appId; - OutputStream outputStream; - // 小语种必须使用UNICODE编码作为值 - private String tte; - // 发音人参数。到控制台-我的应用-语音合成-添加试用或购买发音人，添加后即显示该发音人参数值，若试用未添加的发音人会报错11200 - private String vcn; - - WebTtsWS(String text, String appId, String vcn, String tte, OutputStream outputStream){ - this.text = text; - this.appId = appId; - this.vcn = vcn; - this.tte = tte; - this.outputStream = outputStream; - } - - public AlitaResult getResult() { - return result; - } - - - @Override - public void onOpen(WebSocket webSocket, Response response) { - super.onOpen(webSocket, response); - log.info("ws建立连接成功..."); - String requestJson;//请求参数json串 - String encodedText ; - if (WebTtsWS.TTL_UNICODE.equals(tte)) { - try { - encodedText = Base64.getEncoder().encodeToString(text.getBytes("UTF-16LE")); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } else { - encodedText = Base64.getEncoder().encodeToString(text.getBytes(StandardCharsets.UTF_8)); - } - requestJson = "{\n" + - " \"common\": {\n" + - " \"app_id\": \"" + appId + "\"\n" + - " },\n" + - " \"business\": {\n" + - " \"aue\": \"lame\",\n" + - " \"sfl\": 1,\n" + - " \"tte\": \"" + tte + "\",\n" + - " \"ent\": \"intp65\",\n" + - " \"vcn\": \"" + vcn + "\",\n" + - " \"pitch\": 50,\n" + - " \"speed\": 50\n" + - " },\n" + - " \"data\": {\n" + - " \"status\": 2,\n" + - " \"text\": \"" - + encodedText + "\"\n" + - " }\n" + - "}"; - webSocket.send(requestJson); - } - - @Override - public void onMessage(WebSocket webSocket, String text) { - super.onMessage(webSocket, text); - JsonParse myJsonParse = json.fromJson(text, JsonParse.class); - if (myJsonParse.code != 0) { - log.info("发生错误，错误码为：" + myJsonParse.code); - log.info("本次请求的sid为：" + myJsonParse.sid); - result = AlitaResult.error(myJsonParse.code + ":" + myJsonParse.sid); - webSocket.close(1000, ""); - return; - } - if (myJsonParse.data != null) { - try { - byte[] textBase64Decode = Base64.getDecoder().decode(myJsonParse.data.audio); - outputStream.write(textBase64Decode); - outputStream.flush(); - log.info("本次请求的状态==>" + myJsonParse.data.status); - } catch (Exception e) { - e.printStackTrace(); - } - if (myJsonParse.data.status == 2) { - result = AlitaResult.success(); - log.info("本次请求的sid==>" + myJsonParse.sid); - // 可以关闭连接，释放资源 - webSocket.close(1000, ""); - } - } - - } - - @Override - public void onFailure(WebSocket webSocket, Throwable t, Response response) { - super.onFailure(webSocket, t, response); - try { - if (null != response) { - int code = response.code(); - log.info("onFailure code:" + code); - log.info("onFailure body:" + response.body().string()); - if (101 != code) { - log.info("connection failed"); - webSocket.close(1000, ""); - } - } - } catch (IOException e) { - log.info("failure:", e); - } - } - - public static AlitaResult execute(TtsReqDTO ttsReq, XfProperties xfProperties, OutputStream outputStream) { - try { - // 构建鉴权url - String authUrl = getAuthUrl(xfProperties.getTtsHostUrl(), xfProperties.getApiKey(), - xfProperties.getApiSecret()); - OkHttpClient client = new OkHttpClient.Builder().build(); - //将url中的 schema http://和https://分别替换为ws:// 和 wss:// - String url = authUrl.toString().replace("http://", "ws://").replace("https://", "wss://"); - Request request = new Request.Builder().url(url).build(); - WebTtsWS webIATWS = new WebTtsWS(ttsReq.getText(), xfProperties.getAppId(), ttsReq.getVcn(), ttsReq.getTte(), outputStream); - WebSocket webSocket = client.newWebSocket(request, webIATWS); - while (webIATWS.result == null) { - // 未拿到结果等待 - Thread.sleep(1000l); - } - return AlitaResult.success(); - } catch (Exception e) { - log.info("err ", e); - return AlitaResult.error("语音合成失败：{}", e.getMessage()); - } - } - - public static String getAuthUrl(String hostUrl, String apiKey, String apiSecret) - throws Exception { - URL url = new URL(hostUrl); - SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US); - format.setTimeZone(TimeZone.getTimeZone("GMT")); - String date = format.format(new Date()); - StringBuilder builder = new StringBuilder("host: ").append(url.getHost()).append("\n").// - append("date: ").append(date).append("\n").// - append("GET ").append(url.getPath()).append(" HTTP/1.1"); - //log.info(builder); - Charset charset = Charset.forName("UTF-8"); - Mac mac = Mac.getInstance("hmacsha256"); - SecretKeySpec spec = new SecretKeySpec(apiSecret.getBytes(charset), "hmacsha256"); - mac.init(spec); - byte[] hexDigits = mac.doFinal(builder.toString().getBytes(charset)); - String sha = Base64.getEncoder().encodeToString(hexDigits); - - //log.info(sha); - String authorization = - String.format("api_key=\"%s\", algorithm=\"%s\", headers=\"%s\", signature=\"%s\"", apiKey, - "hmac-sha256", "host date request-line", sha); - //log.info(authorization); - HttpUrl httpUrl = HttpUrl.parse("https://" + url.getHost() + url.getPath()).newBuilder().// - addQueryParameter("authorization", - Base64.getEncoder().encodeToString(authorization.getBytes(charset))) - .// - addQueryParameter("date", date).// - addQueryParameter("host", url.getHost()).// - build(); - return httpUrl.toString(); - } - -//返回的json结果拆解 - class JsonParse { - int code; - String sid; - Data data; - } - - class Data { - int status; - String audio; -} - -} +package com.senmesh.sdk.xf.util; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URL; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.text.SimpleDateFormat; +import java.util.Base64; +import java.util.Date; +import java.util.Locale; +import java.util.TimeZone; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; + +import com.google.gson.Gson; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.xf.config.XfProperties; +import com.senmesh.sdk.xf.dto.TtsReqDTO; + +import lombok.extern.slf4j.Slf4j; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.WebSocket; +import okhttp3.WebSocketListener; + +/** + * 语音合成流式 WebAPI 接口调用示例 接口文档（必看）：https://www.xfyun.cn/doc/tts/online_tts/API.html + * 发音人使用方式：登陆开放平台https://www.xfyun.cn/后，到控制台-我的应用-语音合成-添加试用或购买发音人，添加后即显示该发音人参数值 + * 错误码链接：https://www.xfyun.cn/document/error-code （code返回错误码时必看） + * 小语种需要传输小语种文本、使用小语种发音人vcn、tte=unicode以及修改文本编码方式 + * + * @author xlliu24 + */ +@Slf4j +public class WebTtsWS extends WebSocketListener { + public static final int StatusFirstFrame = 0; + public static final int StatusContinueFrame = 1; + public static final int StatusLastFrame = 2; + public static final String TTL_UTF8 = "UTF8"; + public static final String TTL_UNICODE = "UNICODE"; + + public static final Gson json = new Gson(); + // mp3格式 + private String encoding = "lame"; + private AlitaResult result; + + private String text; + private String appId; + OutputStream outputStream; + // 小语种必须使用UNICODE编码作为值 + private String tte; + // 发音人参数。到控制台-我的应用-语音合成-添加试用或购买发音人，添加后即显示该发音人参数值，若试用未添加的发音人会报错11200 + private String vcn; + + WebTtsWS(String text, String appId, String vcn, String tte, OutputStream outputStream){ + this.text = text; + this.appId = appId; + this.vcn = vcn; + this.tte = tte; + this.outputStream = outputStream; + } + + public AlitaResult getResult() { + return result; + } + + + @Override + public void onOpen(WebSocket webSocket, Response response) { + super.onOpen(webSocket, response); + log.info("ws建立连接成功..."); + String requestJson;//请求参数json串 + String encodedText ; + if (WebTtsWS.TTL_UNICODE.equals(tte)) { + try { + encodedText = Base64.getEncoder().encodeToString(text.getBytes("UTF-16LE")); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e); + } + } else { + encodedText = Base64.getEncoder().encodeToString(text.getBytes(StandardCharsets.UTF_8)); + } + requestJson = "{\n" + + " \"common\": {\n" + + " \"app_id\": \"" + appId + "\"\n" + + " },\n" + + " \"business\": {\n" + + " \"aue\": \"lame\",\n" + + " \"sfl\": 1,\n" + + " \"tte\": \"" + tte + "\",\n" + + " \"ent\": \"intp65\",\n" + + " \"vcn\": \"" + vcn + "\",\n" + + " \"pitch\": 50,\n" + + " \"speed\": 50\n" + + " },\n" + + " \"data\": {\n" + + " \"status\": 2,\n" + + " \"text\": \"" + + encodedText + "\"\n" + + " }\n" + + "}"; + webSocket.send(requestJson); + } + + @Override + public void onMessage(WebSocket webSocket, String text) { + super.onMessage(webSocket, text); + JsonParse myJsonParse = json.fromJson(text, JsonParse.class); + if (myJsonParse.code != 0) { + log.info("发生错误，错误码为：" + myJsonParse.code); + log.info("本次请求的sid为：" + myJsonParse.sid); + result = AlitaResult.error(myJsonParse.code + ":" + myJsonParse.sid); + webSocket.close(1000, ""); + return; + } + if (myJsonParse.data != null) { + try { + byte[] textBase64Decode = Base64.getDecoder().decode(myJsonParse.data.audio); + outputStream.write(textBase64Decode); + outputStream.flush(); + log.info("本次请求的状态==>" + myJsonParse.data.status); + } catch (Exception e) { + e.printStackTrace(); + } + if (myJsonParse.data.status == 2) { + result = AlitaResult.success(); + log.info("本次请求的sid==>" + myJsonParse.sid); + // 可以关闭连接，释放资源 + webSocket.close(1000, ""); + } + } + + } + + @Override + public void onFailure(WebSocket webSocket, Throwable t, Response response) { + super.onFailure(webSocket, t, response); + try { + if (null != response) { + int code = response.code(); + log.info("onFailure code:" + code); + log.info("onFailure body:" + response.body().string()); + if (101 != code) { + log.info("connection failed"); + webSocket.close(1000, ""); + } + } + } catch (IOException e) { + log.info("failure:", e); + } + } + + public static AlitaResult execute(TtsReqDTO ttsReq, XfProperties xfProperties, OutputStream outputStream) { + try { + // 构建鉴权url + String authUrl = getAuthUrl(xfProperties.getTtsHostUrl(), xfProperties.getApiKey(), + xfProperties.getApiSecret()); + OkHttpClient client = new OkHttpClient.Builder().build(); + //将url中的 schema http://和https://分别替换为ws:// 和 wss:// + String url = authUrl.toString().replace("http://", "ws://").replace("https://", "wss://"); + Request request = new Request.Builder().url(url).build(); + WebTtsWS webIATWS = new WebTtsWS(ttsReq.getText(), xfProperties.getAppId(), ttsReq.getVcn(), ttsReq.getTte(), outputStream); + WebSocket webSocket = client.newWebSocket(request, webIATWS); + while (webIATWS.result == null) { + // 未拿到结果等待 + Thread.sleep(1000l); + } + return AlitaResult.success(); + } catch (Exception e) { + log.info("err ", e); + return AlitaResult.error("语音合成失败：{}", e.getMessage()); + } + } + + public static String getAuthUrl(String hostUrl, String apiKey, String apiSecret) + throws Exception { + URL url = new URL(hostUrl); + SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US); + format.setTimeZone(TimeZone.getTimeZone("GMT")); + String date = format.format(new Date()); + StringBuilder builder = new StringBuilder("host: ").append(url.getHost()).append("\n").// + append("date: ").append(date).append("\n").// + append("GET ").append(url.getPath()).append(" HTTP/1.1"); + //log.info(builder); + Charset charset = Charset.forName("UTF-8"); + Mac mac = Mac.getInstance("hmacsha256"); + SecretKeySpec spec = new SecretKeySpec(apiSecret.getBytes(charset), "hmacsha256"); + mac.init(spec); + byte[] hexDigits = mac.doFinal(builder.toString().getBytes(charset)); + String sha = Base64.getEncoder().encodeToString(hexDigits); + + //log.info(sha); + String authorization = + String.format("api_key=\"%s\", algorithm=\"%s\", headers=\"%s\", signature=\"%s\"", apiKey, + "hmac-sha256", "host date request-line", sha); + //log.info(authorization); + HttpUrl httpUrl = HttpUrl.parse("https://" + url.getHost() + url.getPath()).newBuilder().// + addQueryParameter("authorization", + Base64.getEncoder().encodeToString(authorization.getBytes(charset))) + .// + addQueryParameter("date", date).// + addQueryParameter("host", url.getHost()).// + build(); + return httpUrl.toString(); + } + +//返回的json结果拆解 + class JsonParse { + int code; + String sid; + Data data; + } + + class Data { + int status; + String audio; +} + +} diff --git a/src/main/java/com/newyetai/sdk/xf/util/XfUtils.java b/src/main/java/com/senmesh/sdk/xf/util/XfUtils.java similarity index 92% rename from src/main/java/com/newyetai/sdk/xf/util/XfUtils.java rename to src/main/java/com/senmesh/sdk/xf/util/XfUtils.java index 95d0fff..31d0af7 100644 --- a/src/main/java/com/newyetai/sdk/xf/util/XfUtils.java +++ b/src/main/java/com/senmesh/sdk/xf/util/XfUtils.java @@ -1,8 +1,8 @@ -package com.newyetai.sdk.xf.util; +package com.senmesh.sdk.xf.util; -import com.newyetai.sdk.xf.dto.RtasrReqDTO; -import com.newyetai.sdk.xf.model.TranslateReq; -import com.newyetai.sdk.xf.service.RtasrClientApp; +import com.senmesh.sdk.xf.dto.RtasrReqDTO; +import com.senmesh.sdk.xf.model.TranslateReq; +import com.senmesh.sdk.xf.service.RtasrClientApp; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -10,22 +10,22 @@ import java.io.InputStream; import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream; import org.springframework.stereotype.Component; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.component.file.entity.FileRecord; -import com.newyetai.component.file.service.FileRecordService; -import com.newyetai.component.file.service.FileService; -import com.newyetai.component.file.util.FileUtils; -import com.newyetai.config.service.ConfigService; -import com.newyetai.sdk.xf.config.XfProperties; -import com.newyetai.sdk.xf.dto.InterviewContentDTO; -import com.newyetai.sdk.xf.dto.TtsReqDTO; -import com.newyetai.sdk.xf.model.ChatReq; -import com.newyetai.sdk.xf.model.MessageDTO; -import com.newyetai.sdk.xf.service.XfSparkProvider; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.component.file.entity.FileRecord; +import com.senmesh.component.file.service.FileRecordService; +import com.senmesh.component.file.service.FileService; +import com.senmesh.component.file.util.FileUtils; +import com.senmesh.config.service.ConfigService; +import com.senmesh.sdk.xf.config.XfProperties; +import com.senmesh.sdk.xf.dto.InterviewContentDTO; +import com.senmesh.sdk.xf.dto.TtsReqDTO; +import com.senmesh.sdk.xf.model.ChatReq; +import com.senmesh.sdk.xf.model.MessageDTO; +import com.senmesh.sdk.xf.service.XfSparkProvider; @Component public class XfUtils { diff --git a/src/main/java/com/newyetai/security/access/intercept/FilterSecurityInterceptor.java b/src/main/java/com/senmesh/security/access/intercept/FilterSecurityInterceptor.java similarity index 91% rename from src/main/java/com/newyetai/security/access/intercept/FilterSecurityInterceptor.java rename to src/main/java/com/senmesh/security/access/intercept/FilterSecurityInterceptor.java index e942497..2466347 100644 --- a/src/main/java/com/newyetai/security/access/intercept/FilterSecurityInterceptor.java +++ b/src/main/java/com/senmesh/security/access/intercept/FilterSecurityInterceptor.java @@ -12,7 +12,7 @@ * the License. */ -package com.newyetai.security.access.intercept; +package com.senmesh.security.access.intercept; import java.io.IOException; @@ -25,7 +25,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.SecurityMetadataSource; import org.springframework.security.access.intercept.AbstractSecurityInterceptor; import org.springframework.security.access.intercept.InterceptorStatusToken; @@ -36,17 +35,14 @@ import org.springframework.security.web.access.intercept.FilterInvocationSecurit import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ResponseUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.security.access.request.AuthDtoUtils; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.util.SecurityPropertyUtils; -import com.newyetai.security.util.SecurityUtils; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ResponseUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.security.access.request.AuthDtoUtils; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.util.SecurityPropertyUtils; +import com.senmesh.usercenter.user.login.service.UserLoginService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/access/metadata/ResourceSecurityMetadataSource.java b/src/main/java/com/senmesh/security/access/metadata/ResourceSecurityMetadataSource.java similarity index 86% rename from src/main/java/com/newyetai/security/access/metadata/ResourceSecurityMetadataSource.java rename to src/main/java/com/senmesh/security/access/metadata/ResourceSecurityMetadataSource.java index 8b32444..cc022d2 100644 --- a/src/main/java/com/newyetai/security/access/metadata/ResourceSecurityMetadataSource.java +++ b/src/main/java/com/senmesh/security/access/metadata/ResourceSecurityMetadataSource.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.metadata; +package com.senmesh.security.access.metadata; import java.util.Collection; import java.util.Collections; @@ -11,10 +11,9 @@ import org.springframework.security.access.ConfigAttribute; import org.springframework.stereotype.Component; import com.google.common.collect.Maps; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.security.access.provider.ResourceConfigAttributeProvider; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.dto.Resource; +import com.senmesh.security.access.provider.ResourceConfigAttributeProvider; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.dto.Resource; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/newyetai/security/access/metadata/UrlFilterInvocationSecurityMetadataSource.java b/src/main/java/com/senmesh/security/access/metadata/UrlFilterInvocationSecurityMetadataSource.java similarity index 90% rename from src/main/java/com/newyetai/security/access/metadata/UrlFilterInvocationSecurityMetadataSource.java rename to src/main/java/com/senmesh/security/access/metadata/UrlFilterInvocationSecurityMetadataSource.java index 2ad5e71..d665435 100644 --- a/src/main/java/com/newyetai/security/access/metadata/UrlFilterInvocationSecurityMetadataSource.java +++ b/src/main/java/com/senmesh/security/access/metadata/UrlFilterInvocationSecurityMetadataSource.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.metadata; +package com.senmesh.security.access.metadata; import java.util.Collection; import java.util.Collections; @@ -15,9 +15,9 @@ import org.springframework.security.web.access.intercept.FilterInvocationSecurit import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.security.access.provider.FilterConfigAttributeProvider; -import com.newyetai.security.access.request.AuthDtoUtils; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.security.access.provider.FilterConfigAttributeProvider; +import com.senmesh.security.access.request.AuthDtoUtils; /** * 菜单安全元数据源 diff --git a/src/main/java/com/newyetai/security/access/provider/FilterConfigAttributeProvider.java b/src/main/java/com/senmesh/security/access/provider/FilterConfigAttributeProvider.java similarity index 75% rename from src/main/java/com/newyetai/security/access/provider/FilterConfigAttributeProvider.java rename to src/main/java/com/senmesh/security/access/provider/FilterConfigAttributeProvider.java index c7f2f2a..8b03915 100644 --- a/src/main/java/com/newyetai/security/access/provider/FilterConfigAttributeProvider.java +++ b/src/main/java/com/senmesh/security/access/provider/FilterConfigAttributeProvider.java @@ -1,11 +1,8 @@ -package com.newyetai.security.access.provider; +package com.senmesh.security.access.provider; import java.util.Collection; import java.util.Map; import org.springframework.security.access.ConfigAttribute; -import org.springframework.security.web.util.matcher.RequestMatcher; - -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; /** * 访问菜单权限信息提供者 diff --git a/src/main/java/com/newyetai/security/access/provider/GrantedAuthorityProvider.java b/src/main/java/com/senmesh/security/access/provider/GrantedAuthorityProvider.java similarity index 83% rename from src/main/java/com/newyetai/security/access/provider/GrantedAuthorityProvider.java rename to src/main/java/com/senmesh/security/access/provider/GrantedAuthorityProvider.java index e5d8f0b..9fda38d 100644 --- a/src/main/java/com/newyetai/security/access/provider/GrantedAuthorityProvider.java +++ b/src/main/java/com/senmesh/security/access/provider/GrantedAuthorityProvider.java @@ -1,10 +1,10 @@ -package com.newyetai.security.access.provider; +package com.senmesh.security.access.provider; import java.util.Collection; import org.springframework.security.core.GrantedAuthority; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.dto.IUserDetail; /** * 授权信息提供者 diff --git a/src/main/java/com/newyetai/security/access/provider/IConfigAttribute.java b/src/main/java/com/senmesh/security/access/provider/IConfigAttribute.java similarity index 87% rename from src/main/java/com/newyetai/security/access/provider/IConfigAttribute.java rename to src/main/java/com/senmesh/security/access/provider/IConfigAttribute.java index ff90956..58e77c2 100644 --- a/src/main/java/com/newyetai/security/access/provider/IConfigAttribute.java +++ b/src/main/java/com/senmesh/security/access/provider/IConfigAttribute.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.provider; +package com.senmesh.security.access.provider; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/security/access/provider/IUrlConfigAttribute.java b/src/main/java/com/senmesh/security/access/provider/IUrlConfigAttribute.java similarity index 82% rename from src/main/java/com/newyetai/security/access/provider/IUrlConfigAttribute.java rename to src/main/java/com/senmesh/security/access/provider/IUrlConfigAttribute.java index 90e71e9..a8e6cbd 100644 --- a/src/main/java/com/newyetai/security/access/provider/IUrlConfigAttribute.java +++ b/src/main/java/com/senmesh/security/access/provider/IUrlConfigAttribute.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.provider; +package com.senmesh.security.access.provider; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/security/access/provider/ResourceConfigAttributeProvider.java b/src/main/java/com/senmesh/security/access/provider/ResourceConfigAttributeProvider.java similarity index 91% rename from src/main/java/com/newyetai/security/access/provider/ResourceConfigAttributeProvider.java rename to src/main/java/com/senmesh/security/access/provider/ResourceConfigAttributeProvider.java index 0d7aadb..e51095b 100644 --- a/src/main/java/com/newyetai/security/access/provider/ResourceConfigAttributeProvider.java +++ b/src/main/java/com/senmesh/security/access/provider/ResourceConfigAttributeProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.provider; +package com.senmesh.security.access.provider; import java.io.Serializable; import java.util.Collection; @@ -7,7 +7,7 @@ import java.util.Map; import java.util.stream.Collectors; import com.google.common.collect.Sets; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; /** * 资源权限信息提供者 diff --git a/src/main/java/com/newyetai/security/access/provider/impl/ComponentConfigAttributeProvider.java b/src/main/java/com/senmesh/security/access/provider/impl/ComponentConfigAttributeProvider.java similarity index 68% rename from src/main/java/com/newyetai/security/access/provider/impl/ComponentConfigAttributeProvider.java rename to src/main/java/com/senmesh/security/access/provider/impl/ComponentConfigAttributeProvider.java index fb26058..438fd7a 100644 --- a/src/main/java/com/newyetai/security/access/provider/impl/ComponentConfigAttributeProvider.java +++ b/src/main/java/com/senmesh/security/access/provider/impl/ComponentConfigAttributeProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.provider.impl; +package com.senmesh.security.access.provider.impl; import java.util.List; @@ -7,12 +7,12 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.newyetai.security.access.provider.ResourceConfigAttributeProvider; -import com.newyetai.usercenter.authority.dto.ComponentPermissionDTO; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.authority.service.UcPermissionService; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.resource.dto.ComponentDTO; +import com.senmesh.security.access.provider.ResourceConfigAttributeProvider; +import com.senmesh.usercenter.authority.dto.ComponentPermissionDTO; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.authority.service.UcPermissionService; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.resource.dto.ComponentDTO; /** * 默认组件权限信息提供者 diff --git a/src/main/java/com/newyetai/security/access/provider/impl/UrlConfigAttributeProvider.java b/src/main/java/com/senmesh/security/access/provider/impl/UrlConfigAttributeProvider.java similarity index 68% rename from src/main/java/com/newyetai/security/access/provider/impl/UrlConfigAttributeProvider.java rename to src/main/java/com/senmesh/security/access/provider/impl/UrlConfigAttributeProvider.java index 05ab77f..b701c5b 100644 --- a/src/main/java/com/newyetai/security/access/provider/impl/UrlConfigAttributeProvider.java +++ b/src/main/java/com/senmesh/security/access/provider/impl/UrlConfigAttributeProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.provider.impl; +package com.senmesh.security.access.provider.impl; import java.util.List; @@ -7,12 +7,12 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.newyetai.security.access.provider.ResourceConfigAttributeProvider; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.authority.dto.UrlPermissionDTO; -import com.newyetai.usercenter.authority.service.UcPermissionService; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.resource.dto.UrlDTO; +import com.senmesh.security.access.provider.ResourceConfigAttributeProvider; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.authority.dto.UrlPermissionDTO; +import com.senmesh.usercenter.authority.service.UcPermissionService; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.resource.dto.UrlDTO; /** * 默认菜单权限信息提供者 diff --git a/src/main/java/com/newyetai/security/access/provider/impl/UrlFilterConfigAttribueProvider.java b/src/main/java/com/senmesh/security/access/provider/impl/UrlFilterConfigAttribueProvider.java similarity index 76% rename from src/main/java/com/newyetai/security/access/provider/impl/UrlFilterConfigAttribueProvider.java rename to src/main/java/com/senmesh/security/access/provider/impl/UrlFilterConfigAttribueProvider.java index e74b888..e273968 100644 --- a/src/main/java/com/newyetai/security/access/provider/impl/UrlFilterConfigAttribueProvider.java +++ b/src/main/java/com/senmesh/security/access/provider/impl/UrlFilterConfigAttribueProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.provider.impl; +package com.senmesh.security.access.provider.impl; import java.util.Collection; import java.util.HashSet; @@ -13,14 +13,14 @@ import org.springframework.core.annotation.Order; import org.springframework.security.access.ConfigAttribute; import org.springframework.stereotype.Component; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.security.access.provider.FilterConfigAttributeProvider; -import com.newyetai.security.service.IPermissionSecurityService; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.authority.dto.UrlPermissionDTO; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.resource.enums.UrlTypeEnum; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.security.access.provider.FilterConfigAttributeProvider; +import com.senmesh.security.service.IPermissionSecurityService; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.authority.dto.UrlPermissionDTO; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.resource.enums.UrlTypeEnum; /** * 默认菜单权限信息提供者 diff --git a/src/main/java/com/newyetai/security/access/provider/impl/UserGrantedAuthorityProvider.java b/src/main/java/com/senmesh/security/access/provider/impl/UserGrantedAuthorityProvider.java similarity index 68% rename from src/main/java/com/newyetai/security/access/provider/impl/UserGrantedAuthorityProvider.java rename to src/main/java/com/senmesh/security/access/provider/impl/UserGrantedAuthorityProvider.java index f15cbd9..118d298 100644 --- a/src/main/java/com/newyetai/security/access/provider/impl/UserGrantedAuthorityProvider.java +++ b/src/main/java/com/senmesh/security/access/provider/impl/UserGrantedAuthorityProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.provider.impl; +package com.senmesh.security.access.provider.impl; import java.util.Collection; import java.util.List; @@ -8,13 +8,13 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Component; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.security.access.provider.GrantedAuthorityProvider; -import com.newyetai.security.service.IRoleAllocationSecurityService; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.security.access.provider.GrantedAuthorityProvider; +import com.senmesh.security.service.IRoleAllocationSecurityService; +import com.senmesh.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.dto.IUserDetail; /** * 默认用户授权信息提供者 diff --git a/src/main/java/com/newyetai/security/access/request/AuthDTO.java b/src/main/java/com/senmesh/security/access/request/AuthDTO.java similarity index 90% rename from src/main/java/com/newyetai/security/access/request/AuthDTO.java rename to src/main/java/com/senmesh/security/access/request/AuthDTO.java index 6082107..d4cb992 100644 --- a/src/main/java/com/newyetai/security/access/request/AuthDTO.java +++ b/src/main/java/com/senmesh/security/access/request/AuthDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.request; +package com.senmesh.security.access.request; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/security/access/request/AuthDtoUtils.java b/src/main/java/com/senmesh/security/access/request/AuthDtoUtils.java similarity index 93% rename from src/main/java/com/newyetai/security/access/request/AuthDtoUtils.java rename to src/main/java/com/senmesh/security/access/request/AuthDtoUtils.java index 13b23c6..a3ae239 100644 --- a/src/main/java/com/newyetai/security/access/request/AuthDtoUtils.java +++ b/src/main/java/com/senmesh/security/access/request/AuthDtoUtils.java @@ -1,10 +1,10 @@ -package com.newyetai.security.access.request; +package com.senmesh.security.access.request; import javax.servlet.http.HttpServletRequest; import org.springframework.security.web.FilterInvocation; -import com.newyetai.common.util.EnvironmentUtils; +import com.senmesh.common.util.EnvironmentUtils; /** * @author sr on 2020-09-10 diff --git a/src/main/java/com/newyetai/security/access/vote/AccessDecisionManagerImpl.java b/src/main/java/com/senmesh/security/access/vote/AccessDecisionManagerImpl.java similarity index 94% rename from src/main/java/com/newyetai/security/access/vote/AccessDecisionManagerImpl.java rename to src/main/java/com/senmesh/security/access/vote/AccessDecisionManagerImpl.java index 8d83c37..b82e47b 100644 --- a/src/main/java/com/newyetai/security/access/vote/AccessDecisionManagerImpl.java +++ b/src/main/java/com/senmesh/security/access/vote/AccessDecisionManagerImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.security.access.vote; +package com.senmesh.security.access.vote; import java.util.Collection; import java.util.List; @@ -12,8 +12,8 @@ import org.springframework.security.authentication.InsufficientAuthenticationExc import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.newyetai.security.config.SecurityProperties; -import com.newyetai.security.dto.SecurityUserDTO; +import com.senmesh.security.config.SecurityProperties; +import com.senmesh.security.dto.SecurityUserDTO; /** * 默认访问决策管理器 diff --git a/src/main/java/com/newyetai/security/access/vote/ResourceRoleVoter.java b/src/main/java/com/senmesh/security/access/vote/ResourceRoleVoter.java similarity index 93% rename from src/main/java/com/newyetai/security/access/vote/ResourceRoleVoter.java rename to src/main/java/com/senmesh/security/access/vote/ResourceRoleVoter.java index 47a14e3..5b896a5 100644 --- a/src/main/java/com/newyetai/security/access/vote/ResourceRoleVoter.java +++ b/src/main/java/com/senmesh/security/access/vote/ResourceRoleVoter.java @@ -12,7 +12,7 @@ * the License. */ -package com.newyetai.security.access.vote; +package com.senmesh.security.access.vote; import java.util.Collection; @@ -24,9 +24,9 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.web.FilterInvocation; import org.springframework.stereotype.Component; -import com.newyetai.security.service.GrantedAuthorityService; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.dto.Resource; +import com.senmesh.security.service.GrantedAuthorityService; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.dto.Resource; /** * 资源角色投票器 重写RoleVoter，获取用户授权信息authorities方式更改 diff --git a/src/main/java/com/newyetai/security/cas/CasAuthenticationToken.java b/src/main/java/com/senmesh/security/cas/CasAuthenticationToken.java similarity index 97% rename from src/main/java/com/newyetai/security/cas/CasAuthenticationToken.java rename to src/main/java/com/senmesh/security/cas/CasAuthenticationToken.java index 3491e0e..c6bcbd1 100644 --- a/src/main/java/com/newyetai/security/cas/CasAuthenticationToken.java +++ b/src/main/java/com/senmesh/security/cas/CasAuthenticationToken.java @@ -1,4 +1,4 @@ -package com.newyetai.security.cas; +package com.senmesh.security.cas; import java.util.Collection; diff --git a/src/main/java/com/newyetai/security/config/SecurityConfiguration.java b/src/main/java/com/senmesh/security/config/SecurityConfiguration.java similarity index 78% rename from src/main/java/com/newyetai/security/config/SecurityConfiguration.java rename to src/main/java/com/senmesh/security/config/SecurityConfiguration.java index c4bdfd8..8b52ff7 100644 --- a/src/main/java/com/newyetai/security/config/SecurityConfiguration.java +++ b/src/main/java/com/senmesh/security/config/SecurityConfiguration.java @@ -1,6 +1,6 @@ -package com.newyetai.security.config; +package com.senmesh.security.config; -import com.newyetai.security.ucard.UcardAuthenticationProvider; +import com.senmesh.security.ucard.UcardAuthenticationProvider; import org.springframework.boot.autoconfigure.AutoConfigurationPackage; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -9,16 +9,16 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; -import com.newyetai.security.handle.MyAuthenctiationFailureHandler; -import com.newyetai.security.mobile.MobileAuthenticationProvider; -import com.newyetai.security.social.service.StandardClientRegistrationRepository; -import com.newyetai.security.social.wechat.service.WechatOauthLoginProvider; -import com.newyetai.security.ssb.SsbAuthenticationProvider; -import com.newyetai.security.temptoken.TokenAuthenticationProvider; -import com.newyetai.security.upassword.UpasswordAuthenticationProvider; -import com.newyetai.security.util.SecurityPropertyUtils; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.security.handle.MyAuthenctiationFailureHandler; +import com.senmesh.security.mobile.MobileAuthenticationProvider; +import com.senmesh.security.social.service.StandardClientRegistrationRepository; +import com.senmesh.security.social.wechat.service.WechatOauthLoginProvider; +import com.senmesh.security.ssb.SsbAuthenticationProvider; +import com.senmesh.security.temptoken.TokenAuthenticationProvider; +import com.senmesh.security.upassword.UpasswordAuthenticationProvider; +import com.senmesh.security.util.SecurityPropertyUtils; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.user.login.service.UserLoginService; /** * security配置类 diff --git a/src/main/java/com/newyetai/security/config/SecurityProperties.java b/src/main/java/com/senmesh/security/config/SecurityProperties.java similarity index 95% rename from src/main/java/com/newyetai/security/config/SecurityProperties.java rename to src/main/java/com/senmesh/security/config/SecurityProperties.java index cff5481..a9f8aee 100644 --- a/src/main/java/com/newyetai/security/config/SecurityProperties.java +++ b/src/main/java/com/senmesh/security/config/SecurityProperties.java @@ -1,6 +1,6 @@ -package com.newyetai.security.config; +package com.senmesh.security.config; -import com.newyetai.security.jwt.JwtProperties; +import com.senmesh.security.jwt.JwtProperties; import lombok.Data; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/security/config/WebSecurityConfigurer.java b/src/main/java/com/senmesh/security/config/WebSecurityConfigurer.java similarity index 85% rename from src/main/java/com/newyetai/security/config/WebSecurityConfigurer.java rename to src/main/java/com/senmesh/security/config/WebSecurityConfigurer.java index 8a68d55..4559e66 100644 --- a/src/main/java/com/newyetai/security/config/WebSecurityConfigurer.java +++ b/src/main/java/com/senmesh/security/config/WebSecurityConfigurer.java @@ -1,7 +1,7 @@ -package com.newyetai.security.config; +package com.senmesh.security.config; -import com.newyetai.security.ucard.UcardAuthenticationFilter; -import com.newyetai.security.ucard.UcardAuthenticationProvider; +import com.senmesh.security.ucard.UcardAuthenticationFilter; +import com.senmesh.security.ucard.UcardAuthenticationProvider; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -20,26 +20,26 @@ import org.springframework.security.web.authentication.AnonymousAuthenticationFi import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.stereotype.Component; -import com.newyetai.security.access.intercept.FilterSecurityInterceptor; -import com.newyetai.security.handle.MyAuthenctiationFailureHandler; -import com.newyetai.security.handle.MyLoginSuccessHandler; -import com.newyetai.security.handle.MyLoginUrlAuthenticationEntryPoint; -import com.newyetai.security.handle.MyLogoutSuccessHandler; -import com.newyetai.security.jwt.JwtAuthenticationTokenFilter; -import com.newyetai.security.mobile.MobileAuthenticationFilter; -import com.newyetai.security.mobile.MobileAuthenticationProvider; -import com.newyetai.security.social.service.StandardAuthorizationCodeTokenResponseClient; -import com.newyetai.security.social.service.StandardOAuth2UserService; -import com.newyetai.security.social.service.StandardOauth2AuthorizationRequestResolver; -import com.newyetai.security.ssb.SsbAuthenticationFilter; -import com.newyetai.security.ssb.SsbAuthenticationProvider; -import com.newyetai.security.temptoken.TokenAuthenticationFilter; -import com.newyetai.security.temptoken.TokenAuthenticationProvider; -import com.newyetai.security.upassword.UpasswordAuthenticationFilter; -import com.newyetai.security.upassword.UpasswordAuthenticationProvider; -import com.newyetai.swagger.config.SwaggerConfig; -import com.newyetai.usercenter.user.login.service.UserLoginService; -import com.newyetai.usercenter.websocket.util.WebSocketUtils; +import com.senmesh.security.access.intercept.FilterSecurityInterceptor; +import com.senmesh.security.handle.MyAuthenctiationFailureHandler; +import com.senmesh.security.handle.MyLoginSuccessHandler; +import com.senmesh.security.handle.MyLoginUrlAuthenticationEntryPoint; +import com.senmesh.security.handle.MyLogoutSuccessHandler; +import com.senmesh.security.jwt.JwtAuthenticationTokenFilter; +import com.senmesh.security.mobile.MobileAuthenticationFilter; +import com.senmesh.security.mobile.MobileAuthenticationProvider; +import com.senmesh.security.social.service.StandardAuthorizationCodeTokenResponseClient; +import com.senmesh.security.social.service.StandardOAuth2UserService; +import com.senmesh.security.social.service.StandardOauth2AuthorizationRequestResolver; +import com.senmesh.security.ssb.SsbAuthenticationFilter; +import com.senmesh.security.ssb.SsbAuthenticationProvider; +import com.senmesh.security.temptoken.TokenAuthenticationFilter; +import com.senmesh.security.temptoken.TokenAuthenticationProvider; +import com.senmesh.security.upassword.UpasswordAuthenticationFilter; +import com.senmesh.security.upassword.UpasswordAuthenticationProvider; +import com.senmesh.swagger.config.SwaggerConfig; +import com.senmesh.usercenter.user.login.service.UserLoginService; +import com.senmesh.usercenter.websocket.util.WebSocketUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/decision/manager/SecurityDecisionManager.java b/src/main/java/com/senmesh/security/decision/manager/SecurityDecisionManager.java similarity index 88% rename from src/main/java/com/newyetai/security/decision/manager/SecurityDecisionManager.java rename to src/main/java/com/senmesh/security/decision/manager/SecurityDecisionManager.java index f63f9a5..c48e962 100644 --- a/src/main/java/com/newyetai/security/decision/manager/SecurityDecisionManager.java +++ b/src/main/java/com/senmesh/security/decision/manager/SecurityDecisionManager.java @@ -1,12 +1,12 @@ -package com.newyetai.security.decision.manager; +package com.senmesh.security.decision.manager; import java.util.Collection; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.core.userdetails.UserDetails; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.dto.Resource; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.dto.Resource; /** * 权限决策管理器。
diff --git a/src/main/java/com/newyetai/security/decision/manager/impl/SecurityDecisionManagerImpl.java b/src/main/java/com/senmesh/security/decision/manager/impl/SecurityDecisionManagerImpl.java similarity index 89% rename from src/main/java/com/newyetai/security/decision/manager/impl/SecurityDecisionManagerImpl.java rename to src/main/java/com/senmesh/security/decision/manager/impl/SecurityDecisionManagerImpl.java index c34ddf6..2b1a792 100644 --- a/src/main/java/com/newyetai/security/decision/manager/impl/SecurityDecisionManagerImpl.java +++ b/src/main/java/com/senmesh/security/decision/manager/impl/SecurityDecisionManagerImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.security.decision.manager.impl; +package com.senmesh.security.decision.manager.impl; import java.util.Collection; import java.util.Collections; @@ -15,10 +15,10 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.newyetai.security.access.metadata.ResourceSecurityMetadataSource; -import com.newyetai.security.decision.manager.SecurityDecisionManager; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.dto.Resource; +import com.senmesh.security.access.metadata.ResourceSecurityMetadataSource; +import com.senmesh.security.decision.manager.SecurityDecisionManager; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.dto.Resource; /** * 权限决策管理器 diff --git a/src/main/java/com/newyetai/security/dto/RoleDTO.java b/src/main/java/com/senmesh/security/dto/RoleDTO.java similarity index 91% rename from src/main/java/com/newyetai/security/dto/RoleDTO.java rename to src/main/java/com/senmesh/security/dto/RoleDTO.java index d5fd3ce..c06b3c9 100644 --- a/src/main/java/com/newyetai/security/dto/RoleDTO.java +++ b/src/main/java/com/senmesh/security/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.security.dto; +package com.senmesh.security.dto; import java.io.Serializable; import java.util.Date; @@ -8,8 +8,8 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/security/dto/SecurityUserDTO.java b/src/main/java/com/senmesh/security/dto/SecurityUserDTO.java similarity index 93% rename from src/main/java/com/newyetai/security/dto/SecurityUserDTO.java rename to src/main/java/com/senmesh/security/dto/SecurityUserDTO.java index 5e963bf..fd2381d 100644 --- a/src/main/java/com/newyetai/security/dto/SecurityUserDTO.java +++ b/src/main/java/com/senmesh/security/dto/SecurityUserDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.security.dto; +package com.senmesh.security.dto; import java.io.Serializable; import java.util.Collection; @@ -11,8 +11,8 @@ import org.springframework.security.oauth2.core.user.OAuth2User; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.collect.Sets; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/security/dto/UserInfoDTO.java b/src/main/java/com/senmesh/security/dto/UserInfoDTO.java similarity index 97% rename from src/main/java/com/newyetai/security/dto/UserInfoDTO.java rename to src/main/java/com/senmesh/security/dto/UserInfoDTO.java index 861c76d..df76adb 100644 --- a/src/main/java/com/newyetai/security/dto/UserInfoDTO.java +++ b/src/main/java/com/senmesh/security/dto/UserInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.security.dto; +package com.senmesh.security.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/security/expection/BadLoginException.java b/src/main/java/com/senmesh/security/expection/BadLoginException.java similarity index 90% rename from src/main/java/com/newyetai/security/expection/BadLoginException.java rename to src/main/java/com/senmesh/security/expection/BadLoginException.java index 890fda2..88c4c86 100644 --- a/src/main/java/com/newyetai/security/expection/BadLoginException.java +++ b/src/main/java/com/senmesh/security/expection/BadLoginException.java @@ -1,8 +1,8 @@ -package com.newyetai.security.expection; +package com.senmesh.security.expection; import org.springframework.security.core.AuthenticationException; -import com.newyetai.common.AlitaResult; +import com.senmesh.common.AlitaResult; /** * 登录信息异常 diff --git a/src/main/java/com/newyetai/security/expection/DuplicateOrgException.java b/src/main/java/com/senmesh/security/expection/DuplicateOrgException.java similarity index 83% rename from src/main/java/com/newyetai/security/expection/DuplicateOrgException.java rename to src/main/java/com/senmesh/security/expection/DuplicateOrgException.java index f1ec938..df03182 100644 --- a/src/main/java/com/newyetai/security/expection/DuplicateOrgException.java +++ b/src/main/java/com/senmesh/security/expection/DuplicateOrgException.java @@ -1,7 +1,7 @@ -package com.newyetai.security.expection; +package com.senmesh.security.expection; -import com.newyetai.common.AlitaResult; -import com.newyetai.security.temptoken.dto.DuplUserToken; +import com.senmesh.common.AlitaResult; +import com.senmesh.security.temptoken.dto.DuplUserToken; /** * 多个登录机构异常 diff --git a/src/main/java/com/newyetai/security/expection/DuplicateUserException.java b/src/main/java/com/senmesh/security/expection/DuplicateUserException.java similarity index 85% rename from src/main/java/com/newyetai/security/expection/DuplicateUserException.java rename to src/main/java/com/senmesh/security/expection/DuplicateUserException.java index 9aabb92..0fc7988 100644 --- a/src/main/java/com/newyetai/security/expection/DuplicateUserException.java +++ b/src/main/java/com/senmesh/security/expection/DuplicateUserException.java @@ -1,9 +1,9 @@ -package com.newyetai.security.expection; +package com.senmesh.security.expection; import java.util.List; -import com.newyetai.common.AlitaResult; -import com.newyetai.security.temptoken.dto.DuplMobileToken; +import com.senmesh.common.AlitaResult; +import com.senmesh.security.temptoken.dto.DuplMobileToken; /** * 多个登录用户异常 diff --git a/src/main/java/com/newyetai/security/handle/MyAuthenctiationFailureHandler.java b/src/main/java/com/senmesh/security/handle/MyAuthenctiationFailureHandler.java similarity index 83% rename from src/main/java/com/newyetai/security/handle/MyAuthenctiationFailureHandler.java rename to src/main/java/com/senmesh/security/handle/MyAuthenctiationFailureHandler.java index fa30dd0..0bbbf67 100644 --- a/src/main/java/com/newyetai/security/handle/MyAuthenctiationFailureHandler.java +++ b/src/main/java/com/senmesh/security/handle/MyAuthenctiationFailureHandler.java @@ -1,4 +1,4 @@ -package com.newyetai.security.handle; +package com.senmesh.security.handle; import java.io.IOException; @@ -11,12 +11,10 @@ import org.springframework.security.authentication.DisabledException; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.common.util.ResponseUtils; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.expection.DuplicateOrgException; -import com.newyetai.security.expection.DuplicateUserException; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.common.util.ResponseUtils; +import com.senmesh.security.expection.BadLoginException; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/handle/MyLoginSuccessHandler.java b/src/main/java/com/senmesh/security/handle/MyLoginSuccessHandler.java similarity index 83% rename from src/main/java/com/newyetai/security/handle/MyLoginSuccessHandler.java rename to src/main/java/com/senmesh/security/handle/MyLoginSuccessHandler.java index cdba3a0..dce79f1 100644 --- a/src/main/java/com/newyetai/security/handle/MyLoginSuccessHandler.java +++ b/src/main/java/com/senmesh/security/handle/MyLoginSuccessHandler.java @@ -1,4 +1,4 @@ -package com.newyetai.security.handle; +package com.senmesh.security.handle; import java.io.IOException; @@ -12,17 +12,17 @@ import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; import org.springframework.stereotype.Component; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.dto.CasTokenDTO; -import com.newyetai.common.util.CookieUtils; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.common.util.ResponseUtils; -import com.newyetai.security.config.SecurityProperties; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.jwt.JwtTokenUtils; -import com.newyetai.security.ssb.SsbAuthenticationFilter; -import com.newyetai.security.util.SecurityUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.dto.CasTokenDTO; +import com.senmesh.common.util.CookieUtils; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.common.util.ResponseUtils; +import com.senmesh.security.config.SecurityProperties; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.jwt.JwtTokenUtils; +import com.senmesh.security.ssb.SsbAuthenticationFilter; +import com.senmesh.security.util.SecurityUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/handle/MyLoginUrlAuthenticationEntryPoint.java b/src/main/java/com/senmesh/security/handle/MyLoginUrlAuthenticationEntryPoint.java similarity index 86% rename from src/main/java/com/newyetai/security/handle/MyLoginUrlAuthenticationEntryPoint.java rename to src/main/java/com/senmesh/security/handle/MyLoginUrlAuthenticationEntryPoint.java index 105612f..ba3e87e 100644 --- a/src/main/java/com/newyetai/security/handle/MyLoginUrlAuthenticationEntryPoint.java +++ b/src/main/java/com/senmesh/security/handle/MyLoginUrlAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.newyetai.security.handle; +package com.senmesh.security.handle; import java.io.IOException; @@ -9,10 +9,10 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.common.util.ResponseUtils; -import com.newyetai.security.expection.BadLoginException; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.common.util.ResponseUtils; +import com.senmesh.security.expection.BadLoginException; /** * 自定义认证失败处理器 diff --git a/src/main/java/com/newyetai/security/handle/MyLogoutSuccessHandler.java b/src/main/java/com/senmesh/security/handle/MyLogoutSuccessHandler.java similarity index 81% rename from src/main/java/com/newyetai/security/handle/MyLogoutSuccessHandler.java rename to src/main/java/com/senmesh/security/handle/MyLogoutSuccessHandler.java index 5703d92..46d85c1 100644 --- a/src/main/java/com/newyetai/security/handle/MyLogoutSuccessHandler.java +++ b/src/main/java/com/senmesh/security/handle/MyLogoutSuccessHandler.java @@ -1,4 +1,4 @@ -package com.newyetai.security.handle; +package com.senmesh.security.handle; import java.io.IOException; @@ -10,10 +10,10 @@ import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.stereotype.Component; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.CookieUtils; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.common.util.ResponseUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.CookieUtils; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.common.util.ResponseUtils; /** * @author guhong diff --git a/src/main/java/com/newyetai/security/jwt/JwtAuthenticationTokenFilter.java b/src/main/java/com/senmesh/security/jwt/JwtAuthenticationTokenFilter.java similarity index 86% rename from src/main/java/com/newyetai/security/jwt/JwtAuthenticationTokenFilter.java rename to src/main/java/com/senmesh/security/jwt/JwtAuthenticationTokenFilter.java index 991dc78..0fd8c39 100644 --- a/src/main/java/com/newyetai/security/jwt/JwtAuthenticationTokenFilter.java +++ b/src/main/java/com/senmesh/security/jwt/JwtAuthenticationTokenFilter.java @@ -1,4 +1,4 @@ -package com.newyetai.security.jwt; +package com.senmesh.security.jwt; import java.io.IOException; @@ -13,17 +13,17 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.GenericFilterBean; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.ChangeTokenException; -import com.newyetai.common.util.CookieUtils; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.common.util.ResponseUtils; -import com.newyetai.common.util.StrUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.security.config.SecurityProperties; -import com.newyetai.security.util.HostContextHolder; -import com.newyetai.usercenter.constants.OrgConstants; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.ChangeTokenException; +import com.senmesh.common.util.CookieUtils; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.common.util.ResponseUtils; +import com.senmesh.common.util.StrUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.security.config.SecurityProperties; +import com.senmesh.security.util.HostContextHolder; +import com.senmesh.usercenter.constants.OrgConstants; +import com.senmesh.usercenter.dto.IUserDetail; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/jwt/JwtProperties.java b/src/main/java/com/senmesh/security/jwt/JwtProperties.java similarity index 91% rename from src/main/java/com/newyetai/security/jwt/JwtProperties.java rename to src/main/java/com/senmesh/security/jwt/JwtProperties.java index e8b57a3..4fd1459 100644 --- a/src/main/java/com/newyetai/security/jwt/JwtProperties.java +++ b/src/main/java/com/senmesh/security/jwt/JwtProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.security.jwt; +package com.senmesh.security.jwt; import lombok.Data; diff --git a/src/main/java/com/newyetai/security/jwt/JwtTokenUtils.java b/src/main/java/com/senmesh/security/jwt/JwtTokenUtils.java similarity index 93% rename from src/main/java/com/newyetai/security/jwt/JwtTokenUtils.java rename to src/main/java/com/senmesh/security/jwt/JwtTokenUtils.java index 1d67a09..7152e62 100644 --- a/src/main/java/com/newyetai/security/jwt/JwtTokenUtils.java +++ b/src/main/java/com/senmesh/security/jwt/JwtTokenUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.security.jwt; +package com.senmesh.security.jwt; import java.util.Date; import java.util.Map; @@ -10,17 +10,17 @@ import org.springframework.stereotype.Component; import com.google.common.base.Strings; import com.google.common.collect.Maps; -import com.newyetai.common.dto.CasTokenDTO; -import com.newyetai.common.exception.ChangeTokenException; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.util.UserLoginUtils; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.common.dto.CasTokenDTO; +import com.senmesh.common.exception.ChangeTokenException; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.util.UserLoginUtils; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; diff --git a/src/main/java/com/newyetai/security/mapstruct/AuthDetailMapMapper.java b/src/main/java/com/senmesh/security/mapstruct/AuthDetailMapMapper.java similarity index 75% rename from src/main/java/com/newyetai/security/mapstruct/AuthDetailMapMapper.java rename to src/main/java/com/senmesh/security/mapstruct/AuthDetailMapMapper.java index 3165c3b..7fddbf3 100644 --- a/src/main/java/com/newyetai/security/mapstruct/AuthDetailMapMapper.java +++ b/src/main/java/com/senmesh/security/mapstruct/AuthDetailMapMapper.java @@ -1,12 +1,12 @@ -package com.newyetai.security.mapstruct; +package com.senmesh.security.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatAuthUserInfoDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatAuthUserInfoDTO; @Mapper public interface AuthDetailMapMapper{ diff --git a/src/main/java/com/newyetai/security/mapstruct/UserMapMapper.java b/src/main/java/com/senmesh/security/mapstruct/UserMapMapper.java similarity index 76% rename from src/main/java/com/newyetai/security/mapstruct/UserMapMapper.java rename to src/main/java/com/senmesh/security/mapstruct/UserMapMapper.java index 3fe3918..8f71981 100644 --- a/src/main/java/com/newyetai/security/mapstruct/UserMapMapper.java +++ b/src/main/java/com/senmesh/security/mapstruct/UserMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.security.mapstruct; +package com.senmesh.security.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; /** * @author sr on 2020-06-08 diff --git a/src/main/java/com/newyetai/security/mobile/MobileAuthenticationFilter.java b/src/main/java/com/senmesh/security/mobile/MobileAuthenticationFilter.java similarity index 91% rename from src/main/java/com/newyetai/security/mobile/MobileAuthenticationFilter.java rename to src/main/java/com/senmesh/security/mobile/MobileAuthenticationFilter.java index 7cf4e8f..98b5f69 100644 --- a/src/main/java/com/newyetai/security/mobile/MobileAuthenticationFilter.java +++ b/src/main/java/com/senmesh/security/mobile/MobileAuthenticationFilter.java @@ -1,4 +1,4 @@ -package com.newyetai.security.mobile; +package com.senmesh.security.mobile; import java.io.IOException; @@ -14,10 +14,10 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.user.login.dto.LoginPhoneDTO; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.user.login.dto.LoginPhoneDTO; /** * 手机号认证过滤器，指定请求组装token，调起认证 diff --git a/src/main/java/com/newyetai/security/mobile/MobileAuthenticationProvider.java b/src/main/java/com/senmesh/security/mobile/MobileAuthenticationProvider.java similarity index 79% rename from src/main/java/com/newyetai/security/mobile/MobileAuthenticationProvider.java rename to src/main/java/com/senmesh/security/mobile/MobileAuthenticationProvider.java index 819e103..e61c511 100644 --- a/src/main/java/com/newyetai/security/mobile/MobileAuthenticationProvider.java +++ b/src/main/java/com/senmesh/security/mobile/MobileAuthenticationProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.mobile; +package com.senmesh.security.mobile; import java.util.HashSet; import java.util.Set; @@ -9,14 +9,14 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.usercenter.user.login.dto.LoginPhoneDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.usercenter.user.login.dto.LoginPhoneDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; /** * 手机号认证provider，比对信息是否匹配 diff --git a/src/main/java/com/newyetai/security/mobile/MobileAuthenticationToken.java b/src/main/java/com/senmesh/security/mobile/MobileAuthenticationToken.java similarity index 84% rename from src/main/java/com/newyetai/security/mobile/MobileAuthenticationToken.java rename to src/main/java/com/senmesh/security/mobile/MobileAuthenticationToken.java index d9f8bc5..d7f7b0e 100644 --- a/src/main/java/com/newyetai/security/mobile/MobileAuthenticationToken.java +++ b/src/main/java/com/senmesh/security/mobile/MobileAuthenticationToken.java @@ -1,8 +1,7 @@ -package com.newyetai.security.mobile; +package com.senmesh.security.mobile; import java.util.Collection; -import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/newyetai/security/service/GrantedAuthorityService.java b/src/main/java/com/senmesh/security/service/GrantedAuthorityService.java similarity index 83% rename from src/main/java/com/newyetai/security/service/GrantedAuthorityService.java rename to src/main/java/com/senmesh/security/service/GrantedAuthorityService.java index 88f42b9..0bd97ca 100644 --- a/src/main/java/com/newyetai/security/service/GrantedAuthorityService.java +++ b/src/main/java/com/senmesh/security/service/GrantedAuthorityService.java @@ -1,10 +1,10 @@ -package com.newyetai.security.service; +package com.senmesh.security.service; import java.util.Collection; import org.springframework.security.core.GrantedAuthority; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.dto.IUserDetail; /** * 主要提供用户的授权信息的收集功能 diff --git a/src/main/java/com/newyetai/security/service/IPermissionSecurityService.java b/src/main/java/com/senmesh/security/service/IPermissionSecurityService.java similarity index 65% rename from src/main/java/com/newyetai/security/service/IPermissionSecurityService.java rename to src/main/java/com/senmesh/security/service/IPermissionSecurityService.java index 474d5fe..a85743f 100644 --- a/src/main/java/com/newyetai/security/service/IPermissionSecurityService.java +++ b/src/main/java/com/senmesh/security/service/IPermissionSecurityService.java @@ -1,12 +1,12 @@ -package com.newyetai.security.service; +package com.senmesh.security.service; import java.util.List; import org.springframework.web.bind.annotation.GetMapping; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.authority.dto.UrlPermissionDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.authority.dto.UrlPermissionDTO; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/security/service/IResourceSecurityService.java b/src/main/java/com/senmesh/security/service/IResourceSecurityService.java similarity index 83% rename from src/main/java/com/newyetai/security/service/IResourceSecurityService.java rename to src/main/java/com/senmesh/security/service/IResourceSecurityService.java index 91a2cef..05f2b77 100644 --- a/src/main/java/com/newyetai/security/service/IResourceSecurityService.java +++ b/src/main/java/com/senmesh/security/service/IResourceSecurityService.java @@ -1,10 +1,10 @@ -package com.newyetai.security.service; +package com.senmesh.security.service; import java.util.List; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.resource.dto.ComponentDTO; -import com.newyetai.usercenter.resource.dto.UrlDTO; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.resource.dto.ComponentDTO; +import com.senmesh.usercenter.resource.dto.UrlDTO; /** * @author sr on 2020-09-08 diff --git a/src/main/java/com/newyetai/security/service/IRoleAllocationSecurityService.java b/src/main/java/com/senmesh/security/service/IRoleAllocationSecurityService.java similarity index 76% rename from src/main/java/com/newyetai/security/service/IRoleAllocationSecurityService.java rename to src/main/java/com/senmesh/security/service/IRoleAllocationSecurityService.java index 1d2047b..e00e334 100644 --- a/src/main/java/com/newyetai/security/service/IRoleAllocationSecurityService.java +++ b/src/main/java/com/senmesh/security/service/IRoleAllocationSecurityService.java @@ -1,12 +1,12 @@ -package com.newyetai.security.service; +package com.senmesh.security.service; import java.util.List; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.authority.dto.RoleAllocationDTO; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/security/service/IUserSecurityService.java b/src/main/java/com/senmesh/security/service/IUserSecurityService.java similarity index 66% rename from src/main/java/com/newyetai/security/service/IUserSecurityService.java rename to src/main/java/com/senmesh/security/service/IUserSecurityService.java index caaba48..ef1bd8c 100644 --- a/src/main/java/com/newyetai/security/service/IUserSecurityService.java +++ b/src/main/java/com/senmesh/security/service/IUserSecurityService.java @@ -1,10 +1,10 @@ -package com.newyetai.security.service; +package com.senmesh.security.service; import org.springframework.web.bind.annotation.PostMapping; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/security/service/impl/GrantedAuthorityServiceImpl.java b/src/main/java/com/senmesh/security/service/impl/GrantedAuthorityServiceImpl.java similarity index 87% rename from src/main/java/com/newyetai/security/service/impl/GrantedAuthorityServiceImpl.java rename to src/main/java/com/senmesh/security/service/impl/GrantedAuthorityServiceImpl.java index ddf4c5f..1645671 100644 --- a/src/main/java/com/newyetai/security/service/impl/GrantedAuthorityServiceImpl.java +++ b/src/main/java/com/senmesh/security/service/impl/GrantedAuthorityServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.security.service.impl; +package com.senmesh.security.service.impl; import java.util.ArrayList; import java.util.Collection; @@ -12,9 +12,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; -import com.newyetai.security.access.provider.GrantedAuthorityProvider; -import com.newyetai.security.service.GrantedAuthorityService; -import com.newyetai.usercenter.dto.IUserDetail; +import com.senmesh.security.access.provider.GrantedAuthorityProvider; +import com.senmesh.security.service.GrantedAuthorityService; +import com.senmesh.usercenter.dto.IUserDetail; /** * 主要提供用户的授权信息的收集功能 diff --git a/src/main/java/com/newyetai/security/social/service/CommonOAuth2Provider.java b/src/main/java/com/senmesh/security/social/service/CommonOAuth2Provider.java similarity index 95% rename from src/main/java/com/newyetai/security/social/service/CommonOAuth2Provider.java rename to src/main/java/com/senmesh/security/social/service/CommonOAuth2Provider.java index baeb0f3..95a00f7 100644 --- a/src/main/java/com/newyetai/security/social/service/CommonOAuth2Provider.java +++ b/src/main/java/com/senmesh/security/social/service/CommonOAuth2Provider.java @@ -1,12 +1,12 @@ -package com.newyetai.security.social.service; +package com.senmesh.security.social.service; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistration.Builder; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; -import com.newyetai.security.ssb.SsbAuthenticationFilter; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.security.ssb.SsbAuthenticationFilter; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; public enum CommonOAuth2Provider { diff --git a/src/main/java/com/newyetai/security/social/service/IOauthProvider.java b/src/main/java/com/senmesh/security/social/service/IOauthProvider.java similarity index 97% rename from src/main/java/com/newyetai/security/social/service/IOauthProvider.java rename to src/main/java/com/senmesh/security/social/service/IOauthProvider.java index 237fa94..2a0e83e 100644 --- a/src/main/java/com/newyetai/security/social/service/IOauthProvider.java +++ b/src/main/java/com/senmesh/security/social/service/IOauthProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.service; +package com.senmesh.security.social.service; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/newyetai/security/social/service/OAuth2ClientRegistrationAdapter.java b/src/main/java/com/senmesh/security/social/service/OAuth2ClientRegistrationAdapter.java similarity index 92% rename from src/main/java/com/newyetai/security/social/service/OAuth2ClientRegistrationAdapter.java rename to src/main/java/com/senmesh/security/social/service/OAuth2ClientRegistrationAdapter.java index f704a1c..dc101bd 100644 --- a/src/main/java/com/newyetai/security/social/service/OAuth2ClientRegistrationAdapter.java +++ b/src/main/java/com/senmesh/security/social/service/OAuth2ClientRegistrationAdapter.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.service; +package com.senmesh.security.social.service; import java.util.Map; @@ -13,10 +13,10 @@ import org.springframework.security.oauth2.core.ClientAuthenticationMethod; import org.springframework.util.StringUtils; import com.google.common.collect.Maps; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/social/service/StandardAuthorizationCodeTokenResponseClient.java b/src/main/java/com/senmesh/security/social/service/StandardAuthorizationCodeTokenResponseClient.java similarity index 97% rename from src/main/java/com/newyetai/security/social/service/StandardAuthorizationCodeTokenResponseClient.java rename to src/main/java/com/senmesh/security/social/service/StandardAuthorizationCodeTokenResponseClient.java index 31f5d8c..ca6b114 100644 --- a/src/main/java/com/newyetai/security/social/service/StandardAuthorizationCodeTokenResponseClient.java +++ b/src/main/java/com/senmesh/security/social/service/StandardAuthorizationCodeTokenResponseClient.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.service; +package com.senmesh.security.social.service; import java.util.Arrays; @@ -22,7 +22,7 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestOperations; import org.springframework.web.client.RestTemplate; -import com.newyetai.security.social.util.Oauth2ProviderUtils; +import com.senmesh.security.social.util.Oauth2ProviderUtils; /** * code获取token diff --git a/src/main/java/com/newyetai/security/social/service/StandardClientRegistrationRepository.java b/src/main/java/com/senmesh/security/social/service/StandardClientRegistrationRepository.java similarity index 85% rename from src/main/java/com/newyetai/security/social/service/StandardClientRegistrationRepository.java rename to src/main/java/com/senmesh/security/social/service/StandardClientRegistrationRepository.java index 16143fc..40082c9 100644 --- a/src/main/java/com/newyetai/security/social/service/StandardClientRegistrationRepository.java +++ b/src/main/java/com/senmesh/security/social/service/StandardClientRegistrationRepository.java @@ -1,14 +1,14 @@ -package com.newyetai.security.social.service; +package com.senmesh.security.social.service; import org.apache.commons.lang3.StringUtils; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; public class StandardClientRegistrationRepository implements ClientRegistrationRepository { diff --git a/src/main/java/com/newyetai/security/social/service/StandardOAuth2UserService.java b/src/main/java/com/senmesh/security/social/service/StandardOAuth2UserService.java similarity index 97% rename from src/main/java/com/newyetai/security/social/service/StandardOAuth2UserService.java rename to src/main/java/com/senmesh/security/social/service/StandardOAuth2UserService.java index 29f3e4b..d77add0 100644 --- a/src/main/java/com/newyetai/security/social/service/StandardOAuth2UserService.java +++ b/src/main/java/com/senmesh/security/social/service/StandardOAuth2UserService.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.service; +package com.senmesh.security.social.service; import org.springframework.core.convert.converter.Converter; import org.springframework.http.RequestEntity; @@ -17,7 +17,7 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestOperations; import org.springframework.web.client.RestTemplate; -import com.newyetai.security.social.util.Oauth2ProviderUtils; +import com.senmesh.security.social.util.Oauth2ProviderUtils; public class StandardOAuth2UserService implements OAuth2UserService { diff --git a/src/main/java/com/newyetai/security/social/service/StandardOauth2AuthorizationRequestResolver.java b/src/main/java/com/senmesh/security/social/service/StandardOauth2AuthorizationRequestResolver.java similarity index 96% rename from src/main/java/com/newyetai/security/social/service/StandardOauth2AuthorizationRequestResolver.java rename to src/main/java/com/senmesh/security/social/service/StandardOauth2AuthorizationRequestResolver.java index d846f0b..79e394a 100644 --- a/src/main/java/com/newyetai/security/social/service/StandardOauth2AuthorizationRequestResolver.java +++ b/src/main/java/com/senmesh/security/social/service/StandardOauth2AuthorizationRequestResolver.java @@ -1,9 +1,8 @@ -package com.newyetai.security.social.service; +package com.senmesh.security.social.service; import java.util.Base64; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -22,10 +21,10 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.util.Assert; import org.springframework.web.util.UriComponentsBuilder; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.security.social.util.Oauth2ProviderUtils; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.user.constant.UserTypeEnum; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.security.social.util.Oauth2ProviderUtils; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.user.constant.UserTypeEnum; /** * An implementation of an {@link OAuth2AuthorizationRequestResolver} that attempts to diff --git a/src/main/java/com/newyetai/security/social/ssb/service/SsbOauthLoginProvider.java b/src/main/java/com/senmesh/security/social/ssb/service/SsbOauthLoginProvider.java similarity index 79% rename from src/main/java/com/newyetai/security/social/ssb/service/SsbOauthLoginProvider.java rename to src/main/java/com/senmesh/security/social/ssb/service/SsbOauthLoginProvider.java index 853a026..09fabf7 100644 --- a/src/main/java/com/newyetai/security/social/ssb/service/SsbOauthLoginProvider.java +++ b/src/main/java/com/senmesh/security/social/ssb/service/SsbOauthLoginProvider.java @@ -1,20 +1,16 @@ -package com.newyetai.security.social.ssb.service; - -import java.util.HashMap; -import java.util.Map; +package com.senmesh.security.social.ssb.service; import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; -import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; import org.springframework.stereotype.Service; -import com.newyetai.sdk.ssb.SsbProperties; -import com.newyetai.sdk.ssb.util.SM2Utils; -import com.newyetai.security.social.service.IOauthProvider; -import com.newyetai.security.util.SecurityUtils; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.sdk.ssb.SsbProperties; +import com.senmesh.sdk.ssb.util.SM2Utils; +import com.senmesh.security.social.service.IOauthProvider; +import com.senmesh.security.util.SecurityUtils; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/social/util/Oauth2ProviderUtils.java b/src/main/java/com/senmesh/security/social/util/Oauth2ProviderUtils.java similarity index 80% rename from src/main/java/com/newyetai/security/social/util/Oauth2ProviderUtils.java rename to src/main/java/com/senmesh/security/social/util/Oauth2ProviderUtils.java index b2d4711..8505348 100644 --- a/src/main/java/com/newyetai/security/social/util/Oauth2ProviderUtils.java +++ b/src/main/java/com/senmesh/security/social/util/Oauth2ProviderUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.util; +package com.senmesh.security.social.util; import java.util.List; import java.util.Map; @@ -6,8 +6,7 @@ import java.util.Map; import org.apache.commons.collections4.map.CaseInsensitiveMap; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.security.social.service.IOauthProvider; +import com.senmesh.security.social.service.IOauthProvider; @Component public class Oauth2ProviderUtils { diff --git a/src/main/java/com/newyetai/security/social/wechat/constant/WechatConstants.java b/src/main/java/com/senmesh/security/social/wechat/constant/WechatConstants.java similarity index 91% rename from src/main/java/com/newyetai/security/social/wechat/constant/WechatConstants.java rename to src/main/java/com/senmesh/security/social/wechat/constant/WechatConstants.java index 38723db..c102488 100644 --- a/src/main/java/com/newyetai/security/social/wechat/constant/WechatConstants.java +++ b/src/main/java/com/senmesh/security/social/wechat/constant/WechatConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.wechat.constant; +package com.senmesh.security.social.wechat.constant; /** * @author sr on 2021-01-13 diff --git a/src/main/java/com/newyetai/security/social/wechat/convert/WeChatAuthorizationCodeGrantRequestEntityConverter.java b/src/main/java/com/senmesh/security/social/wechat/convert/WeChatAuthorizationCodeGrantRequestEntityConverter.java similarity index 94% rename from src/main/java/com/newyetai/security/social/wechat/convert/WeChatAuthorizationCodeGrantRequestEntityConverter.java rename to src/main/java/com/senmesh/security/social/wechat/convert/WeChatAuthorizationCodeGrantRequestEntityConverter.java index d8afd73..d34dd6a 100644 --- a/src/main/java/com/newyetai/security/social/wechat/convert/WeChatAuthorizationCodeGrantRequestEntityConverter.java +++ b/src/main/java/com/senmesh/security/social/wechat/convert/WeChatAuthorizationCodeGrantRequestEntityConverter.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.wechat.convert; +package com.senmesh.security.social.wechat.convert; import java.net.URI; import java.util.Collections; @@ -12,7 +12,7 @@ import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCo import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.web.util.UriComponentsBuilder; -import com.newyetai.security.social.wechat.constant.WechatConstants; +import com.senmesh.security.social.wechat.constant.WechatConstants; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/social/wechat/convert/WeChatUserRequestEntityConverter.java b/src/main/java/com/senmesh/security/social/wechat/convert/WeChatUserRequestEntityConverter.java similarity index 93% rename from src/main/java/com/newyetai/security/social/wechat/convert/WeChatUserRequestEntityConverter.java rename to src/main/java/com/senmesh/security/social/wechat/convert/WeChatUserRequestEntityConverter.java index c529da7..9bbd00d 100644 --- a/src/main/java/com/newyetai/security/social/wechat/convert/WeChatUserRequestEntityConverter.java +++ b/src/main/java/com/senmesh/security/social/wechat/convert/WeChatUserRequestEntityConverter.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.wechat.convert; +package com.senmesh.security.social.wechat.convert; import java.net.URI; import java.util.Collections; @@ -12,7 +12,7 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; import org.springframework.web.util.UriComponentsBuilder; -import com.newyetai.security.social.wechat.constant.WechatConstants; +import com.senmesh.security.social.wechat.constant.WechatConstants; public class WeChatUserRequestEntityConverter implements Converter> { diff --git a/src/main/java/com/newyetai/security/social/wechat/service/WeChatAccessTokenResponse.java b/src/main/java/com/senmesh/security/social/wechat/service/WeChatAccessTokenResponse.java similarity index 90% rename from src/main/java/com/newyetai/security/social/wechat/service/WeChatAccessTokenResponse.java rename to src/main/java/com/senmesh/security/social/wechat/service/WeChatAccessTokenResponse.java index 373704b..2523d30 100644 --- a/src/main/java/com/newyetai/security/social/wechat/service/WeChatAccessTokenResponse.java +++ b/src/main/java/com/senmesh/security/social/wechat/service/WeChatAccessTokenResponse.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.wechat.service; +package com.senmesh.security.social.wechat.service; import java.util.Collections; import java.util.HashSet; @@ -11,9 +11,7 @@ import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; import com.fasterxml.jackson.annotation.JsonProperty; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.security.social.service.IOauthProvider; -import com.newyetai.usercenter.constants.SecurityConstants; +import com.senmesh.common.util.JsonUtils; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/newyetai/security/social/wechat/service/WechatOauthLoginProvider.java b/src/main/java/com/senmesh/security/social/wechat/service/WechatOauthLoginProvider.java similarity index 84% rename from src/main/java/com/newyetai/security/social/wechat/service/WechatOauthLoginProvider.java rename to src/main/java/com/senmesh/security/social/wechat/service/WechatOauthLoginProvider.java index b963aa4..77b1807 100644 --- a/src/main/java/com/newyetai/security/social/wechat/service/WechatOauthLoginProvider.java +++ b/src/main/java/com/senmesh/security/social/wechat/service/WechatOauthLoginProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.social.wechat.service; +package com.senmesh.security.social.wechat.service; import java.io.UnsupportedEncodingException; @@ -19,21 +19,21 @@ import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResp import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.web.client.RestClientException; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.security.mapstruct.AuthDetailMapMapper; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.security.social.service.IOauthProvider; -import com.newyetai.security.social.service.StandardAuthorizationCodeTokenResponseClient; -import com.newyetai.security.social.wechat.constant.WechatConstants; -import com.newyetai.security.social.wechat.convert.WeChatAuthorizationCodeGrantRequestEntityConverter; -import com.newyetai.security.social.wechat.convert.WeChatUserRequestEntityConverter; -import com.newyetai.security.util.SecurityUtils; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatAuthUserInfoDTO; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.security.mapstruct.AuthDetailMapMapper; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.security.social.service.IOauthProvider; +import com.senmesh.security.social.service.StandardAuthorizationCodeTokenResponseClient; +import com.senmesh.security.social.wechat.constant.WechatConstants; +import com.senmesh.security.social.wechat.convert.WeChatAuthorizationCodeGrantRequestEntityConverter; +import com.senmesh.security.social.wechat.convert.WeChatUserRequestEntityConverter; +import com.senmesh.security.util.SecurityUtils; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatAuthUserInfoDTO; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/ssb/SsbAuthenticationFilter.java b/src/main/java/com/senmesh/security/ssb/SsbAuthenticationFilter.java similarity index 97% rename from src/main/java/com/newyetai/security/ssb/SsbAuthenticationFilter.java rename to src/main/java/com/senmesh/security/ssb/SsbAuthenticationFilter.java index a8728bb..8777d2e 100644 --- a/src/main/java/com/newyetai/security/ssb/SsbAuthenticationFilter.java +++ b/src/main/java/com/senmesh/security/ssb/SsbAuthenticationFilter.java @@ -1,4 +1,4 @@ -package com.newyetai.security.ssb; +package com.senmesh.security.ssb; import java.io.IOException; @@ -13,7 +13,7 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.util.JsonUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/ssb/SsbAuthenticationProvider.java b/src/main/java/com/senmesh/security/ssb/SsbAuthenticationProvider.java similarity index 79% rename from src/main/java/com/newyetai/security/ssb/SsbAuthenticationProvider.java rename to src/main/java/com/senmesh/security/ssb/SsbAuthenticationProvider.java index 8e8652f..a70f586 100644 --- a/src/main/java/com/newyetai/security/ssb/SsbAuthenticationProvider.java +++ b/src/main/java/com/senmesh/security/ssb/SsbAuthenticationProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.ssb; +package com.senmesh.security.ssb; import java.util.HashSet; import java.util.Set; @@ -9,15 +9,14 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.usercenter.user.login.dto.LoginUsernamePasswordDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/ssb/SsbAuthenticationToken.java b/src/main/java/com/senmesh/security/ssb/SsbAuthenticationToken.java similarity index 84% rename from src/main/java/com/newyetai/security/ssb/SsbAuthenticationToken.java rename to src/main/java/com/senmesh/security/ssb/SsbAuthenticationToken.java index f1c5024..7dc3e04 100644 --- a/src/main/java/com/newyetai/security/ssb/SsbAuthenticationToken.java +++ b/src/main/java/com/senmesh/security/ssb/SsbAuthenticationToken.java @@ -1,8 +1,7 @@ -package com.newyetai.security.ssb; +package com.senmesh.security.ssb; import java.util.Collection; -import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/newyetai/security/ssb/SsbLoginDTO.java b/src/main/java/com/senmesh/security/ssb/SsbLoginDTO.java similarity index 90% rename from src/main/java/com/newyetai/security/ssb/SsbLoginDTO.java rename to src/main/java/com/senmesh/security/ssb/SsbLoginDTO.java index 55ee45f..6f3d9cf 100644 --- a/src/main/java/com/newyetai/security/ssb/SsbLoginDTO.java +++ b/src/main/java/com/senmesh/security/ssb/SsbLoginDTO.java @@ -1,9 +1,7 @@ -package com.newyetai.security.ssb; +package com.senmesh.security.ssb; import java.io.Serializable; -import javax.validation.constraints.NotBlank; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/security/temptoken/TokenAuthenticationFilter.java b/src/main/java/com/senmesh/security/temptoken/TokenAuthenticationFilter.java similarity index 91% rename from src/main/java/com/newyetai/security/temptoken/TokenAuthenticationFilter.java rename to src/main/java/com/senmesh/security/temptoken/TokenAuthenticationFilter.java index 095f48c..f980583 100644 --- a/src/main/java/com/newyetai/security/temptoken/TokenAuthenticationFilter.java +++ b/src/main/java/com/senmesh/security/temptoken/TokenAuthenticationFilter.java @@ -1,4 +1,4 @@ -package com.newyetai.security.temptoken; +package com.senmesh.security.temptoken; import java.io.IOException; @@ -14,11 +14,11 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.user.login.dto.LoginPhoneToken; -import com.newyetai.usercenter.user.login.dto.LoginUserToken; -import com.newyetai.usercenter.user.login.dto.TempTokenDTO; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.user.login.dto.LoginPhoneToken; +import com.senmesh.usercenter.user.login.dto.LoginUserToken; +import com.senmesh.usercenter.user.login.dto.TempTokenDTO; /** * 临时token认证过滤器，指定请求组装token，调起认证 diff --git a/src/main/java/com/newyetai/security/temptoken/TokenAuthenticationProvider.java b/src/main/java/com/senmesh/security/temptoken/TokenAuthenticationProvider.java similarity index 79% rename from src/main/java/com/newyetai/security/temptoken/TokenAuthenticationProvider.java rename to src/main/java/com/senmesh/security/temptoken/TokenAuthenticationProvider.java index 4f83830..76b4107 100644 --- a/src/main/java/com/newyetai/security/temptoken/TokenAuthenticationProvider.java +++ b/src/main/java/com/senmesh/security/temptoken/TokenAuthenticationProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.temptoken; +package com.senmesh.security.temptoken; import java.util.HashSet; import java.util.Set; @@ -9,15 +9,15 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.usercenter.user.login.dto.LoginPhoneToken; -import com.newyetai.usercenter.user.login.dto.LoginUserToken; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.usercenter.user.login.dto.LoginPhoneToken; +import com.senmesh.usercenter.user.login.dto.LoginUserToken; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; /** * token认证provider，比对信息是否匹配 diff --git a/src/main/java/com/newyetai/security/temptoken/TokenAuthenticationToken.java b/src/main/java/com/senmesh/security/temptoken/TokenAuthenticationToken.java similarity index 93% rename from src/main/java/com/newyetai/security/temptoken/TokenAuthenticationToken.java rename to src/main/java/com/senmesh/security/temptoken/TokenAuthenticationToken.java index 65e54b8..afe9089 100644 --- a/src/main/java/com/newyetai/security/temptoken/TokenAuthenticationToken.java +++ b/src/main/java/com/senmesh/security/temptoken/TokenAuthenticationToken.java @@ -1,4 +1,4 @@ -package com.newyetai.security.temptoken; +package com.senmesh.security.temptoken; import java.util.Collection; diff --git a/src/main/java/com/newyetai/security/temptoken/dto/DuplMobileToken.java b/src/main/java/com/senmesh/security/temptoken/dto/DuplMobileToken.java similarity index 82% rename from src/main/java/com/newyetai/security/temptoken/dto/DuplMobileToken.java rename to src/main/java/com/senmesh/security/temptoken/dto/DuplMobileToken.java index 501e7bc..2991462 100644 --- a/src/main/java/com/newyetai/security/temptoken/dto/DuplMobileToken.java +++ b/src/main/java/com/senmesh/security/temptoken/dto/DuplMobileToken.java @@ -1,8 +1,8 @@ -package com.newyetai.security.temptoken.dto; +package com.senmesh.security.temptoken.dto; import java.util.List; -import com.newyetai.usercenter.user.login.dto.PhoneToken; +import com.senmesh.usercenter.user.login.dto.PhoneToken; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/security/temptoken/dto/DuplUserToken.java b/src/main/java/com/senmesh/security/temptoken/dto/DuplUserToken.java similarity index 82% rename from src/main/java/com/newyetai/security/temptoken/dto/DuplUserToken.java rename to src/main/java/com/senmesh/security/temptoken/dto/DuplUserToken.java index 16c52c4..73120ca 100644 --- a/src/main/java/com/newyetai/security/temptoken/dto/DuplUserToken.java +++ b/src/main/java/com/senmesh/security/temptoken/dto/DuplUserToken.java @@ -1,8 +1,8 @@ -package com.newyetai.security.temptoken.dto; +package com.senmesh.security.temptoken.dto; import java.util.List; -import com.newyetai.usercenter.user.login.dto.UserToken; +import com.senmesh.usercenter.user.login.dto.UserToken; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/security/temptoken/dto/PhoneTokenCreateDTO.java b/src/main/java/com/senmesh/security/temptoken/dto/PhoneTokenCreateDTO.java similarity index 78% rename from src/main/java/com/newyetai/security/temptoken/dto/PhoneTokenCreateDTO.java rename to src/main/java/com/senmesh/security/temptoken/dto/PhoneTokenCreateDTO.java index 5437850..aab9465 100644 --- a/src/main/java/com/newyetai/security/temptoken/dto/PhoneTokenCreateDTO.java +++ b/src/main/java/com/senmesh/security/temptoken/dto/PhoneTokenCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.security.temptoken.dto; +package com.senmesh.security.temptoken.dto; import java.io.Serializable; @@ -6,7 +6,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; @Data @NoArgsConstructor diff --git a/src/main/java/com/newyetai/security/temptoken/dto/UserTokenCreateDTO.java b/src/main/java/com/senmesh/security/temptoken/dto/UserTokenCreateDTO.java similarity index 87% rename from src/main/java/com/newyetai/security/temptoken/dto/UserTokenCreateDTO.java rename to src/main/java/com/senmesh/security/temptoken/dto/UserTokenCreateDTO.java index d84640f..5f9cc6e 100644 --- a/src/main/java/com/newyetai/security/temptoken/dto/UserTokenCreateDTO.java +++ b/src/main/java/com/senmesh/security/temptoken/dto/UserTokenCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.security.temptoken.dto; +package com.senmesh.security.temptoken.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/security/ucard/UcardAuthenticationFilter.java b/src/main/java/com/senmesh/security/ucard/UcardAuthenticationFilter.java similarity index 96% rename from src/main/java/com/newyetai/security/ucard/UcardAuthenticationFilter.java rename to src/main/java/com/senmesh/security/ucard/UcardAuthenticationFilter.java index fac2caf..58e7e73 100644 --- a/src/main/java/com/newyetai/security/ucard/UcardAuthenticationFilter.java +++ b/src/main/java/com/senmesh/security/ucard/UcardAuthenticationFilter.java @@ -1,6 +1,6 @@ -package com.newyetai.security.ucard; +package com.senmesh.security.ucard; -import com.newyetai.usercenter.user.login.dto.LoginUCardDTO; +import com.senmesh.usercenter.user.login.dto.LoginUCardDTO; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/newyetai/security/ucard/UcardAuthenticationProvider.java b/src/main/java/com/senmesh/security/ucard/UcardAuthenticationProvider.java similarity index 79% rename from src/main/java/com/newyetai/security/ucard/UcardAuthenticationProvider.java rename to src/main/java/com/senmesh/security/ucard/UcardAuthenticationProvider.java index ba85fb6..c2cc8df 100644 --- a/src/main/java/com/newyetai/security/ucard/UcardAuthenticationProvider.java +++ b/src/main/java/com/senmesh/security/ucard/UcardAuthenticationProvider.java @@ -1,13 +1,13 @@ -package com.newyetai.security.ucard; +package com.senmesh.security.ucard; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.usercenter.user.login.dto.LoginUCardDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.usercenter.user.login.dto.LoginUCardDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; import java.util.HashSet; import java.util.Set; import org.springframework.security.authentication.AuthenticationProvider; diff --git a/src/main/java/com/newyetai/security/ucard/UcardAuthenticationToken.java b/src/main/java/com/senmesh/security/ucard/UcardAuthenticationToken.java similarity index 94% rename from src/main/java/com/newyetai/security/ucard/UcardAuthenticationToken.java rename to src/main/java/com/senmesh/security/ucard/UcardAuthenticationToken.java index 00eab17..76b7ccb 100644 --- a/src/main/java/com/newyetai/security/ucard/UcardAuthenticationToken.java +++ b/src/main/java/com/senmesh/security/ucard/UcardAuthenticationToken.java @@ -1,4 +1,4 @@ -package com.newyetai.security.ucard; +package com.senmesh.security.ucard; import java.util.Collection; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationFilter.java b/src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationFilter.java similarity index 92% rename from src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationFilter.java rename to src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationFilter.java index d282b77..9e79c7f 100644 --- a/src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationFilter.java +++ b/src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationFilter.java @@ -1,4 +1,4 @@ -package com.newyetai.security.upassword; +package com.senmesh.security.upassword; import java.io.IOException; @@ -13,9 +13,9 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.user.login.dto.LoginUsernamePasswordDTO; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.user.login.dto.LoginUsernamePasswordDTO; /** * 账号密码认证过滤器，指定请求组装token，调起认证 diff --git a/src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationProvider.java b/src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationProvider.java similarity index 80% rename from src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationProvider.java rename to src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationProvider.java index 30ffe5d..2f88a8e 100644 --- a/src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationProvider.java +++ b/src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.security.upassword; +package com.senmesh.security.upassword; import java.util.HashSet; import java.util.Set; @@ -9,14 +9,14 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.usercenter.user.login.dto.LoginUsernamePasswordDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.usercenter.user.login.dto.LoginUsernamePasswordDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; /** * 账号密码认证provider，比对信息是否匹配 diff --git a/src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationToken.java b/src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationToken.java similarity index 84% rename from src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationToken.java rename to src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationToken.java index f86906a..67ff479 100644 --- a/src/main/java/com/newyetai/security/upassword/UpasswordAuthenticationToken.java +++ b/src/main/java/com/senmesh/security/upassword/UpasswordAuthenticationToken.java @@ -1,8 +1,7 @@ -package com.newyetai.security.upassword; +package com.senmesh.security.upassword; import java.util.Collection; -import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/newyetai/security/util/HostContextHolder.java b/src/main/java/com/senmesh/security/util/HostContextHolder.java similarity index 93% rename from src/main/java/com/newyetai/security/util/HostContextHolder.java rename to src/main/java/com/senmesh/security/util/HostContextHolder.java index 51a497e..5c41bbf 100644 --- a/src/main/java/com/newyetai/security/util/HostContextHolder.java +++ b/src/main/java/com/senmesh/security/util/HostContextHolder.java @@ -1,4 +1,4 @@ -package com.newyetai.security.util; +package com.senmesh.security.util; /** * request请求host上下文 diff --git a/src/main/java/com/newyetai/security/util/MockUtils.java b/src/main/java/com/senmesh/security/util/MockUtils.java similarity index 81% rename from src/main/java/com/newyetai/security/util/MockUtils.java rename to src/main/java/com/senmesh/security/util/MockUtils.java index 89eaf57..ddbf2af 100644 --- a/src/main/java/com/newyetai/security/util/MockUtils.java +++ b/src/main/java/com/senmesh/security/util/MockUtils.java @@ -1,12 +1,12 @@ -package com.newyetai.security.util; +package com.senmesh.security.util; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.usercenter.constants.OrgConstants; -import com.newyetai.usercenter.constants.UserConstants; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.usercenter.constants.OrgConstants; +import com.senmesh.usercenter.constants.UserConstants; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/newyetai/security/util/PasswordUtils.java b/src/main/java/com/senmesh/security/util/PasswordUtils.java similarity index 94% rename from src/main/java/com/newyetai/security/util/PasswordUtils.java rename to src/main/java/com/senmesh/security/util/PasswordUtils.java index 5fecaf5..77d57a2 100644 --- a/src/main/java/com/newyetai/security/util/PasswordUtils.java +++ b/src/main/java/com/senmesh/security/util/PasswordUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.security.util; +package com.senmesh.security.util; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/com/newyetai/security/util/SecurityMockProvider.java b/src/main/java/com/senmesh/security/util/SecurityMockProvider.java similarity index 81% rename from src/main/java/com/newyetai/security/util/SecurityMockProvider.java rename to src/main/java/com/senmesh/security/util/SecurityMockProvider.java index 3961cb7..a31098a 100644 --- a/src/main/java/com/newyetai/security/util/SecurityMockProvider.java +++ b/src/main/java/com/senmesh/security/util/SecurityMockProvider.java @@ -1,8 +1,8 @@ -package com.newyetai.security.util; +package com.senmesh.security.util; import org.springframework.stereotype.Service; -import com.newyetai.common.service.IMockProvider; +import com.senmesh.common.service.IMockProvider; @Service public class SecurityMockProvider implements IMockProvider{ diff --git a/src/main/java/com/newyetai/security/util/SecurityPropertyUtils.java b/src/main/java/com/senmesh/security/util/SecurityPropertyUtils.java similarity index 93% rename from src/main/java/com/newyetai/security/util/SecurityPropertyUtils.java rename to src/main/java/com/senmesh/security/util/SecurityPropertyUtils.java index 0cd6b3d..3a80d30 100644 --- a/src/main/java/com/newyetai/security/util/SecurityPropertyUtils.java +++ b/src/main/java/com/senmesh/security/util/SecurityPropertyUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.security.util; +package com.senmesh.security.util; import java.util.ArrayList; import java.util.Collections; @@ -11,9 +11,9 @@ import org.springframework.http.HttpMethod; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.security.config.SecurityProperties; -import com.newyetai.usercenter.constants.SecurityConstants; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.security.config.SecurityProperties; +import com.senmesh.usercenter.constants.SecurityConstants; /** * @author sr on 2020-09-10 diff --git a/src/main/java/com/newyetai/security/util/SecurityUtils.java b/src/main/java/com/senmesh/security/util/SecurityUtils.java similarity index 94% rename from src/main/java/com/newyetai/security/util/SecurityUtils.java rename to src/main/java/com/senmesh/security/util/SecurityUtils.java index 5a29dbe..4a0dfa1 100644 --- a/src/main/java/com/newyetai/security/util/SecurityUtils.java +++ b/src/main/java/com/senmesh/security/util/SecurityUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.security.util; +package com.senmesh.security.util; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; @@ -10,10 +10,10 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.RequestUtils; -import com.newyetai.usercenter.constants.SecurityConstants; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.RequestUtils; +import com.senmesh.usercenter.constants.SecurityConstants; import cn.hutool.core.util.URLUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/security/util/UserLoginUtils.java b/src/main/java/com/senmesh/security/util/UserLoginUtils.java similarity index 73% rename from src/main/java/com/newyetai/security/util/UserLoginUtils.java rename to src/main/java/com/senmesh/security/util/UserLoginUtils.java index cdedddc..c2061e8 100644 --- a/src/main/java/com/newyetai/security/util/UserLoginUtils.java +++ b/src/main/java/com/senmesh/security/util/UserLoginUtils.java @@ -1,14 +1,14 @@ -package com.newyetai.security.util; +package com.senmesh.security.util; import org.springframework.stereotype.Component; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.security.service.IUserSecurityService; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.security.service.IUserSecurityService; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; /** * @author sr on 2020-06-15 diff --git a/src/main/java/com/newyetai/swagger/config/SwaggerConfig.java b/src/main/java/com/senmesh/swagger/config/SwaggerConfig.java similarity index 98% rename from src/main/java/com/newyetai/swagger/config/SwaggerConfig.java rename to src/main/java/com/senmesh/swagger/config/SwaggerConfig.java index 64dd0f4..3398978 100644 --- a/src/main/java/com/newyetai/swagger/config/SwaggerConfig.java +++ b/src/main/java/com/senmesh/swagger/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.swagger.config; +package com.senmesh.swagger.config; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/newyetai/tkmybatis/mybatis/MyMapper.java b/src/main/java/com/senmesh/tkmybatis/mybatis/MyMapper.java similarity index 96% rename from src/main/java/com/newyetai/tkmybatis/mybatis/MyMapper.java rename to src/main/java/com/senmesh/tkmybatis/mybatis/MyMapper.java index 1543885..c896de8 100644 --- a/src/main/java/com/newyetai/tkmybatis/mybatis/MyMapper.java +++ b/src/main/java/com/senmesh/tkmybatis/mybatis/MyMapper.java @@ -1,4 +1,4 @@ -package com.newyetai.tkmybatis.mybatis; +package com.senmesh.tkmybatis.mybatis; import java.util.Collection; @@ -6,11 +6,10 @@ import java.util.Date; import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.entity.BaseEntity; +import com.senmesh.common.util.UserContextHolder; /** * diff --git a/src/main/java/com/newyetai/tkmybatis/pojo/Page.java b/src/main/java/com/senmesh/tkmybatis/pojo/Page.java similarity index 94% rename from src/main/java/com/newyetai/tkmybatis/pojo/Page.java rename to src/main/java/com/senmesh/tkmybatis/pojo/Page.java index 89f1fc0..416c8e9 100644 --- a/src/main/java/com/newyetai/tkmybatis/pojo/Page.java +++ b/src/main/java/com/senmesh/tkmybatis/pojo/Page.java @@ -1,6 +1,6 @@ -package com.newyetai.tkmybatis.pojo; +package com.senmesh.tkmybatis.pojo; -import com.newyetai.common.dto.IPage; +import com.senmesh.common.dto.IPage; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/annex/controller/UserAnnexController.java b/src/main/java/com/senmesh/usercenter/annex/controller/UserAnnexController.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/annex/controller/UserAnnexController.java rename to src/main/java/com/senmesh/usercenter/annex/controller/UserAnnexController.java index b85c492..e1e2cbe 100644 --- a/src/main/java/com/newyetai/usercenter/annex/controller/UserAnnexController.java +++ b/src/main/java/com/senmesh/usercenter/annex/controller/UserAnnexController.java @@ -1,21 +1,20 @@ -package com.newyetai.usercenter.annex.controller; +package com.senmesh.usercenter.annex.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.annex.dto.UserAnnexCreateDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexOperateDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexPageQueryDTO; -import com.newyetai.usercenter.annex.entity.UserAnnex; -import com.newyetai.usercenter.annex.service.IUserAnnexService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.annex.dto.UserAnnexCreateDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexOperateDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexPageQueryDTO; +import com.senmesh.usercenter.annex.entity.UserAnnex; +import com.senmesh.usercenter.annex.service.IUserAnnexService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/newyetai/usercenter/annex/dao/UserAnnexDao.java b/src/main/java/com/senmesh/usercenter/annex/dao/UserAnnexDao.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/annex/dao/UserAnnexDao.java rename to src/main/java/com/senmesh/usercenter/annex/dao/UserAnnexDao.java index aee8a9d..bde8b21 100644 --- a/src/main/java/com/newyetai/usercenter/annex/dao/UserAnnexDao.java +++ b/src/main/java/com/senmesh/usercenter/annex/dao/UserAnnexDao.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.annex.dao; +package com.senmesh.usercenter.annex.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.usercenter.annex.dto.UserAnnexDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexPageQueryDTO; -import com.newyetai.usercenter.annex.entity.UserAnnex; +import com.senmesh.usercenter.annex.dto.UserAnnexDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexPageQueryDTO; +import com.senmesh.usercenter.annex.entity.UserAnnex; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexCreateDTO.java b/src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexCreateDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexCreateDTO.java rename to src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexCreateDTO.java index 6a713cf..ee8380e 100644 --- a/src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexCreateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.annex.dto; +package com.senmesh.usercenter.annex.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validate.EnumValidator; -import com.newyetai.usercenter.annex.enums.AnnexTypeEnum; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validate.EnumValidator; +import com.senmesh.usercenter.annex.enums.AnnexTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexDTO.java b/src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexDTO.java rename to src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexDTO.java index fa0ae5c..1fbf245 100644 --- a/src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexDTO.java +++ b/src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.annex.dto; +package com.senmesh.usercenter.annex.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexOperateDTO.java b/src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexOperateDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexOperateDTO.java rename to src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexOperateDTO.java index 4fd26d7..24817a3 100644 --- a/src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexOperateDTO.java @@ -1,13 +1,12 @@ -package com.newyetai.usercenter.annex.dto; +package com.senmesh.usercenter.annex.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexPageQueryDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexPageQueryDTO.java index bdac369..62fd9f9 100644 --- a/src/main/java/com/newyetai/usercenter/annex/dto/UserAnnexPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/annex/dto/UserAnnexPageQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.annex.dto; +package com.senmesh.usercenter.annex.dto; import com.google.common.collect.Sets; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/annex/entity/UserAnnex.java b/src/main/java/com/senmesh/usercenter/annex/entity/UserAnnex.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/annex/entity/UserAnnex.java rename to src/main/java/com/senmesh/usercenter/annex/entity/UserAnnex.java index a8bc308..a67bc6e 100644 --- a/src/main/java/com/newyetai/usercenter/annex/entity/UserAnnex.java +++ b/src/main/java/com/senmesh/usercenter/annex/entity/UserAnnex.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.annex.entity; +package com.senmesh.usercenter.annex.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.usercenter.annex.enums.AnnexTypeEnum; +import com.senmesh.common.entity.BaseEntity; +import com.senmesh.usercenter.annex.enums.AnnexTypeEnum; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/com/newyetai/usercenter/annex/enums/AnnexTypeEnum.java b/src/main/java/com/senmesh/usercenter/annex/enums/AnnexTypeEnum.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/annex/enums/AnnexTypeEnum.java rename to src/main/java/com/senmesh/usercenter/annex/enums/AnnexTypeEnum.java index 959d9f0..a421515 100644 --- a/src/main/java/com/newyetai/usercenter/annex/enums/AnnexTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/annex/enums/AnnexTypeEnum.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.annex.enums; +package com.senmesh.usercenter.annex.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; /** * 附件类型的枚举 diff --git a/src/main/java/com/newyetai/usercenter/annex/mapper/UserAnnexMapper.xml b/src/main/java/com/senmesh/usercenter/annex/mapper/UserAnnexMapper.xml similarity index 86% rename from src/main/java/com/newyetai/usercenter/annex/mapper/UserAnnexMapper.xml rename to src/main/java/com/senmesh/usercenter/annex/mapper/UserAnnexMapper.xml index 386ee89..9e3ed56 100644 --- a/src/main/java/com/newyetai/usercenter/annex/mapper/UserAnnexMapper.xml +++ b/src/main/java/com/senmesh/usercenter/annex/mapper/UserAnnexMapper.xml @@ -1,8 +1,8 @@ - + - select * from xs_user_annex where deleted = 0 diff --git a/src/main/java/com/newyetai/usercenter/annex/mapstruct/UserAnnexMapMapper.java b/src/main/java/com/senmesh/usercenter/annex/mapstruct/UserAnnexMapMapper.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/annex/mapstruct/UserAnnexMapMapper.java rename to src/main/java/com/senmesh/usercenter/annex/mapstruct/UserAnnexMapMapper.java index d35cc2f..d28da4d 100644 --- a/src/main/java/com/newyetai/usercenter/annex/mapstruct/UserAnnexMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/annex/mapstruct/UserAnnexMapMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.annex.mapstruct; +package com.senmesh.usercenter.annex.mapstruct; -import com.newyetai.common.util.EnumUtil; -import com.newyetai.usercenter.annex.dto.UserAnnexCreateDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexDTO; -import com.newyetai.usercenter.annex.entity.UserAnnex; -import com.newyetai.usercenter.annex.enums.AnnexTypeEnum; +import com.senmesh.common.util.EnumUtil; +import com.senmesh.usercenter.annex.dto.UserAnnexCreateDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexDTO; +import com.senmesh.usercenter.annex.entity.UserAnnex; +import com.senmesh.usercenter.annex.enums.AnnexTypeEnum; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; diff --git a/src/main/java/com/newyetai/usercenter/annex/service/IUserAnnexService.java b/src/main/java/com/senmesh/usercenter/annex/service/IUserAnnexService.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/annex/service/IUserAnnexService.java rename to src/main/java/com/senmesh/usercenter/annex/service/IUserAnnexService.java index d757ba4..4fa6c68 100644 --- a/src/main/java/com/newyetai/usercenter/annex/service/IUserAnnexService.java +++ b/src/main/java/com/senmesh/usercenter/annex/service/IUserAnnexService.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.annex.service; +package com.senmesh.usercenter.annex.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.usercenter.annex.dto.UserAnnexCreateDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexOperateDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexPageQueryDTO; -import com.newyetai.usercenter.annex.entity.UserAnnex; +import com.senmesh.usercenter.annex.dto.UserAnnexCreateDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexOperateDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexPageQueryDTO; +import com.senmesh.usercenter.annex.entity.UserAnnex; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/usercenter/annex/service/impl/UserAnnexServiceImpl.java b/src/main/java/com/senmesh/usercenter/annex/service/impl/UserAnnexServiceImpl.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/annex/service/impl/UserAnnexServiceImpl.java rename to src/main/java/com/senmesh/usercenter/annex/service/impl/UserAnnexServiceImpl.java index 06dcbfe..66d4842 100644 --- a/src/main/java/com/newyetai/usercenter/annex/service/impl/UserAnnexServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/annex/service/impl/UserAnnexServiceImpl.java @@ -1,25 +1,22 @@ -package com.newyetai.usercenter.annex.service.impl; +package com.senmesh.usercenter.annex.service.impl; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.frame.redis.aop.annotation.AutoUnLock; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.usercenter.annex.dao.UserAnnexDao; -import com.newyetai.usercenter.annex.dto.UserAnnexCreateDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexOperateDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexPageQueryDTO; -import com.newyetai.usercenter.annex.entity.UserAnnex; -import com.newyetai.usercenter.annex.mapstruct.UserAnnexMapMapper; -import com.newyetai.usercenter.annex.service.IUserAnnexService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.frame.redis.aop.annotation.AutoUnLock; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.usercenter.annex.dao.UserAnnexDao; +import com.senmesh.usercenter.annex.dto.UserAnnexCreateDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexOperateDTO; +import com.senmesh.usercenter.annex.dto.UserAnnexPageQueryDTO; +import com.senmesh.usercenter.annex.entity.UserAnnex; +import com.senmesh.usercenter.annex.mapstruct.UserAnnexMapMapper; +import com.senmesh.usercenter.annex.service.IUserAnnexService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/auth/constant/AuthClientConstants.java b/src/main/java/com/senmesh/usercenter/auth/constant/AuthClientConstants.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/auth/constant/AuthClientConstants.java rename to src/main/java/com/senmesh/usercenter/auth/constant/AuthClientConstants.java index 0fbe8f5..df92a19 100644 --- a/src/main/java/com/newyetai/usercenter/auth/constant/AuthClientConstants.java +++ b/src/main/java/com/senmesh/usercenter/auth/constant/AuthClientConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.constant; +package com.senmesh.usercenter.auth.constant; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/auth/constant/AuthDetailConstants.java b/src/main/java/com/senmesh/usercenter/auth/constant/AuthDetailConstants.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/auth/constant/AuthDetailConstants.java rename to src/main/java/com/senmesh/usercenter/auth/constant/AuthDetailConstants.java index 9f66e52..7b59574 100644 --- a/src/main/java/com/newyetai/usercenter/auth/constant/AuthDetailConstants.java +++ b/src/main/java/com/senmesh/usercenter/auth/constant/AuthDetailConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.constant; +package com.senmesh.usercenter.auth.constant; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/auth/constant/AuthDetailEntrypointConstants.java b/src/main/java/com/senmesh/usercenter/auth/constant/AuthDetailEntrypointConstants.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/auth/constant/AuthDetailEntrypointConstants.java rename to src/main/java/com/senmesh/usercenter/auth/constant/AuthDetailEntrypointConstants.java index 207cd61..d58ef48 100644 --- a/src/main/java/com/newyetai/usercenter/auth/constant/AuthDetailEntrypointConstants.java +++ b/src/main/java/com/senmesh/usercenter/auth/constant/AuthDetailEntrypointConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.constant; +package com.senmesh.usercenter.auth.constant; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/auth/constant/AuthMainTypeEnum.java b/src/main/java/com/senmesh/usercenter/auth/constant/AuthMainTypeEnum.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/auth/constant/AuthMainTypeEnum.java rename to src/main/java/com/senmesh/usercenter/auth/constant/AuthMainTypeEnum.java index e5c07a6..9339ced 100644 --- a/src/main/java/com/newyetai/usercenter/auth/constant/AuthMainTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/auth/constant/AuthMainTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.constant; +package com.senmesh.usercenter.auth.constant; import java.util.Map; diff --git a/src/main/java/com/newyetai/usercenter/auth/constant/AuthTypeEnum.java b/src/main/java/com/senmesh/usercenter/auth/constant/AuthTypeEnum.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/auth/constant/AuthTypeEnum.java rename to src/main/java/com/senmesh/usercenter/auth/constant/AuthTypeEnum.java index 11cd714..ba65ce8 100644 --- a/src/main/java/com/newyetai/usercenter/auth/constant/AuthTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/auth/constant/AuthTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.constant; +package com.senmesh.usercenter.auth.constant; import java.util.Map; diff --git a/src/main/java/com/newyetai/usercenter/auth/constant/LiteCodeConfigEnum.java b/src/main/java/com/senmesh/usercenter/auth/constant/LiteCodeConfigEnum.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/auth/constant/LiteCodeConfigEnum.java rename to src/main/java/com/senmesh/usercenter/auth/constant/LiteCodeConfigEnum.java index a07cf7f..91ddee2 100644 --- a/src/main/java/com/newyetai/usercenter/auth/constant/LiteCodeConfigEnum.java +++ b/src/main/java/com/senmesh/usercenter/auth/constant/LiteCodeConfigEnum.java @@ -1,7 +1,4 @@ -package com.newyetai.usercenter.auth.constant; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.newyetai.mybatis.handle.BaseEnum; +package com.senmesh.usercenter.auth.constant; /** * @description: diff --git a/src/main/java/com/newyetai/usercenter/auth/constant/LiteCodeConstant.java b/src/main/java/com/senmesh/usercenter/auth/constant/LiteCodeConstant.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/auth/constant/LiteCodeConstant.java rename to src/main/java/com/senmesh/usercenter/auth/constant/LiteCodeConstant.java index bdfa7e2..e411b51 100644 --- a/src/main/java/com/newyetai/usercenter/auth/constant/LiteCodeConstant.java +++ b/src/main/java/com/senmesh/usercenter/auth/constant/LiteCodeConstant.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.constant; +package com.senmesh.usercenter.auth.constant; /** * 二维码 常量 diff --git a/src/main/java/com/newyetai/usercenter/auth/controller/AuthClientController.java b/src/main/java/com/senmesh/usercenter/auth/controller/AuthClientController.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/auth/controller/AuthClientController.java rename to src/main/java/com/senmesh/usercenter/auth/controller/AuthClientController.java index 5589967..459f381 100644 --- a/src/main/java/com/newyetai/usercenter/auth/controller/AuthClientController.java +++ b/src/main/java/com/senmesh/usercenter/auth/controller/AuthClientController.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.auth.controller; +package com.senmesh.usercenter.auth.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.dto.CasTokenDTO; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientOperateDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.LitePhoneAuthDTO; -import com.newyetai.usercenter.auth.dto.LitePhoneLoginDTO; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.auth.service.impl.LitePhoneLoginProvider; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.dto.CasTokenDTO; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientOperateDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.LitePhoneAuthDTO; +import com.senmesh.usercenter.auth.dto.LitePhoneLoginDTO; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.auth.service.impl.LitePhoneLoginProvider; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/auth/controller/AuthDetailController.java b/src/main/java/com/senmesh/usercenter/auth/controller/AuthDetailController.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/auth/controller/AuthDetailController.java rename to src/main/java/com/senmesh/usercenter/auth/controller/AuthDetailController.java index 204881f..3b74bdc 100644 --- a/src/main/java/com/newyetai/usercenter/auth/controller/AuthDetailController.java +++ b/src/main/java/com/senmesh/usercenter/auth/controller/AuthDetailController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.controller; +package com.senmesh.usercenter.auth.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -7,11 +7,11 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.auth.dto.AuthDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailQueryDTO; -import com.newyetai.usercenter.auth.service.AuthDetailService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.auth.dto.AuthDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailQueryDTO; +import com.senmesh.usercenter.auth.service.AuthDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/auth/controller/AuthDetailEntrypointController.java b/src/main/java/com/senmesh/usercenter/auth/controller/AuthDetailEntrypointController.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/auth/controller/AuthDetailEntrypointController.java rename to src/main/java/com/senmesh/usercenter/auth/controller/AuthDetailEntrypointController.java index 7128d2d..ef54958 100644 --- a/src/main/java/com/newyetai/usercenter/auth/controller/AuthDetailEntrypointController.java +++ b/src/main/java/com/senmesh/usercenter/auth/controller/AuthDetailEntrypointController.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.auth.controller; +package com.senmesh.usercenter.auth.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.auth.dto.*; -import com.newyetai.usercenter.auth.service.AuthDetailEntrypointService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.auth.dto.*; +import com.senmesh.usercenter.auth.service.AuthDetailEntrypointService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; diff --git a/src/main/java/com/newyetai/usercenter/auth/controller/AuthSubscribeDetailController.java b/src/main/java/com/senmesh/usercenter/auth/controller/AuthSubscribeDetailController.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/auth/controller/AuthSubscribeDetailController.java rename to src/main/java/com/senmesh/usercenter/auth/controller/AuthSubscribeDetailController.java index 415b6cc..0f79a90 100644 --- a/src/main/java/com/newyetai/usercenter/auth/controller/AuthSubscribeDetailController.java +++ b/src/main/java/com/senmesh/usercenter/auth/controller/AuthSubscribeDetailController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.controller; +package com.senmesh.usercenter.auth.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -7,11 +7,11 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailQueryDTO; -import com.newyetai.usercenter.auth.service.AuthSubscribeDetailService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailQueryDTO; +import com.senmesh.usercenter.auth.service.AuthSubscribeDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/auth/controller/AuthTypeController.java b/src/main/java/com/senmesh/usercenter/auth/controller/AuthTypeController.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/auth/controller/AuthTypeController.java rename to src/main/java/com/senmesh/usercenter/auth/controller/AuthTypeController.java index cc7fe65..f211e38 100644 --- a/src/main/java/com/newyetai/usercenter/auth/controller/AuthTypeController.java +++ b/src/main/java/com/senmesh/usercenter/auth/controller/AuthTypeController.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.auth.controller; +package com.senmesh.usercenter.auth.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.auth.dto.AuthTypeDTO; -import com.newyetai.usercenter.auth.dto.AuthTypeOperateDTO; -import com.newyetai.usercenter.auth.dto.AuthTypeQueryDTO; -import com.newyetai.usercenter.auth.service.AuthTypeService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.auth.dto.AuthTypeDTO; +import com.senmesh.usercenter.auth.dto.AuthTypeOperateDTO; +import com.senmesh.usercenter.auth.dto.AuthTypeQueryDTO; +import com.senmesh.usercenter.auth.service.AuthTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/auth/controller/LiteCodeConfigController.java b/src/main/java/com/senmesh/usercenter/auth/controller/LiteCodeConfigController.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/auth/controller/LiteCodeConfigController.java rename to src/main/java/com/senmesh/usercenter/auth/controller/LiteCodeConfigController.java index 627ca05..26abc76 100644 --- a/src/main/java/com/newyetai/usercenter/auth/controller/LiteCodeConfigController.java +++ b/src/main/java/com/senmesh/usercenter/auth/controller/LiteCodeConfigController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.controller; +package com.senmesh.usercenter.auth.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -10,15 +10,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.validation.annotation.Validated; -import com.newyetai.common.validation.Update; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigQueryDTO; -import com.newyetai.usercenter.auth.service.LiteCodeConfigService; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigOperateDTO; +import com.senmesh.common.validation.Update; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigQueryDTO; +import com.senmesh.usercenter.auth.service.LiteCodeConfigService; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigOperateDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/auth/controller/LiteCodeController.java b/src/main/java/com/senmesh/usercenter/auth/controller/LiteCodeController.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/auth/controller/LiteCodeController.java rename to src/main/java/com/senmesh/usercenter/auth/controller/LiteCodeController.java index d88d3b5..79094a9 100644 --- a/src/main/java/com/newyetai/usercenter/auth/controller/LiteCodeController.java +++ b/src/main/java/com/senmesh/usercenter/auth/controller/LiteCodeController.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.auth.controller; +package com.senmesh.usercenter.auth.controller; -import com.newyetai.usercenter.auth.dto.LiteCodeModifyDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeModifyDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.auth.dto.LiteCodeCreateDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeQueryDTO; -import com.newyetai.usercenter.auth.service.LiteCodeService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.auth.dto.LiteCodeCreateDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeQueryDTO; +import com.senmesh.usercenter.auth.service.LiteCodeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/auth/dao/AuthClientMapper.java b/src/main/java/com/senmesh/usercenter/auth/dao/AuthClientMapper.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/auth/dao/AuthClientMapper.java rename to src/main/java/com/senmesh/usercenter/auth/dao/AuthClientMapper.java index 8f12162..5eb057a 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dao/AuthClientMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/dao/AuthClientMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.auth.dao; +package com.senmesh.usercenter.auth.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.entity.AuthClient; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.entity.AuthClient; /** * 授权客户端 diff --git a/src/main/java/com/newyetai/usercenter/auth/dao/AuthDetailEntrypointMapper.java b/src/main/java/com/senmesh/usercenter/auth/dao/AuthDetailEntrypointMapper.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/dao/AuthDetailEntrypointMapper.java rename to src/main/java/com/senmesh/usercenter/auth/dao/AuthDetailEntrypointMapper.java index 3f7d137..93405d7 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dao/AuthDetailEntrypointMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/dao/AuthDetailEntrypointMapper.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.auth.dao; +package com.senmesh.usercenter.auth.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.auth.dto.*; -import com.newyetai.usercenter.auth.entity.AuthDetailEntrypoint; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.auth.dto.*; +import com.senmesh.usercenter.auth.entity.AuthDetailEntrypoint; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/auth/dao/AuthDetailMapper.java b/src/main/java/com/senmesh/usercenter/auth/dao/AuthDetailMapper.java similarity index 55% rename from src/main/java/com/newyetai/usercenter/auth/dao/AuthDetailMapper.java rename to src/main/java/com/senmesh/usercenter/auth/dao/AuthDetailMapper.java index 98ddf3f..febec80 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dao/AuthDetailMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/dao/AuthDetailMapper.java @@ -1,10 +1,9 @@ -package com.newyetai.usercenter.auth.dao; +package com.senmesh.usercenter.auth.dao; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.auth.dto.AuthDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailQueryDTO; -import com.newyetai.usercenter.auth.entity.AuthDetail; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.auth.dto.AuthDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailQueryDTO; +import com.senmesh.usercenter.auth.entity.AuthDetail; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/auth/dao/AuthSubscribeDetailMapper.java b/src/main/java/com/senmesh/usercenter/auth/dao/AuthSubscribeDetailMapper.java similarity index 61% rename from src/main/java/com/newyetai/usercenter/auth/dao/AuthSubscribeDetailMapper.java rename to src/main/java/com/senmesh/usercenter/auth/dao/AuthSubscribeDetailMapper.java index adb0194..92a28c8 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dao/AuthSubscribeDetailMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/dao/AuthSubscribeDetailMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.auth.dao; +package com.senmesh.usercenter.auth.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailQueryDTO; -import com.newyetai.usercenter.auth.entity.AuthSubscribeDetail; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailQueryDTO; +import com.senmesh.usercenter.auth.entity.AuthSubscribeDetail; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 授权订阅明细 diff --git a/src/main/java/com/newyetai/usercenter/auth/dao/AuthTypeMapper.java b/src/main/java/com/senmesh/usercenter/auth/dao/AuthTypeMapper.java similarity index 60% rename from src/main/java/com/newyetai/usercenter/auth/dao/AuthTypeMapper.java rename to src/main/java/com/senmesh/usercenter/auth/dao/AuthTypeMapper.java index 7ebd58c..d5f3377 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dao/AuthTypeMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/dao/AuthTypeMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.auth.dao; +package com.senmesh.usercenter.auth.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.usercenter.auth.dto.AuthTypeDTO; -import com.newyetai.usercenter.auth.dto.AuthTypeQueryDTO; -import com.newyetai.usercenter.auth.entity.AuthType; +import com.senmesh.usercenter.auth.dto.AuthTypeDTO; +import com.senmesh.usercenter.auth.dto.AuthTypeQueryDTO; +import com.senmesh.usercenter.auth.entity.AuthType; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/auth/dao/LiteCodeConfigMapper.java b/src/main/java/com/senmesh/usercenter/auth/dao/LiteCodeConfigMapper.java similarity index 61% rename from src/main/java/com/newyetai/usercenter/auth/dao/LiteCodeConfigMapper.java rename to src/main/java/com/senmesh/usercenter/auth/dao/LiteCodeConfigMapper.java index 10c6857..d8e80da 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dao/LiteCodeConfigMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/dao/LiteCodeConfigMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.auth.dao; +package com.senmesh.usercenter.auth.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigQueryDTO; -import com.newyetai.usercenter.auth.entity.LiteCodeConfig; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigQueryDTO; +import com.senmesh.usercenter.auth.entity.LiteCodeConfig; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 小程序码配置 diff --git a/src/main/java/com/newyetai/usercenter/auth/dao/LiteCodeMapper.java b/src/main/java/com/senmesh/usercenter/auth/dao/LiteCodeMapper.java similarity index 60% rename from src/main/java/com/newyetai/usercenter/auth/dao/LiteCodeMapper.java rename to src/main/java/com/senmesh/usercenter/auth/dao/LiteCodeMapper.java index c6f53b2..1db3239 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dao/LiteCodeMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/dao/LiteCodeMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.auth.dao; +package com.senmesh.usercenter.auth.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.auth.dto.LiteCodeDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeQueryDTO; -import com.newyetai.usercenter.auth.entity.LiteCode; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.auth.dto.LiteCodeDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeQueryDTO; +import com.senmesh.usercenter.auth.entity.LiteCode; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 小程序码 diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthClientDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthClientDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthClientDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthClientDTO.java index 76d00fc..4be83b8 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthClientDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthClientDTO.java @@ -1,10 +1,9 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthClientDataDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthClientDataDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthClientDataDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthClientDataDTO.java index e07c251..c1893fe 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthClientDataDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthClientDataDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthClientOperateDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthClientOperateDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthClientOperateDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthClientOperateDTO.java index 6b5f4dd..5209aaf 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthClientOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthClientOperateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthClientQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthClientQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthClientQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthClientQueryDTO.java index fd551ae..9b09c47 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthClientQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthClientQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthCodeDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthCodeDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthCodeDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthCodeDTO.java index 5fc700a..a1e7661 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthCodeDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthCodeDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailBindDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailBindDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailBindDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailBindDTO.java index d12c2ae..dba43d2 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailBindDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailBindDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailCreateDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailCreateDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailCreateDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailCreateDTO.java index 3648962..a4a958e 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailDTO.java index 048147b..8cc2022 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointCreateDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointCreateDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointCreateDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointCreateDTO.java index f4f7570..c2070c9 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointCreateDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; import javax.validation.constraints.NotBlank; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointCreateRes.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointCreateRes.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointCreateRes.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointCreateRes.java index 9d0012d..335754e 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointCreateRes.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointCreateRes.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointDTO.java index 9519424..f3404a9 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexCreateDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointQueryDTO.java index 0221a0d..7e972fc 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailEntrypointQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailEntrypointQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailLoginDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailLoginDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailLoginDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailLoginDTO.java index a1d984a..e03a533 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailLoginDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailLoginDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailQueryDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailQueryDTO.java index e22a84c..6640d4b 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthDetailQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthDetailQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailCreateDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailCreateDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailCreateDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailCreateDTO.java index 363e61b..27cc3c0 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; @@ -9,9 +9,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2022-04-05 diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailDTO.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailDTO.java index 07abd19..e487703 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexCreateDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailQueryDTO.java index 54f7b2d..e5240dd 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthSubscribeDetailQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthSubscribeDetailQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2022-04-05 diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeDTO.java index 1d43898..50c6e32 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeOperateDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeOperateDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeOperateDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeOperateDTO.java index 1a30772..d4b32f5 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeOperateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeQueryDTO.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeQueryDTO.java index 3ef3116..b3f9c53 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/AuthTypeQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/AuthTypeQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/CodeToSessionDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/CodeToSessionDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/auth/dto/CodeToSessionDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/CodeToSessionDTO.java index e15b371..55294e2 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/CodeToSessionDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/CodeToSessionDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/InviteInfoDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/InviteInfoDTO.java similarity index 98% rename from src/main/java/com/newyetai/usercenter/auth/dto/InviteInfoDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/InviteInfoDTO.java index df81ede..7a91250 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/InviteInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/InviteInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/InviteInfoPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/InviteInfoPageQueryDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/auth/dto/InviteInfoPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/InviteInfoPageQueryDTO.java index 978b15f..fb7b803 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/InviteInfoPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/InviteInfoPageQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticDTO.java index c4bfe71..2d95a4f 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import io.swagger.annotations.ApiModel; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticInfoDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticInfoDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticInfoDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticInfoDTO.java index 10a9128..386502c 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticQueryDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticQueryDTO.java index 368fd7e..bd62d57 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/InviteStatisticQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/InviteStatisticQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigDTO.java index f1161fa..0072499 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.annex.dto.UserAnnexCreateDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigOperateDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigOperateDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigOperateDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigOperateDTO.java index ec7ea76..1b49849 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigOperateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; @@ -9,9 +9,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2021-12-21 diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigQueryDTO.java index 0f53d86..ac3f777 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeConfigQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeConfigQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2021-12-21 diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeCreateDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeCreateDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeCreateDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeCreateDTO.java index f7286d0..a0f109e 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeCreateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import com.google.common.collect.Maps; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeDTO.java index 7fa758c..e0e1eeb 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeDTO.java @@ -1,11 +1,10 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeModifyDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeModifyDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeModifyDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeModifyDTO.java index af6233a..4ba015e 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeModifyDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeModifyDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeQueryDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeQueryDTO.java index dd6fec5..40a277b 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LiteCodeQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LiteCodeQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LitePhoneAuthDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LitePhoneAuthDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/auth/dto/LitePhoneAuthDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LitePhoneAuthDTO.java index b6f9560..66c1b20 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LitePhoneAuthDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LitePhoneAuthDTO.java @@ -1,9 +1,7 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; -import javax.validation.constraints.NotBlank; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/LitePhoneLoginDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/LitePhoneLoginDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/auth/dto/LitePhoneLoginDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/LitePhoneLoginDTO.java index 919ac7a..5181c6e 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/LitePhoneLoginDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/LitePhoneLoginDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/PcInviteInfoDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/PcInviteInfoDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/auth/dto/PcInviteInfoDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/PcInviteInfoDTO.java index 5478e2c..f66ff46 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/PcInviteInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/PcInviteInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/PcInviteInfoPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/PcInviteInfoPageQueryDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/auth/dto/PcInviteInfoPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/PcInviteInfoPageQueryDTO.java index cda38ba..42d02b1 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/PcInviteInfoPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/PcInviteInfoPageQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/PcInviteStatisticInfoDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/PcInviteStatisticInfoDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/auth/dto/PcInviteStatisticInfoDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/PcInviteStatisticInfoDTO.java index 142e52a..4e0682a 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/PcInviteStatisticInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/PcInviteStatisticInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/auth/dto/RegistrationInfoDTO.java b/src/main/java/com/senmesh/usercenter/auth/dto/RegistrationInfoDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/auth/dto/RegistrationInfoDTO.java rename to src/main/java/com/senmesh/usercenter/auth/dto/RegistrationInfoDTO.java index d4ab03b..b4f9b59 100644 --- a/src/main/java/com/newyetai/usercenter/auth/dto/RegistrationInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/dto/RegistrationInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.dto; +package com.senmesh.usercenter.auth.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/auth/entity/AuthClient.java b/src/main/java/com/senmesh/usercenter/auth/entity/AuthClient.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/auth/entity/AuthClient.java rename to src/main/java/com/senmesh/usercenter/auth/entity/AuthClient.java index a1f36ad..43f805e 100644 --- a/src/main/java/com/newyetai/usercenter/auth/entity/AuthClient.java +++ b/src/main/java/com/senmesh/usercenter/auth/entity/AuthClient.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.entity; +package com.senmesh.usercenter.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/entity/AuthDetail.java b/src/main/java/com/senmesh/usercenter/auth/entity/AuthDetail.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/auth/entity/AuthDetail.java rename to src/main/java/com/senmesh/usercenter/auth/entity/AuthDetail.java index 03bb8d3..6bab5b8 100644 --- a/src/main/java/com/newyetai/usercenter/auth/entity/AuthDetail.java +++ b/src/main/java/com/senmesh/usercenter/auth/entity/AuthDetail.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.entity; +package com.senmesh.usercenter.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/entity/AuthDetailEntrypoint.java b/src/main/java/com/senmesh/usercenter/auth/entity/AuthDetailEntrypoint.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/auth/entity/AuthDetailEntrypoint.java rename to src/main/java/com/senmesh/usercenter/auth/entity/AuthDetailEntrypoint.java index 14828f7..f3b32dc 100644 --- a/src/main/java/com/newyetai/usercenter/auth/entity/AuthDetailEntrypoint.java +++ b/src/main/java/com/senmesh/usercenter/auth/entity/AuthDetailEntrypoint.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.entity; +package com.senmesh.usercenter.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/entity/AuthSubscribeDetail.java b/src/main/java/com/senmesh/usercenter/auth/entity/AuthSubscribeDetail.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/auth/entity/AuthSubscribeDetail.java rename to src/main/java/com/senmesh/usercenter/auth/entity/AuthSubscribeDetail.java index 5442d01..1839df1 100644 --- a/src/main/java/com/newyetai/usercenter/auth/entity/AuthSubscribeDetail.java +++ b/src/main/java/com/senmesh/usercenter/auth/entity/AuthSubscribeDetail.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.entity; +package com.senmesh.usercenter.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/entity/AuthType.java b/src/main/java/com/senmesh/usercenter/auth/entity/AuthType.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/auth/entity/AuthType.java rename to src/main/java/com/senmesh/usercenter/auth/entity/AuthType.java index 74ae11b..a38b384 100644 --- a/src/main/java/com/newyetai/usercenter/auth/entity/AuthType.java +++ b/src/main/java/com/senmesh/usercenter/auth/entity/AuthType.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.entity; +package com.senmesh.usercenter.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/entity/LiteCode.java b/src/main/java/com/senmesh/usercenter/auth/entity/LiteCode.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/auth/entity/LiteCode.java rename to src/main/java/com/senmesh/usercenter/auth/entity/LiteCode.java index 7dd6219..4cdb585 100644 --- a/src/main/java/com/newyetai/usercenter/auth/entity/LiteCode.java +++ b/src/main/java/com/senmesh/usercenter/auth/entity/LiteCode.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.entity; +package com.senmesh.usercenter.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/entity/LiteCodeConfig.java b/src/main/java/com/senmesh/usercenter/auth/entity/LiteCodeConfig.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/auth/entity/LiteCodeConfig.java rename to src/main/java/com/senmesh/usercenter/auth/entity/LiteCodeConfig.java index fb83d57..ff31cf6 100644 --- a/src/main/java/com/newyetai/usercenter/auth/entity/LiteCodeConfig.java +++ b/src/main/java/com/senmesh/usercenter/auth/entity/LiteCodeConfig.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.auth.entity; +package com.senmesh.usercenter.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/job/AuthJob.java b/src/main/java/com/senmesh/usercenter/auth/job/AuthJob.java similarity index 100% rename from src/main/java/com/newyetai/usercenter/auth/job/AuthJob.java rename to src/main/java/com/senmesh/usercenter/auth/job/AuthJob.java diff --git a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthClientMapper.xml b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthClientMapper.xml similarity index 81% rename from src/main/java/com/newyetai/usercenter/auth/mapper/AuthClientMapper.xml rename to src/main/java/com/senmesh/usercenter/auth/mapper/AuthClientMapper.xml index b82e373..46c8374 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthClientMapper.xml +++ b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthClientMapper.xml @@ -2,8 +2,8 @@ - - select ac.* from uc_auth_client ac @@ -21,7 +21,7 @@ and (d.domain_name = #{param.domainOrIp} or d.ip_port = #{param.domainOrIp}) - SELECT ac.*, atp.name authTypeName diff --git a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthDetailEntrypointMapper.xml b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthDetailEntrypointMapper.xml similarity index 93% rename from src/main/java/com/newyetai/usercenter/auth/mapper/AuthDetailEntrypointMapper.xml rename to src/main/java/com/senmesh/usercenter/auth/mapper/AuthDetailEntrypointMapper.xml index ede067d..5e23fb0 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthDetailEntrypointMapper.xml +++ b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthDetailEntrypointMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_auth_detail_entrypoint @@ -19,7 +19,7 @@ and union_id = #{param.unionId} - SELECT ade.id entrypointId, u.nickname userNickName, @@ -72,7 +72,7 @@ order by ade.id desc - SELECT u.id as user_id, u.nickname, @@ -145,7 +145,7 @@ order by ade.id desc - SELECT ad.id authDetailId,ur.id userAuthId FROM @@ -227,7 +227,7 @@ and ade.create_time <= #{param.endTime} - SELECT pr.user_id, pr.position_id, diff --git a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthDetailMapper.xml b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthDetailMapper.xml similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/mapper/AuthDetailMapper.xml rename to src/main/java/com/senmesh/usercenter/auth/mapper/AuthDetailMapper.xml index de3ddd1..3a7bc55 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthDetailMapper.xml +++ b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthDetailMapper.xml @@ -2,8 +2,8 @@ - - SELECT ad.*, ac.client_name authClientName, diff --git a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthSubscribeDetailMapper.xml b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthSubscribeDetailMapper.xml similarity index 73% rename from src/main/java/com/newyetai/usercenter/auth/mapper/AuthSubscribeDetailMapper.xml rename to src/main/java/com/senmesh/usercenter/auth/mapper/AuthSubscribeDetailMapper.xml index e2e051f..aca1695 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthSubscribeDetailMapper.xml +++ b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthSubscribeDetailMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_auth_subscribe_detail diff --git a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthTypeMapper.xml b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthTypeMapper.xml similarity index 63% rename from src/main/java/com/newyetai/usercenter/auth/mapper/AuthTypeMapper.xml rename to src/main/java/com/senmesh/usercenter/auth/mapper/AuthTypeMapper.xml index 275ce05..2e9a398 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapper/AuthTypeMapper.xml +++ b/src/main/java/com/senmesh/usercenter/auth/mapper/AuthTypeMapper.xml @@ -2,8 +2,8 @@ - - SELECT atp.* FROM diff --git a/src/main/java/com/newyetai/usercenter/auth/mapper/LiteCodeConfigMapper.xml b/src/main/java/com/senmesh/usercenter/auth/mapper/LiteCodeConfigMapper.xml similarity index 73% rename from src/main/java/com/newyetai/usercenter/auth/mapper/LiteCodeConfigMapper.xml rename to src/main/java/com/senmesh/usercenter/auth/mapper/LiteCodeConfigMapper.xml index a169a4f..2d28923 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapper/LiteCodeConfigMapper.xml +++ b/src/main/java/com/senmesh/usercenter/auth/mapper/LiteCodeConfigMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_lite_code_config diff --git a/src/main/java/com/newyetai/usercenter/auth/mapper/LiteCodeMapper.xml b/src/main/java/com/senmesh/usercenter/auth/mapper/LiteCodeMapper.xml similarity index 87% rename from src/main/java/com/newyetai/usercenter/auth/mapper/LiteCodeMapper.xml rename to src/main/java/com/senmesh/usercenter/auth/mapper/LiteCodeMapper.xml index ebb1326..7db55ee 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapper/LiteCodeMapper.xml +++ b/src/main/java/com/senmesh/usercenter/auth/mapper/LiteCodeMapper.xml @@ -2,8 +2,8 @@ - - select lc.* from uc_lite_code lc diff --git a/src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthClientMapMapper.java b/src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthClientMapMapper.java similarity index 58% rename from src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthClientMapMapper.java rename to src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthClientMapMapper.java index cd75014..966f648 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthClientMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthClientMapMapper.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.auth.mapstruct; +package com.senmesh.usercenter.auth.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.sdk.bytedance.model.Code2SessionDataDTO; -import com.newyetai.sdk.wechat.model.Code2SessionDTO; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientOperateDTO; -import com.newyetai.usercenter.auth.dto.AuthTypeOperateDTO; -import com.newyetai.usercenter.auth.dto.CodeToSessionDTO; -import com.newyetai.usercenter.auth.entity.AuthClient; -import com.newyetai.usercenter.auth.entity.AuthType; +import com.senmesh.sdk.bytedance.model.Code2SessionDataDTO; +import com.senmesh.sdk.wechat.model.Code2SessionDTO; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientOperateDTO; +import com.senmesh.usercenter.auth.dto.AuthTypeOperateDTO; +import com.senmesh.usercenter.auth.dto.CodeToSessionDTO; +import com.senmesh.usercenter.auth.entity.AuthClient; +import com.senmesh.usercenter.auth.entity.AuthType; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthDetailEntrypointMapMapper.java b/src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthDetailEntrypointMapMapper.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthDetailEntrypointMapMapper.java rename to src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthDetailEntrypointMapMapper.java index 75128d6..d6ea234 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthDetailEntrypointMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthDetailEntrypointMapMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.auth.mapstruct; +package com.senmesh.usercenter.auth.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.auth.dto.AuthDetailEntrypointDTO; -import com.newyetai.usercenter.auth.entity.AuthDetailEntrypoint; +import com.senmesh.usercenter.auth.dto.AuthDetailEntrypointDTO; +import com.senmesh.usercenter.auth.entity.AuthDetailEntrypoint; /** * @author sr on 2022-01-06 diff --git a/src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthDetailMapMapper.java b/src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthDetailMapMapper.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthDetailMapMapper.java rename to src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthDetailMapMapper.java index a5b4ccd..573be11 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthDetailMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthDetailMapMapper.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.auth.mapstruct; +package com.senmesh.usercenter.auth.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.auth.dto.AuthDetailCreateDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.auth.dto.LitePhoneLoginDTO; -import com.newyetai.usercenter.auth.entity.AuthDetail; -import com.newyetai.usercenter.user.login.dto.LoginPhoneDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailCreateDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.auth.dto.LitePhoneLoginDTO; +import com.senmesh.usercenter.auth.entity.AuthDetail; +import com.senmesh.usercenter.user.login.dto.LoginPhoneDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthSubscribeDetailMapMapper.java b/src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthSubscribeDetailMapMapper.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthSubscribeDetailMapMapper.java rename to src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthSubscribeDetailMapMapper.java index 4f84a63..7983641 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapstruct/AuthSubscribeDetailMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/mapstruct/AuthSubscribeDetailMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.auth.mapstruct; +package com.senmesh.usercenter.auth.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailDTO; -import com.newyetai.usercenter.auth.entity.AuthSubscribeDetail; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailCreateDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailDTO; +import com.senmesh.usercenter.auth.entity.AuthSubscribeDetail; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailCreateDTO; /** * @author sr on 2022-04-05 diff --git a/src/main/java/com/newyetai/usercenter/auth/mapstruct/LiteCodeConfigMapMapper.java b/src/main/java/com/senmesh/usercenter/auth/mapstruct/LiteCodeConfigMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/auth/mapstruct/LiteCodeConfigMapMapper.java rename to src/main/java/com/senmesh/usercenter/auth/mapstruct/LiteCodeConfigMapMapper.java index 3085575..0f0a5ee 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapstruct/LiteCodeConfigMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/mapstruct/LiteCodeConfigMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.auth.mapstruct; +package com.senmesh.usercenter.auth.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigDTO; -import com.newyetai.usercenter.auth.entity.LiteCodeConfig; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigOperateDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigDTO; +import com.senmesh.usercenter.auth.entity.LiteCodeConfig; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigOperateDTO; /** * @author sr on 2021-12-21 diff --git a/src/main/java/com/newyetai/usercenter/auth/mapstruct/LiteCodeMapMapper.java b/src/main/java/com/senmesh/usercenter/auth/mapstruct/LiteCodeMapMapper.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/auth/mapstruct/LiteCodeMapMapper.java rename to src/main/java/com/senmesh/usercenter/auth/mapstruct/LiteCodeMapMapper.java index f942892..aa23add 100644 --- a/src/main/java/com/newyetai/usercenter/auth/mapstruct/LiteCodeMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/mapstruct/LiteCodeMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.auth.mapstruct; +package com.senmesh.usercenter.auth.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.auth.dto.LiteCodeDTO; -import com.newyetai.usercenter.auth.entity.LiteCode; -import com.newyetai.usercenter.auth.dto.LiteCodeCreateDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeDTO; +import com.senmesh.usercenter.auth.entity.LiteCode; +import com.senmesh.usercenter.auth.dto.LiteCodeCreateDTO; /** * @author sr on 2021-12-21 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/AuthClientService.java b/src/main/java/com/senmesh/usercenter/auth/service/AuthClientService.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/auth/service/AuthClientService.java rename to src/main/java/com/senmesh/usercenter/auth/service/AuthClientService.java index 321564f..ff995eb 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/AuthClientService.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/AuthClientService.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.service; +package com.senmesh.usercenter.auth.service; import java.util.List; @@ -6,20 +6,20 @@ import javax.validation.Valid; import org.springframework.validation.annotation.Validated; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.sdk.wechat.model.SubscibeMessageReq; -import com.newyetai.sdk.wechat.model.UnionDTO; -import com.newyetai.sdk.wechat.model.UrlSchemeReq; -import com.newyetai.sdk.wechat.model.WxacodeReq; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientDataDTO; -import com.newyetai.usercenter.auth.dto.AuthClientOperateDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.CodeToSessionDTO; -import com.newyetai.usercenter.auth.dto.LitePhoneAuthDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatSignatureReqDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatSignatureResDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.sdk.wechat.model.SubscibeMessageReq; +import com.senmesh.sdk.wechat.model.UnionDTO; +import com.senmesh.sdk.wechat.model.UrlSchemeReq; +import com.senmesh.sdk.wechat.model.WxacodeReq; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientDataDTO; +import com.senmesh.usercenter.auth.dto.AuthClientOperateDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.CodeToSessionDTO; +import com.senmesh.usercenter.auth.dto.LitePhoneAuthDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatSignatureReqDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatSignatureResDTO; /** * 授权客户端 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/AuthDetailEntrypointService.java b/src/main/java/com/senmesh/usercenter/auth/service/AuthDetailEntrypointService.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/auth/service/AuthDetailEntrypointService.java rename to src/main/java/com/senmesh/usercenter/auth/service/AuthDetailEntrypointService.java index edc8f35..444d38d 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/AuthDetailEntrypointService.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/AuthDetailEntrypointService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.auth.service; +package com.senmesh.usercenter.auth.service; -import com.newyetai.usercenter.auth.dto.*; +import com.senmesh.usercenter.auth.dto.*; -import com.newyetai.usercenter.auth.dto.AuthCodeDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailEntrypointDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailEntrypointQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthCodeDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailEntrypointDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailEntrypointQueryDTO; import java.util.List; /** diff --git a/src/main/java/com/newyetai/usercenter/auth/service/AuthDetailService.java b/src/main/java/com/senmesh/usercenter/auth/service/AuthDetailService.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/auth/service/AuthDetailService.java rename to src/main/java/com/senmesh/usercenter/auth/service/AuthDetailService.java index 6d0812b..a3b1c5d 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/AuthDetailService.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/AuthDetailService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.auth.service; +package com.senmesh.usercenter.auth.service; import java.util.List; -import com.newyetai.usercenter.auth.dto.AuthDetailCreateDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailCreateDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailQueryDTO; /** * 授权明细 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/AuthSubscribeDetailService.java b/src/main/java/com/senmesh/usercenter/auth/service/AuthSubscribeDetailService.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/auth/service/AuthSubscribeDetailService.java rename to src/main/java/com/senmesh/usercenter/auth/service/AuthSubscribeDetailService.java index 08c1fa2..605a9c0 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/AuthSubscribeDetailService.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/AuthSubscribeDetailService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.auth.service; +package com.senmesh.usercenter.auth.service; import java.util.List; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailQueryDTO; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailCreateDTO; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailCreateDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailDTO; /** * 授权订阅明细 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/AuthTypeService.java b/src/main/java/com/senmesh/usercenter/auth/service/AuthTypeService.java similarity index 66% rename from src/main/java/com/newyetai/usercenter/auth/service/AuthTypeService.java rename to src/main/java/com/senmesh/usercenter/auth/service/AuthTypeService.java index 7bac1e3..60de762 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/AuthTypeService.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/AuthTypeService.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.auth.service; +package com.senmesh.usercenter.auth.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.common.validation.Create; -import com.newyetai.usercenter.auth.dto.AuthTypeDTO; -import com.newyetai.usercenter.auth.dto.AuthTypeOperateDTO; -import com.newyetai.usercenter.auth.dto.AuthTypeQueryDTO; -import com.newyetai.usercenter.auth.entity.AuthType; +import com.senmesh.common.validation.Create; +import com.senmesh.usercenter.auth.dto.AuthTypeDTO; +import com.senmesh.usercenter.auth.dto.AuthTypeOperateDTO; +import com.senmesh.usercenter.auth.dto.AuthTypeQueryDTO; +import com.senmesh.usercenter.auth.entity.AuthType; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/usercenter/auth/service/LiteCodeConfigService.java b/src/main/java/com/senmesh/usercenter/auth/service/LiteCodeConfigService.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/auth/service/LiteCodeConfigService.java rename to src/main/java/com/senmesh/usercenter/auth/service/LiteCodeConfigService.java index 0fdc2dd..28745fd 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/LiteCodeConfigService.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/LiteCodeConfigService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.auth.service; +package com.senmesh.usercenter.auth.service; import java.util.List; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigQueryDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigOperateDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigQueryDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigOperateDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigDTO; /** * 小程序码配置 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/LiteCodeService.java b/src/main/java/com/senmesh/usercenter/auth/service/LiteCodeService.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/auth/service/LiteCodeService.java rename to src/main/java/com/senmesh/usercenter/auth/service/LiteCodeService.java index e0d3d51..d997e6f 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/LiteCodeService.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/LiteCodeService.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.auth.service; +package com.senmesh.usercenter.auth.service; import java.util.List; -import com.newyetai.usercenter.auth.dto.LiteCodeModifyDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeQueryDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeCreateDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeModifyDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeQueryDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeCreateDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeDTO; /** * 小程序码 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthClientServiceImpl.java b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthClientServiceImpl.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/auth/service/impl/AuthClientServiceImpl.java rename to src/main/java/com/senmesh/usercenter/auth/service/impl/AuthClientServiceImpl.java index 5a2e76a..2ed7b43 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthClientServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthClientServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.service.impl; +package com.senmesh.usercenter.auth.service.impl; import java.util.List; @@ -8,52 +8,52 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.google.common.collect.Lists; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.frame.redis.util.RedisUtils; -import com.newyetai.sdk.bytedance.ByteDanceUtils; -import com.newyetai.sdk.bytedance.model.Code2SessionDataDTO; -import com.newyetai.sdk.bytedance.model.Code2SessionReqDTO; -import com.newyetai.sdk.common.dto.LiteUserPhoneDTO; -import com.newyetai.sdk.common.util.LiteEncryptor; -import com.newyetai.sdk.wechat.WechatClient; -import com.newyetai.sdk.wechat.model.AbstractAccessTokenReq; -import com.newyetai.sdk.wechat.model.AccessTokenDTO; -import com.newyetai.sdk.wechat.model.BaseWeChatDTO; -import com.newyetai.sdk.wechat.model.BatchUnionDTO; -import com.newyetai.sdk.wechat.model.BatchUnionReq; -import com.newyetai.sdk.wechat.model.BufferDTO; -import com.newyetai.sdk.wechat.model.Code2SessionDTO; -import com.newyetai.sdk.wechat.model.JsApiTicketDTO; -import com.newyetai.sdk.wechat.model.PhoneNumberDTO; -import com.newyetai.sdk.wechat.model.PhoneNumberReq; -import com.newyetai.sdk.wechat.model.SubscibeMessageReq; -import com.newyetai.sdk.wechat.model.SubscibeUserDTO; -import com.newyetai.sdk.wechat.model.SubscibeUserReq; -import com.newyetai.sdk.wechat.model.UnionDTO; -import com.newyetai.sdk.wechat.model.UnionUser; -import com.newyetai.sdk.wechat.model.UrlSchemeDTO; -import com.newyetai.sdk.wechat.model.UrlSchemeReq; -import com.newyetai.sdk.wechat.model.WxacodeReq; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dao.AuthClientMapper; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientDataDTO; -import com.newyetai.usercenter.auth.dto.AuthClientOperateDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.CodeToSessionDTO; -import com.newyetai.usercenter.auth.dto.LitePhoneAuthDTO; -import com.newyetai.usercenter.auth.entity.AuthClient; -import com.newyetai.usercenter.auth.mapstruct.AuthClientMapMapper; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.auth.util.AuthClientUtils; -import com.newyetai.usercenter.auth.wechat.dto.WechatSignatureReqDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatSignatureResDTO; -import com.newyetai.usercenter.sys.util.DomainUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.frame.redis.util.RedisUtils; +import com.senmesh.sdk.bytedance.ByteDanceUtils; +import com.senmesh.sdk.bytedance.model.Code2SessionDataDTO; +import com.senmesh.sdk.bytedance.model.Code2SessionReqDTO; +import com.senmesh.sdk.common.dto.LiteUserPhoneDTO; +import com.senmesh.sdk.common.util.LiteEncryptor; +import com.senmesh.sdk.wechat.WechatClient; +import com.senmesh.sdk.wechat.model.AbstractAccessTokenReq; +import com.senmesh.sdk.wechat.model.AccessTokenDTO; +import com.senmesh.sdk.wechat.model.BaseWeChatDTO; +import com.senmesh.sdk.wechat.model.BatchUnionDTO; +import com.senmesh.sdk.wechat.model.BatchUnionReq; +import com.senmesh.sdk.wechat.model.BufferDTO; +import com.senmesh.sdk.wechat.model.Code2SessionDTO; +import com.senmesh.sdk.wechat.model.JsApiTicketDTO; +import com.senmesh.sdk.wechat.model.PhoneNumberDTO; +import com.senmesh.sdk.wechat.model.PhoneNumberReq; +import com.senmesh.sdk.wechat.model.SubscibeMessageReq; +import com.senmesh.sdk.wechat.model.SubscibeUserDTO; +import com.senmesh.sdk.wechat.model.SubscibeUserReq; +import com.senmesh.sdk.wechat.model.UnionDTO; +import com.senmesh.sdk.wechat.model.UnionUser; +import com.senmesh.sdk.wechat.model.UrlSchemeDTO; +import com.senmesh.sdk.wechat.model.UrlSchemeReq; +import com.senmesh.sdk.wechat.model.WxacodeReq; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dao.AuthClientMapper; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientDataDTO; +import com.senmesh.usercenter.auth.dto.AuthClientOperateDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.CodeToSessionDTO; +import com.senmesh.usercenter.auth.dto.LitePhoneAuthDTO; +import com.senmesh.usercenter.auth.entity.AuthClient; +import com.senmesh.usercenter.auth.mapstruct.AuthClientMapMapper; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.auth.util.AuthClientUtils; +import com.senmesh.usercenter.auth.wechat.dto.WechatSignatureReqDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatSignatureResDTO; +import com.senmesh.usercenter.sys.util.DomainUtils; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthDetailEntrypointServiceImpl.java b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthDetailEntrypointServiceImpl.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/auth/service/impl/AuthDetailEntrypointServiceImpl.java rename to src/main/java/com/senmesh/usercenter/auth/service/impl/AuthDetailEntrypointServiceImpl.java index 14d84d4..84005df 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthDetailEntrypointServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthDetailEntrypointServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.service.impl; +package com.senmesh.usercenter.auth.service.impl; import java.time.LocalDate; import java.time.LocalDateTime; @@ -18,43 +18,43 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Maps; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.IdcardUtils; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.auth.constant.AuthDetailEntrypointConstants; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dao.AuthDetailEntrypointMapper; -import com.newyetai.usercenter.auth.dao.AuthSubscribeDetailMapper; -import com.newyetai.usercenter.auth.dto.AuthClientDataDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.AuthCodeDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailCreateDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailEntrypointCreateRes; -import com.newyetai.usercenter.auth.dto.AuthDetailEntrypointDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailEntrypointQueryDTO; -import com.newyetai.usercenter.auth.dto.CodeToSessionDTO; -import com.newyetai.usercenter.auth.dto.InviteInfoDTO; -import com.newyetai.usercenter.auth.dto.InviteInfoPageQueryDTO; -import com.newyetai.usercenter.auth.dto.InviteStatisticDTO; -import com.newyetai.usercenter.auth.dto.InviteStatisticInfoDTO; -import com.newyetai.usercenter.auth.dto.InviteStatisticQueryDTO; -import com.newyetai.usercenter.auth.dto.PcInviteInfoDTO; -import com.newyetai.usercenter.auth.dto.PcInviteInfoPageQueryDTO; -import com.newyetai.usercenter.auth.dto.PcInviteStatisticInfoDTO; -import com.newyetai.usercenter.auth.dto.RegistrationInfoDTO; -import com.newyetai.usercenter.auth.entity.AuthDetailEntrypoint; -import com.newyetai.usercenter.auth.entity.AuthSubscribeDetail; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.auth.service.AuthDetailEntrypointService; -import com.newyetai.usercenter.auth.service.AuthDetailService; -import com.newyetai.usercenter.sys.util.DomainUtils; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dao.UserMapper; -import com.newyetai.usercenter.user.dto.UserAuthQueryDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCodeInfoDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.service.UserRegisterService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.IdcardUtils; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.auth.constant.AuthDetailEntrypointConstants; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dao.AuthDetailEntrypointMapper; +import com.senmesh.usercenter.auth.dao.AuthSubscribeDetailMapper; +import com.senmesh.usercenter.auth.dto.AuthClientDataDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthCodeDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailCreateDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailEntrypointCreateRes; +import com.senmesh.usercenter.auth.dto.AuthDetailEntrypointDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailEntrypointQueryDTO; +import com.senmesh.usercenter.auth.dto.CodeToSessionDTO; +import com.senmesh.usercenter.auth.dto.InviteInfoDTO; +import com.senmesh.usercenter.auth.dto.InviteInfoPageQueryDTO; +import com.senmesh.usercenter.auth.dto.InviteStatisticDTO; +import com.senmesh.usercenter.auth.dto.InviteStatisticInfoDTO; +import com.senmesh.usercenter.auth.dto.InviteStatisticQueryDTO; +import com.senmesh.usercenter.auth.dto.PcInviteInfoDTO; +import com.senmesh.usercenter.auth.dto.PcInviteInfoPageQueryDTO; +import com.senmesh.usercenter.auth.dto.PcInviteStatisticInfoDTO; +import com.senmesh.usercenter.auth.dto.RegistrationInfoDTO; +import com.senmesh.usercenter.auth.entity.AuthDetailEntrypoint; +import com.senmesh.usercenter.auth.entity.AuthSubscribeDetail; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.auth.service.AuthDetailEntrypointService; +import com.senmesh.usercenter.auth.service.AuthDetailService; +import com.senmesh.usercenter.sys.util.DomainUtils; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dao.UserMapper; +import com.senmesh.usercenter.user.dto.UserAuthQueryDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCodeInfoDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.service.UserRegisterService; import cn.hutool.core.date.DateUtil; diff --git a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthDetailServiceImpl.java b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthDetailServiceImpl.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/auth/service/impl/AuthDetailServiceImpl.java rename to src/main/java/com/senmesh/usercenter/auth/service/impl/AuthDetailServiceImpl.java index 9535566..fe2c13c 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthDetailServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.service.impl; +package com.senmesh.usercenter.auth.service.impl; import java.util.List; @@ -6,18 +6,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dao.AuthDetailMapper; -import com.newyetai.usercenter.auth.dto.AuthDetailCreateDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailQueryDTO; -import com.newyetai.usercenter.auth.entity.AuthDetail; -import com.newyetai.usercenter.auth.mapstruct.AuthDetailMapMapper; -import com.newyetai.usercenter.auth.service.AuthDetailService; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dao.AuthDetailMapper; +import com.senmesh.usercenter.auth.dto.AuthDetailCreateDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailQueryDTO; +import com.senmesh.usercenter.auth.entity.AuthDetail; +import com.senmesh.usercenter.auth.mapstruct.AuthDetailMapMapper; +import com.senmesh.usercenter.auth.service.AuthDetailService; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthSubscribeDetailServiceImpl.java b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthSubscribeDetailServiceImpl.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/auth/service/impl/AuthSubscribeDetailServiceImpl.java rename to src/main/java/com/senmesh/usercenter/auth/service/impl/AuthSubscribeDetailServiceImpl.java index ea09ba7..e3d1a11 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthSubscribeDetailServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthSubscribeDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.service.impl; +package com.senmesh.usercenter.auth.service.impl; import java.util.List; @@ -6,21 +6,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.sdk.wechat.model.UnionDTO; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dao.AuthSubscribeDetailMapper; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientDataDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailCreateDTO; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthSubscribeDetailQueryDTO; -import com.newyetai.usercenter.auth.entity.AuthSubscribeDetail; -import com.newyetai.usercenter.auth.mapstruct.AuthSubscribeDetailMapMapper; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.auth.service.AuthSubscribeDetailService; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.sdk.wechat.model.UnionDTO; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dao.AuthSubscribeDetailMapper; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientDataDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailCreateDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthSubscribeDetailQueryDTO; +import com.senmesh.usercenter.auth.entity.AuthSubscribeDetail; +import com.senmesh.usercenter.auth.mapstruct.AuthSubscribeDetailMapMapper; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.auth.service.AuthSubscribeDetailService; /** * @author sr on 2022-04-05 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthTypeServiceImpl.java b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthTypeServiceImpl.java similarity index 63% rename from src/main/java/com/newyetai/usercenter/auth/service/impl/AuthTypeServiceImpl.java rename to src/main/java/com/senmesh/usercenter/auth/service/impl/AuthTypeServiceImpl.java index 6bca174..8d30ff6 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/impl/AuthTypeServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/impl/AuthTypeServiceImpl.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.auth.service.impl; +package com.senmesh.usercenter.auth.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.auth.dao.AuthTypeMapper; -import com.newyetai.usercenter.auth.dto.AuthTypeDTO; -import com.newyetai.usercenter.auth.dto.AuthTypeOperateDTO; -import com.newyetai.usercenter.auth.dto.AuthTypeQueryDTO; -import com.newyetai.usercenter.auth.entity.AuthType; -import com.newyetai.usercenter.auth.mapstruct.AuthClientMapMapper; -import com.newyetai.usercenter.auth.service.AuthTypeService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.auth.dao.AuthTypeMapper; +import com.senmesh.usercenter.auth.dto.AuthTypeDTO; +import com.senmesh.usercenter.auth.dto.AuthTypeOperateDTO; +import com.senmesh.usercenter.auth.dto.AuthTypeQueryDTO; +import com.senmesh.usercenter.auth.entity.AuthType; +import com.senmesh.usercenter.auth.mapstruct.AuthClientMapMapper; +import com.senmesh.usercenter.auth.service.AuthTypeService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/auth/service/impl/LiteCodeConfigServiceImpl.java b/src/main/java/com/senmesh/usercenter/auth/service/impl/LiteCodeConfigServiceImpl.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/auth/service/impl/LiteCodeConfigServiceImpl.java rename to src/main/java/com/senmesh/usercenter/auth/service/impl/LiteCodeConfigServiceImpl.java index 09bc64c..a331122 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/impl/LiteCodeConfigServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/impl/LiteCodeConfigServiceImpl.java @@ -1,20 +1,20 @@ -package com.newyetai.usercenter.auth.service.impl; +package com.senmesh.usercenter.auth.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.usercenter.auth.dao.LiteCodeConfigMapper; -import com.newyetai.usercenter.auth.service.LiteCodeConfigService; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigQueryDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigDTO; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigOperateDTO; -import com.newyetai.usercenter.auth.entity.LiteCodeConfig; +import com.senmesh.usercenter.auth.dao.LiteCodeConfigMapper; +import com.senmesh.usercenter.auth.service.LiteCodeConfigService; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigQueryDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigDTO; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigOperateDTO; +import com.senmesh.usercenter.auth.entity.LiteCodeConfig; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; /** * @author sr on 2021-12-21 diff --git a/src/main/java/com/newyetai/usercenter/auth/service/impl/LiteCodeServiceImpl.java b/src/main/java/com/senmesh/usercenter/auth/service/impl/LiteCodeServiceImpl.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/auth/service/impl/LiteCodeServiceImpl.java rename to src/main/java/com/senmesh/usercenter/auth/service/impl/LiteCodeServiceImpl.java index 5fbe1a7..5e96034 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/impl/LiteCodeServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/impl/LiteCodeServiceImpl.java @@ -1,33 +1,32 @@ -package com.newyetai.usercenter.auth.service.impl; +package com.senmesh.usercenter.auth.service.impl; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.file.service.FileService; -import com.newyetai.frame.redis.aop.annotation.AutoUnLock; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.sdk.wechat.model.JumpWxa; -import com.newyetai.sdk.wechat.model.UrlSchemeReq; -import com.newyetai.sdk.wechat.model.WxacodeReq; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.constant.LiteCodeConstant; -import com.newyetai.usercenter.auth.dao.LiteCodeMapper; -import com.newyetai.usercenter.auth.dto.*; -import com.newyetai.usercenter.auth.entity.LiteCode; -import com.newyetai.usercenter.auth.mapstruct.LiteCodeMapMapper; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.auth.service.LiteCodeConfigService; -import com.newyetai.usercenter.auth.service.LiteCodeService; -import com.newyetai.usercenter.auth.util.AuthClientUtils; -import com.newyetai.usercenter.auth.util.LiteCodeUtils; -import com.newyetai.usercenter.sys.dao.DomainMapper; -import com.newyetai.usercenter.sys.dto.DomainDTO; -import com.newyetai.usercenter.sys.dto.DomainQueryDTO; -import com.newyetai.usercenter.sys.util.DomainUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.file.service.FileService; +import com.senmesh.frame.redis.aop.annotation.AutoUnLock; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.sdk.wechat.model.JumpWxa; +import com.senmesh.sdk.wechat.model.UrlSchemeReq; +import com.senmesh.sdk.wechat.model.WxacodeReq; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.constant.LiteCodeConstant; +import com.senmesh.usercenter.auth.dao.LiteCodeMapper; +import com.senmesh.usercenter.auth.dto.*; +import com.senmesh.usercenter.auth.entity.LiteCode; +import com.senmesh.usercenter.auth.mapstruct.LiteCodeMapMapper; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.auth.service.LiteCodeConfigService; +import com.senmesh.usercenter.auth.service.LiteCodeService; +import com.senmesh.usercenter.auth.util.AuthClientUtils; +import com.senmesh.usercenter.auth.util.LiteCodeUtils; +import com.senmesh.usercenter.sys.dao.DomainMapper; +import com.senmesh.usercenter.sys.dto.DomainDTO; +import com.senmesh.usercenter.sys.dto.DomainQueryDTO; +import com.senmesh.usercenter.sys.util.DomainUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/usercenter/auth/service/impl/LitePhoneLoginProvider.java b/src/main/java/com/senmesh/usercenter/auth/service/impl/LitePhoneLoginProvider.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/auth/service/impl/LitePhoneLoginProvider.java rename to src/main/java/com/senmesh/usercenter/auth/service/impl/LitePhoneLoginProvider.java index b8802f3..26fbd05 100644 --- a/src/main/java/com/newyetai/usercenter/auth/service/impl/LitePhoneLoginProvider.java +++ b/src/main/java/com/senmesh/usercenter/auth/service/impl/LitePhoneLoginProvider.java @@ -1,34 +1,31 @@ -package com.newyetai.usercenter.auth.service.impl; +package com.senmesh.usercenter.auth.service.impl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.newyetai.common.dto.CasTokenDTO; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.DevopsException; -import com.newyetai.common.exception.WithResultException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.sdk.common.dto.LiteUserPhoneDTO; -import com.newyetai.sdk.common.util.LiteEncryptor; -import com.newyetai.sdk.robot.util.RobotUtils; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.jwt.JwtTokenUtils; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.security.util.HostContextHolder; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dto.AuthClientDataDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailBindDTO; -import com.newyetai.usercenter.auth.dto.CodeToSessionDTO; -import com.newyetai.usercenter.auth.dto.LitePhoneLoginDTO; -import com.newyetai.usercenter.auth.mapstruct.AuthDetailMapMapper; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.sys.util.DomainUtils; -import com.newyetai.usercenter.user.login.dto.LoginPhoneDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.dto.CasTokenDTO; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.WithResultException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.sdk.common.dto.LiteUserPhoneDTO; +import com.senmesh.sdk.common.util.LiteEncryptor; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.jwt.JwtTokenUtils; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dto.AuthClientDataDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailBindDTO; +import com.senmesh.usercenter.auth.dto.CodeToSessionDTO; +import com.senmesh.usercenter.auth.dto.LitePhoneLoginDTO; +import com.senmesh.usercenter.auth.mapstruct.AuthDetailMapMapper; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.sys.util.DomainUtils; +import com.senmesh.usercenter.user.login.dto.LoginPhoneDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; +import com.senmesh.usercenter.user.service.UserService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/auth/util/AuthClientUtils.java b/src/main/java/com/senmesh/usercenter/auth/util/AuthClientUtils.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/auth/util/AuthClientUtils.java rename to src/main/java/com/senmesh/usercenter/auth/util/AuthClientUtils.java index cbc4e55..7322339 100644 --- a/src/main/java/com/newyetai/usercenter/auth/util/AuthClientUtils.java +++ b/src/main/java/com/senmesh/usercenter/auth/util/AuthClientUtils.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.auth.util; +package com.senmesh.usercenter.auth.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.auth.service.AuthClientService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.auth.service.AuthClientService; /** * @author sr on 2021-01-15 diff --git a/src/main/java/com/newyetai/usercenter/auth/util/AuthDetailUtils.java b/src/main/java/com/senmesh/usercenter/auth/util/AuthDetailUtils.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/auth/util/AuthDetailUtils.java rename to src/main/java/com/senmesh/usercenter/auth/util/AuthDetailUtils.java index 21da733..e8d2fe0 100644 --- a/src/main/java/com/newyetai/usercenter/auth/util/AuthDetailUtils.java +++ b/src/main/java/com/senmesh/usercenter/auth/util/AuthDetailUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.util; +package com.senmesh.usercenter.auth.util; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/auth/util/LiteCodeUtils.java b/src/main/java/com/senmesh/usercenter/auth/util/LiteCodeUtils.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/auth/util/LiteCodeUtils.java rename to src/main/java/com/senmesh/usercenter/auth/util/LiteCodeUtils.java index 8bc1e11..b472dec 100644 --- a/src/main/java/com/newyetai/usercenter/auth/util/LiteCodeUtils.java +++ b/src/main/java/com/senmesh/usercenter/auth/util/LiteCodeUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.util; +package com.senmesh.usercenter.auth.util; import java.util.Arrays; import java.util.Map; @@ -6,17 +6,17 @@ import java.util.Map; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.constant.ProjectProfileEnum; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.auth.dto.LiteCodeConfigDTO; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dto.UserRegisterCodeInfoDTO; -import com.newyetai.usercenter.user.service.UserRegisterService; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.constant.ProjectProfileEnum; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.auth.dto.LiteCodeConfigDTO; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dto.UserRegisterCodeInfoDTO; +import com.senmesh.usercenter.user.service.UserRegisterService; /** * @author sr on 2021-12-21 diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/controller/UcWechatController.java b/src/main/java/com/senmesh/usercenter/auth/wechat/controller/UcWechatController.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/auth/wechat/controller/UcWechatController.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/controller/UcWechatController.java index 62027fc..13536d4 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/controller/UcWechatController.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/controller/UcWechatController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.controller; +package com.senmesh.usercenter.auth.wechat.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -6,14 +6,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.dto.CasTokenDTO; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.auth.wechat.dto.WechatLiteLoginDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatLiteSubMsgDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatSignatureReqDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatSignatureResDTO; -import com.newyetai.usercenter.auth.wechat.service.WechatService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.dto.CasTokenDTO; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.auth.wechat.dto.WechatLiteLoginDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatLiteSubMsgDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatSignatureReqDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatSignatureResDTO; +import com.senmesh.usercenter.auth.wechat.service.WechatService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/BaseWeChatDTO.java b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/BaseWeChatDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/auth/wechat/dto/BaseWeChatDTO.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/dto/BaseWeChatDTO.java index 8c342fb..c7b1503 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/BaseWeChatDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/BaseWeChatDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.dto; +package com.senmesh.usercenter.auth.wechat.dto; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatAuthUserInfoDTO.java b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatAuthUserInfoDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatAuthUserInfoDTO.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatAuthUserInfoDTO.java index fbced9c..ce3d4a9 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatAuthUserInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatAuthUserInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.dto; +package com.senmesh.usercenter.auth.wechat.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteAccessTokenDTO.java b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteAccessTokenDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteAccessTokenDTO.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteAccessTokenDTO.java index 283c4af..4538a18 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteAccessTokenDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteAccessTokenDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.dto; +package com.senmesh.usercenter.auth.wechat.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteCodeReqDTO.java b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteCodeReqDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteCodeReqDTO.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteCodeReqDTO.java index 3ba12fc..d8f4c84 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteCodeReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteCodeReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.dto; +package com.senmesh.usercenter.auth.wechat.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteLoginDTO.java b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteLoginDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteLoginDTO.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteLoginDTO.java index cd23aaa..f02cadd 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteLoginDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteLoginDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.dto; +package com.senmesh.usercenter.auth.wechat.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteSubMsgDTO.java b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteSubMsgDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteSubMsgDTO.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteSubMsgDTO.java index 135460b..d45e49d 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatLiteSubMsgDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatLiteSubMsgDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.dto; +package com.senmesh.usercenter.auth.wechat.dto; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatSignatureReqDTO.java b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatSignatureReqDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatSignatureReqDTO.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatSignatureReqDTO.java index 3492251..1972095 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatSignatureReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatSignatureReqDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.auth.wechat.dto; +package com.senmesh.usercenter.auth.wechat.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatSignatureResDTO.java b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatSignatureResDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatSignatureResDTO.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatSignatureResDTO.java index 251fc82..51a5f95 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/dto/WechatSignatureResDTO.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/dto/WechatSignatureResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.dto; +package com.senmesh.usercenter.auth.wechat.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/mapstruct/WechatMapMapper.java b/src/main/java/com/senmesh/usercenter/auth/wechat/mapstruct/WechatMapMapper.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/auth/wechat/mapstruct/WechatMapMapper.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/mapstruct/WechatMapMapper.java index b47ed7f..bd321f7 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/mapstruct/WechatMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/mapstruct/WechatMapMapper.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.auth.wechat.mapstruct; +package com.senmesh.usercenter.auth.wechat.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.auth.dto.AuthDetailBindDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatLiteLoginDTO; -import com.newyetai.usercenter.user.login.dto.LoginPhoneDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailBindDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatLiteLoginDTO; +import com.senmesh.usercenter.user.login.dto.LoginPhoneDTO; /** * @author sr on 2021-11-23 diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/service/WechatService.java b/src/main/java/com/senmesh/usercenter/auth/wechat/service/WechatService.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/auth/wechat/service/WechatService.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/service/WechatService.java index 0fd4188..ae00eec 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/service/WechatService.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/service/WechatService.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.auth.wechat.service; +package com.senmesh.usercenter.auth.wechat.service; -import com.newyetai.common.dto.CasTokenDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatLiteLoginDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatLiteSubMsgDTO; +import com.senmesh.common.dto.CasTokenDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatLiteLoginDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatLiteSubMsgDTO; /** * @author sr on 2021-01-15 diff --git a/src/main/java/com/newyetai/usercenter/auth/wechat/service/impl/WechatServiceImpl.java b/src/main/java/com/senmesh/usercenter/auth/wechat/service/impl/WechatServiceImpl.java similarity index 66% rename from src/main/java/com/newyetai/usercenter/auth/wechat/service/impl/WechatServiceImpl.java rename to src/main/java/com/senmesh/usercenter/auth/wechat/service/impl/WechatServiceImpl.java index c0e33b5..8188da4 100644 --- a/src/main/java/com/newyetai/usercenter/auth/wechat/service/impl/WechatServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/auth/wechat/service/impl/WechatServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.auth.wechat.service.impl; +package com.senmesh.usercenter.auth.wechat.service.impl; import java.util.List; @@ -6,39 +6,35 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.newyetai.common.dto.CasTokenDTO; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.DevopsException; -import com.newyetai.common.exception.WithResultException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.sdk.wechat.model.SubscibeMessageReq; -import com.newyetai.sdk.wechat.util.MessageParamUtils; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.jwt.JwtTokenUtils; -import com.newyetai.security.mapstruct.UserMapMapper; -import com.newyetai.security.util.HostContextHolder; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dto.AuthClientDataDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailBindDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailCreateDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailQueryDTO; -import com.newyetai.usercenter.auth.dto.CodeToSessionDTO; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.auth.service.AuthDetailService; -import com.newyetai.usercenter.auth.util.AuthClientUtils; -import com.newyetai.usercenter.auth.util.LiteCodeUtils; -import com.newyetai.usercenter.auth.wechat.dto.WechatLiteLoginDTO; -import com.newyetai.usercenter.auth.wechat.dto.WechatLiteSubMsgDTO; -import com.newyetai.usercenter.auth.wechat.mapstruct.WechatMapMapper; -import com.newyetai.usercenter.auth.wechat.service.WechatService; -import com.newyetai.usercenter.sys.util.DomainUtils; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.dto.CasTokenDTO; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.sdk.wechat.model.SubscibeMessageReq; +import com.senmesh.sdk.wechat.util.MessageParamUtils; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.jwt.JwtTokenUtils; +import com.senmesh.security.mapstruct.UserMapMapper; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dto.AuthClientDataDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailBindDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailCreateDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailQueryDTO; +import com.senmesh.usercenter.auth.dto.CodeToSessionDTO; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.auth.service.AuthDetailService; +import com.senmesh.usercenter.auth.util.AuthClientUtils; +import com.senmesh.usercenter.auth.util.LiteCodeUtils; +import com.senmesh.usercenter.auth.wechat.dto.WechatLiteLoginDTO; +import com.senmesh.usercenter.auth.wechat.dto.WechatLiteSubMsgDTO; +import com.senmesh.usercenter.auth.wechat.mapstruct.WechatMapMapper; +import com.senmesh.usercenter.auth.wechat.service.WechatService; +import com.senmesh.usercenter.sys.util.DomainUtils; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; +import com.senmesh.usercenter.user.service.UserService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/authority/constants/PermissionConstants.java b/src/main/java/com/senmesh/usercenter/authority/constants/PermissionConstants.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/authority/constants/PermissionConstants.java rename to src/main/java/com/senmesh/usercenter/authority/constants/PermissionConstants.java index 19b7483..3e83420 100644 --- a/src/main/java/com/newyetai/usercenter/authority/constants/PermissionConstants.java +++ b/src/main/java/com/senmesh/usercenter/authority/constants/PermissionConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.authority.constants; +package com.senmesh.usercenter.authority.constants; /** * 角色权限常量类 diff --git a/src/main/java/com/newyetai/usercenter/authority/controller/UcPermissionController.java b/src/main/java/com/senmesh/usercenter/authority/controller/UcPermissionController.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/authority/controller/UcPermissionController.java rename to src/main/java/com/senmesh/usercenter/authority/controller/UcPermissionController.java index 9dd0d50..0b4e85a 100644 --- a/src/main/java/com/newyetai/usercenter/authority/controller/UcPermissionController.java +++ b/src/main/java/com/senmesh/usercenter/authority/controller/UcPermissionController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.authority.controller; +package com.senmesh.usercenter.authority.controller; import java.util.List; @@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.authority.dto.UrlPermissionDTO; -import com.newyetai.usercenter.authority.service.UcPermissionService; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.authority.dto.UrlPermissionDTO; +import com.senmesh.usercenter.authority.service.UcPermissionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/authority/controller/UcRoleController.java b/src/main/java/com/senmesh/usercenter/authority/controller/UcRoleController.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/controller/UcRoleController.java rename to src/main/java/com/senmesh/usercenter/authority/controller/UcRoleController.java index 607072a..5b54eb2 100644 --- a/src/main/java/com/newyetai/usercenter/authority/controller/UcRoleController.java +++ b/src/main/java/com/senmesh/usercenter/authority/controller/UcRoleController.java @@ -1,18 +1,18 @@ -package com.newyetai.usercenter.authority.controller; +package com.senmesh.usercenter.authority.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.Check; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.authority.dto.*; -import com.newyetai.usercenter.authority.service.UcRoleAllocationService; -import com.newyetai.usercenter.authority.service.UcRoleService; -import com.newyetai.usercenter.cache.SecurityCacheUtils; -import com.newyetai.usercenter.dto.*; -import com.newyetai.usercenter.query.RoleQuery; -import com.newyetai.usercenter.resource.service.UcUrlService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.Check; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.authority.dto.*; +import com.senmesh.usercenter.authority.service.UcRoleAllocationService; +import com.senmesh.usercenter.authority.service.UcRoleService; +import com.senmesh.usercenter.cache.SecurityCacheUtils; +import com.senmesh.usercenter.dto.*; +import com.senmesh.usercenter.query.RoleQuery; +import com.senmesh.usercenter.resource.service.UcUrlService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/authority/dao/UcPermissionMapper.java b/src/main/java/com/senmesh/usercenter/authority/dao/UcPermissionMapper.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/authority/dao/UcPermissionMapper.java rename to src/main/java/com/senmesh/usercenter/authority/dao/UcPermissionMapper.java index d358011..259d1f7 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dao/UcPermissionMapper.java +++ b/src/main/java/com/senmesh/usercenter/authority/dao/UcPermissionMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.authority.dao; +package com.senmesh.usercenter.authority.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.authority.dto.*; -import com.newyetai.usercenter.authority.entity.Permission; -import com.newyetai.usercenter.dto.CheckKeyDTO; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.authority.dto.*; +import com.senmesh.usercenter.authority.entity.Permission; +import com.senmesh.usercenter.dto.CheckKeyDTO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/src/main/java/com/newyetai/usercenter/authority/dao/UcRoleAllocationMapper.java b/src/main/java/com/senmesh/usercenter/authority/dao/UcRoleAllocationMapper.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/dao/UcRoleAllocationMapper.java rename to src/main/java/com/senmesh/usercenter/authority/dao/UcRoleAllocationMapper.java index 0627e8c..afd6d60 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dao/UcRoleAllocationMapper.java +++ b/src/main/java/com/senmesh/usercenter/authority/dao/UcRoleAllocationMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.authority.dao; +package com.senmesh.usercenter.authority.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; -import com.newyetai.usercenter.authority.entity.RoleAllocation; -import com.newyetai.usercenter.dto.AllocatedBusinessRoleQueryDTO; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.usercenter.authority.entity.RoleAllocation; +import com.senmesh.usercenter.dto.AllocatedBusinessRoleQueryDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Set; -import com.newyetai.usercenter.dto.RoleDTO; +import com.senmesh.usercenter.dto.RoleDTO; /** * @author Jerry.li diff --git a/src/main/java/com/newyetai/usercenter/authority/dao/UcRoleMapper.java b/src/main/java/com/senmesh/usercenter/authority/dao/UcRoleMapper.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/authority/dao/UcRoleMapper.java rename to src/main/java/com/senmesh/usercenter/authority/dao/UcRoleMapper.java index 17e4fc6..673b271 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dao/UcRoleMapper.java +++ b/src/main/java/com/senmesh/usercenter/authority/dao/UcRoleMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.authority.dao; +package com.senmesh.usercenter.authority.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.authority.entity.Role; -import com.newyetai.usercenter.dto.RoleDTO; -import com.newyetai.usercenter.query.RoleQuery; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.authority.entity.Role; +import com.senmesh.usercenter.dto.RoleDTO; +import com.senmesh.usercenter.query.RoleQuery; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/newyetai/usercenter/authority/dto/ComponentPermissionDTO.java b/src/main/java/com/senmesh/usercenter/authority/dto/ComponentPermissionDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/authority/dto/ComponentPermissionDTO.java rename to src/main/java/com/senmesh/usercenter/authority/dto/ComponentPermissionDTO.java index ce24cdf..2f927a2 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dto/ComponentPermissionDTO.java +++ b/src/main/java/com/senmesh/usercenter/authority/dto/ComponentPermissionDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.authority.dto; +package com.senmesh.usercenter.authority.dto; import org.apache.commons.lang3.StringUtils; -import com.newyetai.security.access.provider.IConfigAttribute; +import com.senmesh.security.access.provider.IConfigAttribute; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionDTO.java b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/authority/dto/PermissionDTO.java rename to src/main/java/com/senmesh/usercenter/authority/dto/PermissionDTO.java index 5d8293c..29c61cc 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionDTO.java +++ b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.authority.dto; +package com.senmesh.usercenter.authority.dto; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionOperateDTO.java b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionOperateDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/authority/dto/PermissionOperateDTO.java rename to src/main/java/com/senmesh/usercenter/authority/dto/PermissionOperateDTO.java index 13f8015..2e6b50d 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionOperateDTO.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.authority.dto; +package com.senmesh.usercenter.authority.dto; import java.io.Serializable; import java.util.List; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.resource.dto.UrlDTO; +import com.senmesh.common.validation.Update; +import com.senmesh.usercenter.resource.dto.UrlDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionPageQueryDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/dto/PermissionPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/authority/dto/PermissionPageQueryDTO.java index 39c17e0..ceac093 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionPageQueryDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.authority.dto; +package com.senmesh.usercenter.authority.dto; import java.io.Serializable; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.PageQueryDTO; -import com.newyetai.common.validation.Check; +import com.senmesh.common.dto.PageQueryDTO; +import com.senmesh.common.validation.Check; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionQueryDTO.java b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionQueryDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/dto/PermissionQueryDTO.java rename to src/main/java/com/senmesh/usercenter/authority/dto/PermissionQueryDTO.java index b3b5897..0320d3e 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.authority.dto; +package com.senmesh.usercenter.authority.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionResourcesDTO.java b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionResourcesDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/dto/PermissionResourcesDTO.java rename to src/main/java/com/senmesh/usercenter/authority/dto/PermissionResourcesDTO.java index f9dc9c9..52129a4 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dto/PermissionResourcesDTO.java +++ b/src/main/java/com/senmesh/usercenter/authority/dto/PermissionResourcesDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.authority.dto; +package com.senmesh.usercenter.authority.dto; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/authority/dto/RoleAllocationDTO.java b/src/main/java/com/senmesh/usercenter/authority/dto/RoleAllocationDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/authority/dto/RoleAllocationDTO.java rename to src/main/java/com/senmesh/usercenter/authority/dto/RoleAllocationDTO.java index 1b00c25..9f0d549 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dto/RoleAllocationDTO.java +++ b/src/main/java/com/senmesh/usercenter/authority/dto/RoleAllocationDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.authority.dto; +package com.senmesh.usercenter.authority.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.constants.SecurityConstants; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.usercenter.constants.SecurityConstants; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/authority/dto/UrlPermissionDTO.java b/src/main/java/com/senmesh/usercenter/authority/dto/UrlPermissionDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/authority/dto/UrlPermissionDTO.java rename to src/main/java/com/senmesh/usercenter/authority/dto/UrlPermissionDTO.java index 89092c1..216f116 100644 --- a/src/main/java/com/newyetai/usercenter/authority/dto/UrlPermissionDTO.java +++ b/src/main/java/com/senmesh/usercenter/authority/dto/UrlPermissionDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.authority.dto; +package com.senmesh.usercenter.authority.dto; import org.apache.commons.lang3.StringUtils; -import com.newyetai.security.access.provider.IUrlConfigAttribute; +import com.senmesh.security.access.provider.IUrlConfigAttribute; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/authority/entity/Permission.java b/src/main/java/com/senmesh/usercenter/authority/entity/Permission.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/authority/entity/Permission.java rename to src/main/java/com/senmesh/usercenter/authority/entity/Permission.java index c5c1bf5..16b3475 100644 --- a/src/main/java/com/newyetai/usercenter/authority/entity/Permission.java +++ b/src/main/java/com/senmesh/usercenter/authority/entity/Permission.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.authority.entity; +package com.senmesh.usercenter.authority.entity; import org.apache.commons.lang3.StringUtils; import org.springframework.data.annotation.Transient; import org.springframework.security.access.ConfigAttribute; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/authority/entity/Role.java b/src/main/java/com/senmesh/usercenter/authority/entity/Role.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/entity/Role.java rename to src/main/java/com/senmesh/usercenter/authority/entity/Role.java index 5cf5129..d40f846 100644 --- a/src/main/java/com/newyetai/usercenter/authority/entity/Role.java +++ b/src/main/java/com/senmesh/usercenter/authority/entity/Role.java @@ -1,12 +1,10 @@ -package com.newyetai.usercenter.authority.entity; +package com.senmesh.usercenter.authority.entity; import java.io.Serializable; import java.util.Date; -import org.springframework.data.annotation.Transient; - import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/authority/entity/RoleAllocation.java b/src/main/java/com/senmesh/usercenter/authority/entity/RoleAllocation.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/entity/RoleAllocation.java rename to src/main/java/com/senmesh/usercenter/authority/entity/RoleAllocation.java index 67aca88..7cb1770 100644 --- a/src/main/java/com/newyetai/usercenter/authority/entity/RoleAllocation.java +++ b/src/main/java/com/senmesh/usercenter/authority/entity/RoleAllocation.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.authority.entity; +package com.senmesh.usercenter.authority.entity; import java.io.Serializable; import org.springframework.data.annotation.Transient; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/authority/mapper/UcPermissionMapper.xml b/src/main/java/com/senmesh/usercenter/authority/mapper/UcPermissionMapper.xml similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/mapper/UcPermissionMapper.xml rename to src/main/java/com/senmesh/usercenter/authority/mapper/UcPermissionMapper.xml index 874b17b..b6d2c14 100644 --- a/src/main/java/com/newyetai/usercenter/authority/mapper/UcPermissionMapper.xml +++ b/src/main/java/com/senmesh/usercenter/authority/mapper/UcPermissionMapper.xml @@ -2,8 +2,8 @@ - - SELECT roleId, WM_CONCAT(p) checkedKeys @@ -29,7 +29,7 @@ GROUP BY roleId - select p.* from xs_permission p @@ -45,7 +45,7 @@ and c.deleted = 0 - select p.*, @@ -81,7 +81,7 @@ and deleted = 0 - SELECT t4.id , #{param.roleId} as roleId, @@ -128,7 +128,7 @@ - SELECT t5.id , #{param.roleId} as roleId , diff --git a/src/main/java/com/newyetai/usercenter/authority/mapper/UcRoleAllocationMapper.xml b/src/main/java/com/senmesh/usercenter/authority/mapper/UcRoleAllocationMapper.xml similarity index 85% rename from src/main/java/com/newyetai/usercenter/authority/mapper/UcRoleAllocationMapper.xml rename to src/main/java/com/senmesh/usercenter/authority/mapper/UcRoleAllocationMapper.xml index a8f9688..da6525a 100644 --- a/src/main/java/com/newyetai/usercenter/authority/mapper/UcRoleAllocationMapper.xml +++ b/src/main/java/com/senmesh/usercenter/authority/mapper/UcRoleAllocationMapper.xml @@ -2,9 +2,9 @@ - + - select * from xs_role_allocation where allocation_type = #{allocationType} and allocation_id = #{allocationId} @@ -19,7 +19,7 @@ + + @@ -83,7 +83,7 @@ - SELECT r.*, rst.name as standard_role_name @@ -151,7 +151,7 @@ and t1.allocation_id = #{userId} - select * from @@ -164,7 +164,7 @@ - select * from diff --git a/src/main/java/com/newyetai/usercenter/authority/service/UcPermissionService.java b/src/main/java/com/senmesh/usercenter/authority/service/UcPermissionService.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/authority/service/UcPermissionService.java rename to src/main/java/com/senmesh/usercenter/authority/service/UcPermissionService.java index 0a0b313..ce8144a 100644 --- a/src/main/java/com/newyetai/usercenter/authority/service/UcPermissionService.java +++ b/src/main/java/com/senmesh/usercenter/authority/service/UcPermissionService.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.authority.service; +package com.senmesh.usercenter.authority.service; import java.util.List; import java.util.Map; -import com.newyetai.security.service.IPermissionSecurityService; -import com.newyetai.usercenter.authority.dto.ComponentPermissionDTO; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.security.service.IPermissionSecurityService; +import com.senmesh.usercenter.authority.dto.ComponentPermissionDTO; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; /** * @author chenyun diff --git a/src/main/java/com/newyetai/usercenter/authority/service/UcRoleAllocationService.java b/src/main/java/com/senmesh/usercenter/authority/service/UcRoleAllocationService.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/authority/service/UcRoleAllocationService.java rename to src/main/java/com/senmesh/usercenter/authority/service/UcRoleAllocationService.java index 4366376..6066fd2 100644 --- a/src/main/java/com/newyetai/usercenter/authority/service/UcRoleAllocationService.java +++ b/src/main/java/com/senmesh/usercenter/authority/service/UcRoleAllocationService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.authority.service; +package com.senmesh.usercenter.authority.service; -import com.newyetai.security.service.IRoleAllocationSecurityService; -import com.newyetai.usercenter.dto.AllocatedBusinessRoleQueryDTO; -import com.newyetai.usercenter.dto.AllocationDTO; -import com.newyetai.usercenter.dto.RoleDTO; -import com.newyetai.usercenter.dto.UserAllocateRoleDTO; +import com.senmesh.security.service.IRoleAllocationSecurityService; +import com.senmesh.usercenter.dto.AllocatedBusinessRoleQueryDTO; +import com.senmesh.usercenter.dto.AllocationDTO; +import com.senmesh.usercenter.dto.RoleDTO; +import com.senmesh.usercenter.dto.UserAllocateRoleDTO; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/authority/service/UcRoleService.java b/src/main/java/com/senmesh/usercenter/authority/service/UcRoleService.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/authority/service/UcRoleService.java rename to src/main/java/com/senmesh/usercenter/authority/service/UcRoleService.java index 77a4175..ae059e7 100644 --- a/src/main/java/com/newyetai/usercenter/authority/service/UcRoleService.java +++ b/src/main/java/com/senmesh/usercenter/authority/service/UcRoleService.java @@ -1,15 +1,14 @@ -package com.newyetai.usercenter.authority.service; +package com.senmesh.usercenter.authority.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.authority.dto.PermissionOperateDTO; -import com.newyetai.usercenter.dto.AllocationRoleDTO; -import com.newyetai.usercenter.dto.AllocationRoleUserDTO; -import com.newyetai.usercenter.dto.CheckKeyDTO; -import com.newyetai.usercenter.dto.RoleDTO; -import com.newyetai.usercenter.query.RoleQuery; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.authority.dto.PermissionOperateDTO; +import com.senmesh.usercenter.dto.AllocationRoleDTO; +import com.senmesh.usercenter.dto.AllocationRoleUserDTO; +import com.senmesh.usercenter.dto.CheckKeyDTO; +import com.senmesh.usercenter.dto.RoleDTO; +import com.senmesh.usercenter.query.RoleQuery; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; import javax.validation.constraints.NotNull; import javax.validation.groups.Default; diff --git a/src/main/java/com/newyetai/usercenter/authority/service/impl/ResourceSecurityServiceImpl.java b/src/main/java/com/senmesh/usercenter/authority/service/impl/ResourceSecurityServiceImpl.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/authority/service/impl/ResourceSecurityServiceImpl.java rename to src/main/java/com/senmesh/usercenter/authority/service/impl/ResourceSecurityServiceImpl.java index 04a35d6..26c9663 100644 --- a/src/main/java/com/newyetai/usercenter/authority/service/impl/ResourceSecurityServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/authority/service/impl/ResourceSecurityServiceImpl.java @@ -1,26 +1,25 @@ -package com.newyetai.usercenter.authority.service.impl; +package com.senmesh.usercenter.authority.service.impl; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.security.decision.manager.SecurityDecisionManager; -import com.newyetai.security.dto.SecurityUserDTO; -import com.newyetai.security.service.IResourceSecurityService; -import com.newyetai.usercenter.authority.constants.PermissionConstants; -import com.newyetai.usercenter.authority.dao.UcRoleMapper; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.authority.service.UcPermissionService; -import com.newyetai.usercenter.constants.OrgConstants; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.constants.UrlConstants; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.query.RoleQuery; -import com.newyetai.usercenter.resource.dao.UcComponentMapper; -import com.newyetai.usercenter.resource.dao.UcUrlMapper; -import com.newyetai.usercenter.resource.dto.ComponentDTO; -import com.newyetai.usercenter.resource.dto.UrlDTO; -import java.util.Arrays; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.security.decision.manager.SecurityDecisionManager; +import com.senmesh.security.dto.SecurityUserDTO; +import com.senmesh.security.service.IResourceSecurityService; +import com.senmesh.usercenter.authority.constants.PermissionConstants; +import com.senmesh.usercenter.authority.dao.UcRoleMapper; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.authority.service.UcPermissionService; +import com.senmesh.usercenter.constants.OrgConstants; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.constants.UrlConstants; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.query.RoleQuery; +import com.senmesh.usercenter.resource.dao.UcComponentMapper; +import com.senmesh.usercenter.resource.dao.UcUrlMapper; +import com.senmesh.usercenter.resource.dto.ComponentDTO; +import com.senmesh.usercenter.resource.dto.UrlDTO; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/main/java/com/newyetai/usercenter/authority/service/impl/UcPermissionServiceImpl.java b/src/main/java/com/senmesh/usercenter/authority/service/impl/UcPermissionServiceImpl.java similarity index 68% rename from src/main/java/com/newyetai/usercenter/authority/service/impl/UcPermissionServiceImpl.java rename to src/main/java/com/senmesh/usercenter/authority/service/impl/UcPermissionServiceImpl.java index 4ab5cc1..1f8e672 100644 --- a/src/main/java/com/newyetai/usercenter/authority/service/impl/UcPermissionServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/authority/service/impl/UcPermissionServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.authority.service.impl; +package com.senmesh.usercenter.authority.service.impl; import java.util.List; import java.util.Map; @@ -6,12 +6,12 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.authority.dao.UcPermissionMapper; -import com.newyetai.usercenter.authority.dto.ComponentPermissionDTO; -import com.newyetai.usercenter.authority.dto.PermissionQueryDTO; -import com.newyetai.usercenter.authority.dto.UrlPermissionDTO; -import com.newyetai.usercenter.authority.service.UcPermissionService; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.authority.dao.UcPermissionMapper; +import com.senmesh.usercenter.authority.dto.ComponentPermissionDTO; +import com.senmesh.usercenter.authority.dto.PermissionQueryDTO; +import com.senmesh.usercenter.authority.dto.UrlPermissionDTO; +import com.senmesh.usercenter.authority.service.UcPermissionService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/authority/service/impl/UcRoleAllocationServiceImpl.java b/src/main/java/com/senmesh/usercenter/authority/service/impl/UcRoleAllocationServiceImpl.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/authority/service/impl/UcRoleAllocationServiceImpl.java rename to src/main/java/com/senmesh/usercenter/authority/service/impl/UcRoleAllocationServiceImpl.java index edf89cf..6eb1d12 100644 --- a/src/main/java/com/newyetai/usercenter/authority/service/impl/UcRoleAllocationServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/authority/service/impl/UcRoleAllocationServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.authority.service.impl; +package com.senmesh.usercenter.authority.service.impl; import java.util.List; import java.util.Map; @@ -11,21 +11,21 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Lists; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.usercenter.authority.dao.UcRoleAllocationMapper; -import com.newyetai.usercenter.authority.dao.UcRoleMapper; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; -import com.newyetai.usercenter.authority.entity.RoleAllocation; -import com.newyetai.usercenter.authority.service.UcRoleAllocationService; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.constants.SecurityExceptionMsg; -import com.newyetai.usercenter.dto.AllocatedBusinessRoleQueryDTO; -import com.newyetai.usercenter.dto.AllocationDTO; -import com.newyetai.usercenter.dto.RoleDTO; -import com.newyetai.usercenter.dto.UserAllocateRoleDTO; -import com.newyetai.usercenter.user.service.OrgUserService; -import com.newyetai.usercenter.utils.RoleUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.usercenter.authority.dao.UcRoleAllocationMapper; +import com.senmesh.usercenter.authority.dao.UcRoleMapper; +import com.senmesh.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.usercenter.authority.entity.RoleAllocation; +import com.senmesh.usercenter.authority.service.UcRoleAllocationService; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.constants.SecurityExceptionMsg; +import com.senmesh.usercenter.dto.AllocatedBusinessRoleQueryDTO; +import com.senmesh.usercenter.dto.AllocationDTO; +import com.senmesh.usercenter.dto.RoleDTO; +import com.senmesh.usercenter.dto.UserAllocateRoleDTO; +import com.senmesh.usercenter.user.service.OrgUserService; +import com.senmesh.usercenter.utils.RoleUtils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/authority/service/impl/UcRoleServiceImpl.java b/src/main/java/com/senmesh/usercenter/authority/service/impl/UcRoleServiceImpl.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/authority/service/impl/UcRoleServiceImpl.java rename to src/main/java/com/senmesh/usercenter/authority/service/impl/UcRoleServiceImpl.java index 18cdb07..ea05f75 100644 --- a/src/main/java/com/newyetai/usercenter/authority/service/impl/UcRoleServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/authority/service/impl/UcRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.authority.service.impl; +package com.senmesh.usercenter.authority.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -12,30 +12,30 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.authority.dao.UcPermissionMapper; -import com.newyetai.usercenter.authority.dao.UcRoleAllocationMapper; -import com.newyetai.usercenter.authority.dao.UcRoleMapper; -import com.newyetai.usercenter.authority.dto.PermissionOperateDTO; -import com.newyetai.usercenter.authority.entity.Permission; -import com.newyetai.usercenter.authority.entity.Role; -import com.newyetai.usercenter.authority.entity.RoleAllocation; -import com.newyetai.usercenter.authority.service.UcRoleService; -import com.newyetai.usercenter.cache.SecurityCacheUtils; -import com.newyetai.usercenter.constants.RoleConstants; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.constants.SecurityExceptionMsg; -import com.newyetai.usercenter.dto.AllocationRoleDTO; -import com.newyetai.usercenter.dto.AllocationRoleUserDTO; -import com.newyetai.usercenter.dto.CheckKeyDTO; -import com.newyetai.usercenter.dto.RoleDTO; -import com.newyetai.usercenter.enums.ResourceType; -import com.newyetai.usercenter.query.RoleQuery; -import com.newyetai.usercenter.resource.dao.UcUrlMapper; -import com.newyetai.usercenter.utils.RoleUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.authority.dao.UcPermissionMapper; +import com.senmesh.usercenter.authority.dao.UcRoleAllocationMapper; +import com.senmesh.usercenter.authority.dao.UcRoleMapper; +import com.senmesh.usercenter.authority.dto.PermissionOperateDTO; +import com.senmesh.usercenter.authority.entity.Permission; +import com.senmesh.usercenter.authority.entity.Role; +import com.senmesh.usercenter.authority.entity.RoleAllocation; +import com.senmesh.usercenter.authority.service.UcRoleService; +import com.senmesh.usercenter.cache.SecurityCacheUtils; +import com.senmesh.usercenter.constants.RoleConstants; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.constants.SecurityExceptionMsg; +import com.senmesh.usercenter.dto.AllocationRoleDTO; +import com.senmesh.usercenter.dto.AllocationRoleUserDTO; +import com.senmesh.usercenter.dto.CheckKeyDTO; +import com.senmesh.usercenter.dto.RoleDTO; +import com.senmesh.usercenter.enums.ResourceType; +import com.senmesh.usercenter.query.RoleQuery; +import com.senmesh.usercenter.resource.dao.UcUrlMapper; +import com.senmesh.usercenter.utils.RoleUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/cache/CacheConfig.java b/src/main/java/com/senmesh/usercenter/cache/CacheConfig.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/cache/CacheConfig.java rename to src/main/java/com/senmesh/usercenter/cache/CacheConfig.java index d47fe11..c41fe39 100644 --- a/src/main/java/com/newyetai/usercenter/cache/CacheConfig.java +++ b/src/main/java/com/senmesh/usercenter/cache/CacheConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.cache; +package com.senmesh.usercenter.cache; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/newyetai/usercenter/cache/SecurityCacheAllEvict.java b/src/main/java/com/senmesh/usercenter/cache/SecurityCacheAllEvict.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/cache/SecurityCacheAllEvict.java rename to src/main/java/com/senmesh/usercenter/cache/SecurityCacheAllEvict.java index c2f477f..c0aa22f 100644 --- a/src/main/java/com/newyetai/usercenter/cache/SecurityCacheAllEvict.java +++ b/src/main/java/com/senmesh/usercenter/cache/SecurityCacheAllEvict.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.cache; +package com.senmesh.usercenter.cache; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Caching; -import com.newyetai.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.constants.SecurityConstants; /** * 清除所有security缓存 diff --git a/src/main/java/com/newyetai/usercenter/cache/SecurityCacheEvict.java b/src/main/java/com/senmesh/usercenter/cache/SecurityCacheEvict.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/cache/SecurityCacheEvict.java rename to src/main/java/com/senmesh/usercenter/cache/SecurityCacheEvict.java index d29f97a..0daa0b6 100644 --- a/src/main/java/com/newyetai/usercenter/cache/SecurityCacheEvict.java +++ b/src/main/java/com/senmesh/usercenter/cache/SecurityCacheEvict.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.cache; +package com.senmesh.usercenter.cache; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Caching; -import com.newyetai.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.constants.SecurityConstants; /** * 清除缓存 diff --git a/src/main/java/com/newyetai/usercenter/cache/SecurityCacheService.java b/src/main/java/com/senmesh/usercenter/cache/SecurityCacheService.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/cache/SecurityCacheService.java rename to src/main/java/com/senmesh/usercenter/cache/SecurityCacheService.java index 6ce2b5c..0a237ef 100644 --- a/src/main/java/com/newyetai/usercenter/cache/SecurityCacheService.java +++ b/src/main/java/com/senmesh/usercenter/cache/SecurityCacheService.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.cache; +package com.senmesh.usercenter.cache; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/usercenter/cache/SecurityCacheUtils.java b/src/main/java/com/senmesh/usercenter/cache/SecurityCacheUtils.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/cache/SecurityCacheUtils.java rename to src/main/java/com/senmesh/usercenter/cache/SecurityCacheUtils.java index 2f0c77e..2d7c186 100644 --- a/src/main/java/com/newyetai/usercenter/cache/SecurityCacheUtils.java +++ b/src/main/java/com/senmesh/usercenter/cache/SecurityCacheUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.cache; +package com.senmesh.usercenter.cache; import java.util.Set; @@ -6,8 +6,8 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import com.google.common.collect.Sets; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.UserContextHolder; /** * security缓存工具类 diff --git a/src/main/java/com/newyetai/usercenter/common/constant/CodeTypeEnum.java b/src/main/java/com/senmesh/usercenter/common/constant/CodeTypeEnum.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/common/constant/CodeTypeEnum.java rename to src/main/java/com/senmesh/usercenter/common/constant/CodeTypeEnum.java index aaaf972..0859a96 100644 --- a/src/main/java/com/newyetai/usercenter/common/constant/CodeTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/common/constant/CodeTypeEnum.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.common.constant; +package com.senmesh.usercenter.common.constant; -import com.newyetai.codegenerator.pojo.CodeParam; +import com.senmesh.codegenerator.pojo.CodeParam; /** * 编码类型 diff --git a/src/main/java/com/newyetai/usercenter/common/constant/XxlJobHandlerConstants.java b/src/main/java/com/senmesh/usercenter/common/constant/XxlJobHandlerConstants.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/common/constant/XxlJobHandlerConstants.java rename to src/main/java/com/senmesh/usercenter/common/constant/XxlJobHandlerConstants.java index 94ecf77..09dd221 100644 --- a/src/main/java/com/newyetai/usercenter/common/constant/XxlJobHandlerConstants.java +++ b/src/main/java/com/senmesh/usercenter/common/constant/XxlJobHandlerConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.common.constant; +package com.senmesh.usercenter.common.constant; /** * 任务调度常量类 diff --git a/src/main/java/com/newyetai/usercenter/common/controller/SlickParamController.java b/src/main/java/com/senmesh/usercenter/common/controller/SlickParamController.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/common/controller/SlickParamController.java rename to src/main/java/com/senmesh/usercenter/common/controller/SlickParamController.java index 1a1bd8e..5c7b22d 100644 --- a/src/main/java/com/newyetai/usercenter/common/controller/SlickParamController.java +++ b/src/main/java/com/senmesh/usercenter/common/controller/SlickParamController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.common.controller; +package com.senmesh.usercenter.common.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.common.dto.SlickParamCreateDTO; -import com.newyetai.usercenter.common.dto.SlickParamDTO; -import com.newyetai.usercenter.common.dto.SlickParamQueryDTO; -import com.newyetai.usercenter.common.service.SlickParamService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.common.dto.SlickParamCreateDTO; +import com.senmesh.usercenter.common.dto.SlickParamDTO; +import com.senmesh.usercenter.common.dto.SlickParamQueryDTO; +import com.senmesh.usercenter.common.service.SlickParamService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/common/controller/SmsController.java b/src/main/java/com/senmesh/usercenter/common/controller/SmsController.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/common/controller/SmsController.java rename to src/main/java/com/senmesh/usercenter/common/controller/SmsController.java index afca97f..51c5c3b 100644 --- a/src/main/java/com/newyetai/usercenter/common/controller/SmsController.java +++ b/src/main/java/com/senmesh/usercenter/common/controller/SmsController.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.common.controller; +package com.senmesh.usercenter.common.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeDTO; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; -import com.newyetai.usercenter.user.phone.dto.SmsSimpleSendDTO; -import com.newyetai.usercenter.user.phone.provider.simple.ISimpleSms; -import com.newyetai.usercenter.user.phone.util.PhoneCodeUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeDTO; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.dto.SmsSimpleSendDTO; +import com.senmesh.usercenter.user.phone.provider.simple.ISimpleSms; +import com.senmesh.usercenter.user.phone.util.PhoneCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/common/dao/SlickParamMapper.java b/src/main/java/com/senmesh/usercenter/common/dao/SlickParamMapper.java similarity index 59% rename from src/main/java/com/newyetai/usercenter/common/dao/SlickParamMapper.java rename to src/main/java/com/senmesh/usercenter/common/dao/SlickParamMapper.java index eb079ac..b70d815 100644 --- a/src/main/java/com/newyetai/usercenter/common/dao/SlickParamMapper.java +++ b/src/main/java/com/senmesh/usercenter/common/dao/SlickParamMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.common.dao; +package com.senmesh.usercenter.common.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.common.dto.SlickParamDTO; -import com.newyetai.usercenter.common.dto.SlickParamQueryDTO; -import com.newyetai.usercenter.common.entity.SlickParam; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.common.dto.SlickParamDTO; +import com.senmesh.usercenter.common.dto.SlickParamQueryDTO; +import com.senmesh.usercenter.common.entity.SlickParam; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 圆滑的参数 diff --git a/src/main/java/com/newyetai/usercenter/common/dto/SlickParamCreateDTO.java b/src/main/java/com/senmesh/usercenter/common/dto/SlickParamCreateDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/common/dto/SlickParamCreateDTO.java rename to src/main/java/com/senmesh/usercenter/common/dto/SlickParamCreateDTO.java index 6678ba1..629fbb9 100644 --- a/src/main/java/com/newyetai/usercenter/common/dto/SlickParamCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/common/dto/SlickParamCreateDTO.java @@ -1,11 +1,10 @@ -package com.newyetai.usercenter.common.dto; +package com.senmesh.usercenter.common.dto; import java.io.Serializable; -import java.util.Map; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/common/dto/SlickParamDTO.java b/src/main/java/com/senmesh/usercenter/common/dto/SlickParamDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/common/dto/SlickParamDTO.java rename to src/main/java/com/senmesh/usercenter/common/dto/SlickParamDTO.java index 1bb00cb..ab91251 100644 --- a/src/main/java/com/newyetai/usercenter/common/dto/SlickParamDTO.java +++ b/src/main/java/com/senmesh/usercenter/common/dto/SlickParamDTO.java @@ -1,11 +1,10 @@ -package com.newyetai.usercenter.common.dto; +package com.senmesh.usercenter.common.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/common/dto/SlickParamQueryDTO.java b/src/main/java/com/senmesh/usercenter/common/dto/SlickParamQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/common/dto/SlickParamQueryDTO.java rename to src/main/java/com/senmesh/usercenter/common/dto/SlickParamQueryDTO.java index 0dfc6ac..bd07c5d 100644 --- a/src/main/java/com/newyetai/usercenter/common/dto/SlickParamQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/common/dto/SlickParamQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.common.dto; +package com.senmesh.usercenter.common.dto; import java.io.Serializable; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2022-01-11 diff --git a/src/main/java/com/newyetai/usercenter/common/entity/SlickParam.java b/src/main/java/com/senmesh/usercenter/common/entity/SlickParam.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/common/entity/SlickParam.java rename to src/main/java/com/senmesh/usercenter/common/entity/SlickParam.java index 2982b53..f5ac7c2 100644 --- a/src/main/java/com/newyetai/usercenter/common/entity/SlickParam.java +++ b/src/main/java/com/senmesh/usercenter/common/entity/SlickParam.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.common.entity; +package com.senmesh.usercenter.common.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/common/mapper/SlickParamMapper.xml b/src/main/java/com/senmesh/usercenter/common/mapper/SlickParamMapper.xml similarity index 78% rename from src/main/java/com/newyetai/usercenter/common/mapper/SlickParamMapper.xml rename to src/main/java/com/senmesh/usercenter/common/mapper/SlickParamMapper.xml index 50d7390..4b1b094 100644 --- a/src/main/java/com/newyetai/usercenter/common/mapper/SlickParamMapper.xml +++ b/src/main/java/com/senmesh/usercenter/common/mapper/SlickParamMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_slick_param diff --git a/src/main/java/com/newyetai/usercenter/common/mapstruct/SlickParamMapMapper.java b/src/main/java/com/senmesh/usercenter/common/mapstruct/SlickParamMapMapper.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/common/mapstruct/SlickParamMapMapper.java rename to src/main/java/com/senmesh/usercenter/common/mapstruct/SlickParamMapMapper.java index 2fb0112..8b00d65 100644 --- a/src/main/java/com/newyetai/usercenter/common/mapstruct/SlickParamMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/common/mapstruct/SlickParamMapMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.common.mapstruct; +package com.senmesh.usercenter.common.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.common.dto.SlickParamDTO; -import com.newyetai.usercenter.common.entity.SlickParam; +import com.senmesh.usercenter.common.dto.SlickParamDTO; +import com.senmesh.usercenter.common.entity.SlickParam; /** * @author sr on 2022-01-11 diff --git a/src/main/java/com/newyetai/usercenter/common/mq/constant/UcMqConstants.java b/src/main/java/com/senmesh/usercenter/common/mq/constant/UcMqConstants.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/common/mq/constant/UcMqConstants.java rename to src/main/java/com/senmesh/usercenter/common/mq/constant/UcMqConstants.java index 8ae6abd..8c510ac 100644 --- a/src/main/java/com/newyetai/usercenter/common/mq/constant/UcMqConstants.java +++ b/src/main/java/com/senmesh/usercenter/common/mq/constant/UcMqConstants.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.common.mq.constant; +package com.senmesh.usercenter.common.mq.constant; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.EnvironmentUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.EnvironmentUtils; /** * mq常量类(routingkey) diff --git a/src/main/java/com/newyetai/usercenter/common/mybatis/MyBatisConfig.java b/src/main/java/com/senmesh/usercenter/common/mybatis/MyBatisConfig.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/common/mybatis/MyBatisConfig.java rename to src/main/java/com/senmesh/usercenter/common/mybatis/MyBatisConfig.java index 4139c94..72341e7 100644 --- a/src/main/java/com/newyetai/usercenter/common/mybatis/MyBatisConfig.java +++ b/src/main/java/com/senmesh/usercenter/common/mybatis/MyBatisConfig.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.common.mybatis; +package com.senmesh.usercenter.common.mybatis; -import com.newyetai.mybatis.handle.BaseEnumTypeHandler; +import com.senmesh.mybatis.handle.BaseEnumTypeHandler; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.type.TypeHandlerRegistry; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/common/service/SlickParamService.java b/src/main/java/com/senmesh/usercenter/common/service/SlickParamService.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/common/service/SlickParamService.java rename to src/main/java/com/senmesh/usercenter/common/service/SlickParamService.java index 9ecfb84..19c3810 100644 --- a/src/main/java/com/newyetai/usercenter/common/service/SlickParamService.java +++ b/src/main/java/com/senmesh/usercenter/common/service/SlickParamService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.common.service; +package com.senmesh.usercenter.common.service; import java.util.List; -import com.newyetai.usercenter.common.dto.SlickParamQueryDTO; -import com.newyetai.usercenter.common.dto.SlickParamCreateDTO; -import com.newyetai.usercenter.common.dto.SlickParamDTO; +import com.senmesh.usercenter.common.dto.SlickParamQueryDTO; +import com.senmesh.usercenter.common.dto.SlickParamCreateDTO; +import com.senmesh.usercenter.common.dto.SlickParamDTO; /** * 圆滑的参数 diff --git a/src/main/java/com/newyetai/usercenter/common/service/impl/SlickParamServiceImpl.java b/src/main/java/com/senmesh/usercenter/common/service/impl/SlickParamServiceImpl.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/common/service/impl/SlickParamServiceImpl.java rename to src/main/java/com/senmesh/usercenter/common/service/impl/SlickParamServiceImpl.java index 7c7cd7f..9b7789d 100644 --- a/src/main/java/com/newyetai/usercenter/common/service/impl/SlickParamServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/common/service/impl/SlickParamServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.common.service.impl; +package com.senmesh.usercenter.common.service.impl; import java.util.List; @@ -7,19 +7,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.common.util.StrUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.common.dao.SlickParamMapper; -import com.newyetai.usercenter.common.dto.SlickParamCreateDTO; -import com.newyetai.usercenter.common.dto.SlickParamDTO; -import com.newyetai.usercenter.common.dto.SlickParamQueryDTO; -import com.newyetai.usercenter.common.entity.SlickParam; -import com.newyetai.usercenter.common.mapstruct.SlickParamMapMapper; -import com.newyetai.usercenter.common.service.SlickParamService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.common.util.StrUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.common.dao.SlickParamMapper; +import com.senmesh.usercenter.common.dto.SlickParamCreateDTO; +import com.senmesh.usercenter.common.dto.SlickParamDTO; +import com.senmesh.usercenter.common.dto.SlickParamQueryDTO; +import com.senmesh.usercenter.common.entity.SlickParam; +import com.senmesh.usercenter.common.mapstruct.SlickParamMapMapper; +import com.senmesh.usercenter.common.service.SlickParamService; /** * @author sr on 2022-01-11 diff --git a/src/main/java/com/newyetai/usercenter/common/threadPools/AsyncExecutorConfig.java b/src/main/java/com/senmesh/usercenter/common/threadPools/AsyncExecutorConfig.java similarity index 97% rename from src/main/java/com/newyetai/usercenter/common/threadPools/AsyncExecutorConfig.java rename to src/main/java/com/senmesh/usercenter/common/threadPools/AsyncExecutorConfig.java index 114fed2..ef1200c 100644 --- a/src/main/java/com/newyetai/usercenter/common/threadPools/AsyncExecutorConfig.java +++ b/src/main/java/com/senmesh/usercenter/common/threadPools/AsyncExecutorConfig.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.common.threadPools; +package com.senmesh.usercenter.common.threadPools; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/newyetai/usercenter/common/validate/ValidatorConf.java b/src/main/java/com/senmesh/usercenter/common/validate/ValidatorConf.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/common/validate/ValidatorConf.java rename to src/main/java/com/senmesh/usercenter/common/validate/ValidatorConf.java index fb35443..43dfb51 100644 --- a/src/main/java/com/newyetai/usercenter/common/validate/ValidatorConf.java +++ b/src/main/java/com/senmesh/usercenter/common/validate/ValidatorConf.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.common.validate; +package com.senmesh.usercenter.common.validate; import org.hibernate.validator.HibernateValidator; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/newyetai/usercenter/constants/CacheConstants.java b/src/main/java/com/senmesh/usercenter/constants/CacheConstants.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/constants/CacheConstants.java rename to src/main/java/com/senmesh/usercenter/constants/CacheConstants.java index e1ff975..cfc2ff9 100644 --- a/src/main/java/com/newyetai/usercenter/constants/CacheConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/CacheConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; public interface CacheConstants { diff --git a/src/main/java/com/newyetai/usercenter/constants/CompanyConstants.java b/src/main/java/com/senmesh/usercenter/constants/CompanyConstants.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/constants/CompanyConstants.java rename to src/main/java/com/senmesh/usercenter/constants/CompanyConstants.java index 384c564..7b021d6 100644 --- a/src/main/java/com/newyetai/usercenter/constants/CompanyConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/CompanyConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 企业常量类 diff --git a/src/main/java/com/newyetai/usercenter/constants/DomainSettingTypeEnum.java b/src/main/java/com/senmesh/usercenter/constants/DomainSettingTypeEnum.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/constants/DomainSettingTypeEnum.java rename to src/main/java/com/senmesh/usercenter/constants/DomainSettingTypeEnum.java index d5b8969..d5abe7b 100644 --- a/src/main/java/com/newyetai/usercenter/constants/DomainSettingTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/constants/DomainSettingTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 域名配置类型枚举 diff --git a/src/main/java/com/newyetai/usercenter/constants/OrgConstants.java b/src/main/java/com/senmesh/usercenter/constants/OrgConstants.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/constants/OrgConstants.java rename to src/main/java/com/senmesh/usercenter/constants/OrgConstants.java index b4f8d56..b0bb749 100644 --- a/src/main/java/com/newyetai/usercenter/constants/OrgConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/OrgConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 机构相关常量 diff --git a/src/main/java/com/newyetai/usercenter/constants/RoleConstants.java b/src/main/java/com/senmesh/usercenter/constants/RoleConstants.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/constants/RoleConstants.java rename to src/main/java/com/senmesh/usercenter/constants/RoleConstants.java index b434b86..2c24e40 100644 --- a/src/main/java/com/newyetai/usercenter/constants/RoleConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/RoleConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 角色常量类 diff --git a/src/main/java/com/newyetai/usercenter/constants/SecurityConstants.java b/src/main/java/com/senmesh/usercenter/constants/SecurityConstants.java similarity index 98% rename from src/main/java/com/newyetai/usercenter/constants/SecurityConstants.java rename to src/main/java/com/senmesh/usercenter/constants/SecurityConstants.java index 456b216..c78f4e0 100644 --- a/src/main/java/com/newyetai/usercenter/constants/SecurityConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/SecurityConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 权限常量类 diff --git a/src/main/java/com/newyetai/usercenter/constants/SecurityExceptionMsg.java b/src/main/java/com/senmesh/usercenter/constants/SecurityExceptionMsg.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/constants/SecurityExceptionMsg.java rename to src/main/java/com/senmesh/usercenter/constants/SecurityExceptionMsg.java index d489bef..af10821 100644 --- a/src/main/java/com/newyetai/usercenter/constants/SecurityExceptionMsg.java +++ b/src/main/java/com/senmesh/usercenter/constants/SecurityExceptionMsg.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 权限相关异常信息 diff --git a/src/main/java/com/newyetai/usercenter/constants/SecurityValidateConstants.java b/src/main/java/com/senmesh/usercenter/constants/SecurityValidateConstants.java similarity index 98% rename from src/main/java/com/newyetai/usercenter/constants/SecurityValidateConstants.java rename to src/main/java/com/senmesh/usercenter/constants/SecurityValidateConstants.java index 4e78d55..6d27e28 100644 --- a/src/main/java/com/newyetai/usercenter/constants/SecurityValidateConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/SecurityValidateConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 权限模块校验信息常量 diff --git a/src/main/java/com/newyetai/usercenter/constants/UrlConstants.java b/src/main/java/com/senmesh/usercenter/constants/UrlConstants.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/constants/UrlConstants.java rename to src/main/java/com/senmesh/usercenter/constants/UrlConstants.java index 538de8a..43c1223 100644 --- a/src/main/java/com/newyetai/usercenter/constants/UrlConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/UrlConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 菜单常量 diff --git a/src/main/java/com/newyetai/usercenter/constants/UserCenterValidateConstants.java b/src/main/java/com/senmesh/usercenter/constants/UserCenterValidateConstants.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/constants/UserCenterValidateConstants.java rename to src/main/java/com/senmesh/usercenter/constants/UserCenterValidateConstants.java index fc4a1e2..0e43bb5 100644 --- a/src/main/java/com/newyetai/usercenter/constants/UserCenterValidateConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/UserCenterValidateConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * @author Jerry.li diff --git a/src/main/java/com/newyetai/usercenter/constants/UserConstants.java b/src/main/java/com/senmesh/usercenter/constants/UserConstants.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/constants/UserConstants.java rename to src/main/java/com/senmesh/usercenter/constants/UserConstants.java index a0797c1..f41762d 100644 --- a/src/main/java/com/newyetai/usercenter/constants/UserConstants.java +++ b/src/main/java/com/senmesh/usercenter/constants/UserConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.constants; +package com.senmesh.usercenter.constants; /** * 用户常量类 diff --git a/src/main/java/com/newyetai/usercenter/controller/UcDictionaryController.java b/src/main/java/com/senmesh/usercenter/controller/UcDictionaryController.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/controller/UcDictionaryController.java rename to src/main/java/com/senmesh/usercenter/controller/UcDictionaryController.java index e220119..7d06d8f 100644 --- a/src/main/java/com/newyetai/usercenter/controller/UcDictionaryController.java +++ b/src/main/java/com/senmesh/usercenter/controller/UcDictionaryController.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.controller; +package com.senmesh.usercenter.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.TreeHelper; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.dict.dto.DictDTO; -import com.newyetai.component.dict.dto.DictDetailDTO; -import com.newyetai.component.dict.dto.DictDetailQueryDTO; -import com.newyetai.component.dict.dto.DictQueryDTO; -import com.newyetai.component.dict.service.DictDetailService; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.service.UcDictionaryService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.TreeHelper; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.dict.dto.DictDTO; +import com.senmesh.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.dto.DictDetailQueryDTO; +import com.senmesh.component.dict.dto.DictQueryDTO; +import com.senmesh.component.dict.service.DictDetailService; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.service.UcDictionaryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/controller/UcRoleStandardTypeController.java b/src/main/java/com/senmesh/usercenter/controller/UcRoleStandardTypeController.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/controller/UcRoleStandardTypeController.java rename to src/main/java/com/senmesh/usercenter/controller/UcRoleStandardTypeController.java index 407f90c..1b0065d 100644 --- a/src/main/java/com/newyetai/usercenter/controller/UcRoleStandardTypeController.java +++ b/src/main/java/com/senmesh/usercenter/controller/UcRoleStandardTypeController.java @@ -1,22 +1,17 @@ -package com.newyetai.usercenter.controller; +package com.senmesh.usercenter.controller; -import com.baomidou.mybatisplus.extension.api.R; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.dto.RoleStandardTypeDTO; -import com.newyetai.usercenter.entity.RoleStandardType; -import com.newyetai.usercenter.enums.SmsScenesEnum; -import com.newyetai.usercenter.query.RoleStandardTypeQuery; -import com.newyetai.usercenter.service.UcRoleStandardTypeService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.dto.RoleStandardTypeDTO; +import com.senmesh.usercenter.query.RoleStandardTypeQuery; +import com.senmesh.usercenter.service.UcRoleStandardTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/newyetai/usercenter/dao/XsRoleStandardTypeMapper.java b/src/main/java/com/senmesh/usercenter/dao/XsRoleStandardTypeMapper.java similarity index 60% rename from src/main/java/com/newyetai/usercenter/dao/XsRoleStandardTypeMapper.java rename to src/main/java/com/senmesh/usercenter/dao/XsRoleStandardTypeMapper.java index 680cc43..3b55b7e 100644 --- a/src/main/java/com/newyetai/usercenter/dao/XsRoleStandardTypeMapper.java +++ b/src/main/java/com/senmesh/usercenter/dao/XsRoleStandardTypeMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.dao; +package com.senmesh.usercenter.dao; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.usercenter.dto.RoleStandardTypeDTO; -import com.newyetai.usercenter.entity.RoleStandardType; -import com.newyetai.usercenter.query.RoleStandardTypeQuery; +import com.senmesh.usercenter.dto.RoleStandardTypeDTO; +import com.senmesh.usercenter.entity.RoleStandardType; +import com.senmesh.usercenter.query.RoleStandardTypeQuery; /** * @Author dylanyuan diff --git a/src/main/java/com/newyetai/usercenter/district/constants/DistrictConstants.java b/src/main/java/com/senmesh/usercenter/district/constants/DistrictConstants.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/district/constants/DistrictConstants.java rename to src/main/java/com/senmesh/usercenter/district/constants/DistrictConstants.java index 66f47fe..a13ca67 100644 --- a/src/main/java/com/newyetai/usercenter/district/constants/DistrictConstants.java +++ b/src/main/java/com/senmesh/usercenter/district/constants/DistrictConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.district.constants; +package com.senmesh.usercenter.district.constants; /** * @author czy diff --git a/src/main/java/com/newyetai/usercenter/district/controller/DistrictController.java b/src/main/java/com/senmesh/usercenter/district/controller/DistrictController.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/district/controller/DistrictController.java rename to src/main/java/com/senmesh/usercenter/district/controller/DistrictController.java index 0a830e9..b813391 100644 --- a/src/main/java/com/newyetai/usercenter/district/controller/DistrictController.java +++ b/src/main/java/com/senmesh/usercenter/district/controller/DistrictController.java @@ -1,19 +1,18 @@ -package com.newyetai.usercenter.district.controller; +package com.senmesh.usercenter.district.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.district.constants.DistrictConstants; -import com.newyetai.usercenter.district.dto.DistrictDTO; -import com.newyetai.usercenter.district.dto.DistrictTreeQueryDTO; -import com.newyetai.usercenter.district.entity.District; -import com.newyetai.usercenter.district.service.IDistrictService; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.district.constants.DistrictConstants; +import com.senmesh.usercenter.district.dto.DistrictDTO; +import com.senmesh.usercenter.district.dto.DistrictTreeQueryDTO; +import com.senmesh.usercenter.district.entity.District; +import com.senmesh.usercenter.district.service.IDistrictService; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/newyetai/usercenter/district/dao/DistrictMapper.java b/src/main/java/com/senmesh/usercenter/district/dao/DistrictMapper.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/district/dao/DistrictMapper.java rename to src/main/java/com/senmesh/usercenter/district/dao/DistrictMapper.java index b287411..c7ca721 100644 --- a/src/main/java/com/newyetai/usercenter/district/dao/DistrictMapper.java +++ b/src/main/java/com/senmesh/usercenter/district/dao/DistrictMapper.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.district.dao; +package com.senmesh.usercenter.district.dao; -import com.newyetai.usercenter.district.dto.DistrictDTO; -import com.newyetai.usercenter.district.entity.District; +import com.senmesh.usercenter.district.dto.DistrictDTO; +import com.senmesh.usercenter.district.entity.District; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/newyetai/usercenter/district/dto/DistrictDTO.java b/src/main/java/com/senmesh/usercenter/district/dto/DistrictDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/district/dto/DistrictDTO.java rename to src/main/java/com/senmesh/usercenter/district/dto/DistrictDTO.java index 5df212b..5108b3b 100644 --- a/src/main/java/com/newyetai/usercenter/district/dto/DistrictDTO.java +++ b/src/main/java/com/senmesh/usercenter/district/dto/DistrictDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.district.dto; +package com.senmesh.usercenter.district.dto; import com.google.common.collect.Lists; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.util.TreeNode; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.util.TreeNode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/district/dto/DistrictTreeQueryDTO.java b/src/main/java/com/senmesh/usercenter/district/dto/DistrictTreeQueryDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/district/dto/DistrictTreeQueryDTO.java rename to src/main/java/com/senmesh/usercenter/district/dto/DistrictTreeQueryDTO.java index 6286258..a68de89 100644 --- a/src/main/java/com/newyetai/usercenter/district/dto/DistrictTreeQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/district/dto/DistrictTreeQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.district.dto; +package com.senmesh.usercenter.district.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/district/entity/District.java b/src/main/java/com/senmesh/usercenter/district/entity/District.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/district/entity/District.java rename to src/main/java/com/senmesh/usercenter/district/entity/District.java index d9425a4..aff741f 100644 --- a/src/main/java/com/newyetai/usercenter/district/entity/District.java +++ b/src/main/java/com/senmesh/usercenter/district/entity/District.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.district.entity; +package com.senmesh.usercenter.district.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/com/newyetai/usercenter/district/mapper/DistrictMapper.xml b/src/main/java/com/senmesh/usercenter/district/mapper/DistrictMapper.xml similarity index 79% rename from src/main/java/com/newyetai/usercenter/district/mapper/DistrictMapper.xml rename to src/main/java/com/senmesh/usercenter/district/mapper/DistrictMapper.xml index 95158ee..3d158fe 100644 --- a/src/main/java/com/newyetai/usercenter/district/mapper/DistrictMapper.xml +++ b/src/main/java/com/senmesh/usercenter/district/mapper/DistrictMapper.xml @@ -1,6 +1,6 @@ - + - SELECT * FROM diff --git a/src/main/java/com/newyetai/usercenter/district/mapstruct/DistrictMapMapper.java b/src/main/java/com/senmesh/usercenter/district/mapstruct/DistrictMapMapper.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/district/mapstruct/DistrictMapMapper.java rename to src/main/java/com/senmesh/usercenter/district/mapstruct/DistrictMapMapper.java index 119ccda..3002233 100644 --- a/src/main/java/com/newyetai/usercenter/district/mapstruct/DistrictMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/district/mapstruct/DistrictMapMapper.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.district.mapstruct; +package com.senmesh.usercenter.district.mapstruct; -import com.newyetai.usercenter.district.dto.DistrictDTO; -import com.newyetai.usercenter.district.entity.District; +import com.senmesh.usercenter.district.dto.DistrictDTO; +import com.senmesh.usercenter.district.entity.District; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/src/main/java/com/newyetai/usercenter/district/service/IDistrictService.java b/src/main/java/com/senmesh/usercenter/district/service/IDistrictService.java similarity index 66% rename from src/main/java/com/newyetai/usercenter/district/service/IDistrictService.java rename to src/main/java/com/senmesh/usercenter/district/service/IDistrictService.java index 2e59b8f..19538a0 100644 --- a/src/main/java/com/newyetai/usercenter/district/service/IDistrictService.java +++ b/src/main/java/com/senmesh/usercenter/district/service/IDistrictService.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.district.service; +package com.senmesh.usercenter.district.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.usercenter.district.dto.DistrictDTO; -import com.newyetai.usercenter.district.dto.DistrictTreeQueryDTO; -import com.newyetai.usercenter.district.entity.District; +import com.senmesh.usercenter.district.dto.DistrictDTO; +import com.senmesh.usercenter.district.dto.DistrictTreeQueryDTO; +import com.senmesh.usercenter.district.entity.District; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/district/service/impl/DistrictServiceImpl.java b/src/main/java/com/senmesh/usercenter/district/service/impl/DistrictServiceImpl.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/district/service/impl/DistrictServiceImpl.java rename to src/main/java/com/senmesh/usercenter/district/service/impl/DistrictServiceImpl.java index 8a4b62e..6bed27f 100644 --- a/src/main/java/com/newyetai/usercenter/district/service/impl/DistrictServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/district/service/impl/DistrictServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.district.service.impl; +package com.senmesh.usercenter.district.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -6,19 +6,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.TreeHelper; -import com.newyetai.frame.redis.aop.annotation.AutoUnLock; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.usercenter.constants.CacheConstants; -import com.newyetai.usercenter.district.constants.DistrictConstants; -import com.newyetai.usercenter.district.dao.DistrictMapper; -import com.newyetai.usercenter.district.dto.DistrictDTO; -import com.newyetai.usercenter.district.dto.DistrictTreeQueryDTO; -import com.newyetai.usercenter.district.entity.District; -import com.newyetai.usercenter.district.mapstruct.DistrictMapMapper; -import com.newyetai.usercenter.district.service.IDistrictService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.TreeHelper; +import com.senmesh.frame.redis.aop.annotation.AutoUnLock; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.usercenter.constants.CacheConstants; +import com.senmesh.usercenter.district.constants.DistrictConstants; +import com.senmesh.usercenter.district.dao.DistrictMapper; +import com.senmesh.usercenter.district.dto.DistrictDTO; +import com.senmesh.usercenter.district.dto.DistrictTreeQueryDTO; +import com.senmesh.usercenter.district.entity.District; +import com.senmesh.usercenter.district.mapstruct.DistrictMapMapper; +import com.senmesh.usercenter.district.service.IDistrictService; import java.util.List; import java.util.concurrent.TimeUnit; @@ -29,7 +29,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.http.impl.client.HttpClients; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/newyetai/usercenter/dto/AllocatedBusinessRoleQueryDTO.java b/src/main/java/com/senmesh/usercenter/dto/AllocatedBusinessRoleQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/dto/AllocatedBusinessRoleQueryDTO.java rename to src/main/java/com/senmesh/usercenter/dto/AllocatedBusinessRoleQueryDTO.java index 6cdb893..79a8e6f 100644 --- a/src/main/java/com/newyetai/usercenter/dto/AllocatedBusinessRoleQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/AllocatedBusinessRoleQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; -import com.newyetai.usercenter.constants.RoleConstants; -import com.newyetai.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.constants.RoleConstants; +import com.senmesh.usercenter.constants.SecurityConstants; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/dto/AllocationDTO.java b/src/main/java/com/senmesh/usercenter/dto/AllocationDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/dto/AllocationDTO.java rename to src/main/java/com/senmesh/usercenter/dto/AllocationDTO.java index fcbd835..f337e32 100644 --- a/src/main/java/com/newyetai/usercenter/dto/AllocationDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/AllocationDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/dto/AllocationRoleDTO.java b/src/main/java/com/senmesh/usercenter/dto/AllocationRoleDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/dto/AllocationRoleDTO.java rename to src/main/java/com/senmesh/usercenter/dto/AllocationRoleDTO.java index db5ba87..294b1cc 100644 --- a/src/main/java/com/newyetai/usercenter/dto/AllocationRoleDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/AllocationRoleDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/dto/AllocationRoleUserDTO.java b/src/main/java/com/senmesh/usercenter/dto/AllocationRoleUserDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/dto/AllocationRoleUserDTO.java rename to src/main/java/com/senmesh/usercenter/dto/AllocationRoleUserDTO.java index 96939a9..b258977 100644 --- a/src/main/java/com/newyetai/usercenter/dto/AllocationRoleUserDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/AllocationRoleUserDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/dto/CaptchaDTO.java b/src/main/java/com/senmesh/usercenter/dto/CaptchaDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/dto/CaptchaDTO.java rename to src/main/java/com/senmesh/usercenter/dto/CaptchaDTO.java index 3935f73..678d317 100644 --- a/src/main/java/com/newyetai/usercenter/dto/CaptchaDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/CaptchaDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/dto/CheckKeyDTO.java b/src/main/java/com/senmesh/usercenter/dto/CheckKeyDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/dto/CheckKeyDTO.java rename to src/main/java/com/senmesh/usercenter/dto/CheckKeyDTO.java index b4dd8f6..df1f801 100644 --- a/src/main/java/com/newyetai/usercenter/dto/CheckKeyDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/CheckKeyDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/dto/DomainSettingOperateDTO.java b/src/main/java/com/senmesh/usercenter/dto/DomainSettingOperateDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/dto/DomainSettingOperateDTO.java rename to src/main/java/com/senmesh/usercenter/dto/DomainSettingOperateDTO.java index 5cca146..9e27393 100644 --- a/src/main/java/com/newyetai/usercenter/dto/DomainSettingOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/DomainSettingOperateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/dto/DomainSettingReqDTO.java b/src/main/java/com/senmesh/usercenter/dto/DomainSettingReqDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/dto/DomainSettingReqDTO.java rename to src/main/java/com/senmesh/usercenter/dto/DomainSettingReqDTO.java index 8775eb1..8d5f225 100644 --- a/src/main/java/com/newyetai/usercenter/dto/DomainSettingReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/DomainSettingReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/dto/DomainSettingResDTO.java b/src/main/java/com/senmesh/usercenter/dto/DomainSettingResDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/dto/DomainSettingResDTO.java rename to src/main/java/com/senmesh/usercenter/dto/DomainSettingResDTO.java index 58a57a2..43eccff 100644 --- a/src/main/java/com/newyetai/usercenter/dto/DomainSettingResDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/DomainSettingResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/dto/IUserDetail.java b/src/main/java/com/senmesh/usercenter/dto/IUserDetail.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/dto/IUserDetail.java rename to src/main/java/com/senmesh/usercenter/dto/IUserDetail.java index 117adfe..361431f 100644 --- a/src/main/java/com/newyetai/usercenter/dto/IUserDetail.java +++ b/src/main/java/com/senmesh/usercenter/dto/IUserDetail.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; public interface IUserDetail { diff --git a/src/main/java/com/newyetai/usercenter/dto/MenuResourceDTO.java b/src/main/java/com/senmesh/usercenter/dto/MenuResourceDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/dto/MenuResourceDTO.java rename to src/main/java/com/senmesh/usercenter/dto/MenuResourceDTO.java index ec52f82..49604e2 100644 --- a/src/main/java/com/newyetai/usercenter/dto/MenuResourceDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/MenuResourceDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; -import com.newyetai.usercenter.resource.dto.ComponentDTO; -import com.newyetai.usercenter.resource.dto.UrlDTO; +import com.senmesh.usercenter.resource.dto.ComponentDTO; +import com.senmesh.usercenter.resource.dto.UrlDTO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/dto/OrgAdminDTO.java b/src/main/java/com/senmesh/usercenter/dto/OrgAdminDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/dto/OrgAdminDTO.java rename to src/main/java/com/senmesh/usercenter/dto/OrgAdminDTO.java index cf09c6c..c2b547e 100644 --- a/src/main/java/com/newyetai/usercenter/dto/OrgAdminDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/OrgAdminDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Update; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/dto/OrgLoginTimeDTO.java b/src/main/java/com/senmesh/usercenter/dto/OrgLoginTimeDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/dto/OrgLoginTimeDTO.java rename to src/main/java/com/senmesh/usercenter/dto/OrgLoginTimeDTO.java index 003262e..a39bbfd 100644 --- a/src/main/java/com/newyetai/usercenter/dto/OrgLoginTimeDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/OrgLoginTimeDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import java.io.Serializable; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.util.JsonUtils; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/dto/OrgTreeDTO.java b/src/main/java/com/senmesh/usercenter/dto/OrgTreeDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/dto/OrgTreeDTO.java rename to src/main/java/com/senmesh/usercenter/dto/OrgTreeDTO.java index d7675ab..76d98e2 100644 --- a/src/main/java/com/newyetai/usercenter/dto/OrgTreeDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/OrgTreeDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import com.google.common.collect.Lists; -import com.newyetai.common.util.TreeNode; +import com.senmesh.common.util.TreeNode; import java.io.Serializable; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/newyetai/usercenter/dto/OrgUserEditDTO.java b/src/main/java/com/senmesh/usercenter/dto/OrgUserEditDTO.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/dto/OrgUserEditDTO.java rename to src/main/java/com/senmesh/usercenter/dto/OrgUserEditDTO.java index 971b8ba..134af12 100644 --- a/src/main/java/com/newyetai/usercenter/dto/OrgUserEditDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/OrgUserEditDTO.java @@ -1,14 +1,12 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/dto/PaymentCodeDTO.java b/src/main/java/com/senmesh/usercenter/dto/PaymentCodeDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/dto/PaymentCodeDTO.java rename to src/main/java/com/senmesh/usercenter/dto/PaymentCodeDTO.java index a839276..4311297 100644 --- a/src/main/java/com/newyetai/usercenter/dto/PaymentCodeDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/PaymentCodeDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; -import com.newyetai.common.validation.Create; +import com.senmesh.common.validation.Create; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/newyetai/usercenter/dto/ResetPasswordByPhoneDTO.java b/src/main/java/com/senmesh/usercenter/dto/ResetPasswordByPhoneDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/dto/ResetPasswordByPhoneDTO.java rename to src/main/java/com/senmesh/usercenter/dto/ResetPasswordByPhoneDTO.java index c3123ba..7186b67 100644 --- a/src/main/java/com/newyetai/usercenter/dto/ResetPasswordByPhoneDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/ResetPasswordByPhoneDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import java.io.Serializable; import javax.validation.constraints.NotEmpty; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/dto/Resource.java b/src/main/java/com/senmesh/usercenter/dto/Resource.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/dto/Resource.java rename to src/main/java/com/senmesh/usercenter/dto/Resource.java index e8fb3ad..be5bce7 100644 --- a/src/main/java/com/newyetai/usercenter/dto/Resource.java +++ b/src/main/java/com/senmesh/usercenter/dto/Resource.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import org.springframework.security.access.ConfigAttribute; diff --git a/src/main/java/com/newyetai/usercenter/dto/ResourceDTO.java b/src/main/java/com/senmesh/usercenter/dto/ResourceDTO.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/dto/ResourceDTO.java rename to src/main/java/com/senmesh/usercenter/dto/ResourceDTO.java index 301abc9..cbb53e9 100644 --- a/src/main/java/com/newyetai/usercenter/dto/ResourceDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/ResourceDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; -import com.newyetai.common.validation.Delete; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.constants.SecurityValidateConstants; +import com.senmesh.common.validation.Delete; +import com.senmesh.common.validation.Update; +import com.senmesh.usercenter.constants.SecurityValidateConstants; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/dto/RoleDTO.java b/src/main/java/com/senmesh/usercenter/dto/RoleDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/dto/RoleDTO.java rename to src/main/java/com/senmesh/usercenter/dto/RoleDTO.java index 189a387..39dd5f0 100644 --- a/src/main/java/com/newyetai/usercenter/dto/RoleDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/RoleDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.constants.SecurityValidateConstants; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.usercenter.constants.SecurityValidateConstants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/dto/RoleQueryDTO.java b/src/main/java/com/senmesh/usercenter/dto/RoleQueryDTO.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/dto/RoleQueryDTO.java rename to src/main/java/com/senmesh/usercenter/dto/RoleQueryDTO.java index a0b9ea1..b035e8c 100644 --- a/src/main/java/com/newyetai/usercenter/dto/RoleQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/RoleQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/dto/RoleStandardTypeDTO.java b/src/main/java/com/senmesh/usercenter/dto/RoleStandardTypeDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/dto/RoleStandardTypeDTO.java rename to src/main/java/com/senmesh/usercenter/dto/RoleStandardTypeDTO.java index 6a74d9c..1f5cdde 100644 --- a/src/main/java/com/newyetai/usercenter/dto/RoleStandardTypeDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/RoleStandardTypeDTO.java @@ -1,9 +1,8 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import java.io.Serializable; -import java.util.Date; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/dto/SecurityCodeRequestDTO.java b/src/main/java/com/senmesh/usercenter/dto/SecurityCodeRequestDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/dto/SecurityCodeRequestDTO.java rename to src/main/java/com/senmesh/usercenter/dto/SecurityCodeRequestDTO.java index 19e4a67..24bf039 100644 --- a/src/main/java/com/newyetai/usercenter/dto/SecurityCodeRequestDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/SecurityCodeRequestDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/dto/SuperResetPasswordDTO.java b/src/main/java/com/senmesh/usercenter/dto/SuperResetPasswordDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/dto/SuperResetPasswordDTO.java rename to src/main/java/com/senmesh/usercenter/dto/SuperResetPasswordDTO.java index 975faef..300780d 100644 --- a/src/main/java/com/newyetai/usercenter/dto/SuperResetPasswordDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/SuperResetPasswordDTO.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import java.io.Serializable; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/dto/UserAllocateRoleDTO.java b/src/main/java/com/senmesh/usercenter/dto/UserAllocateRoleDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/dto/UserAllocateRoleDTO.java rename to src/main/java/com/senmesh/usercenter/dto/UserAllocateRoleDTO.java index b9043a9..152f042 100644 --- a/src/main/java/com/newyetai/usercenter/dto/UserAllocateRoleDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/UserAllocateRoleDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import java.util.List; import javax.validation.constraints.NotNull; -import com.newyetai.usercenter.constants.SecurityValidateConstants; +import com.senmesh.usercenter.constants.SecurityValidateConstants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/dto/UserContractStatusDTO.java b/src/main/java/com/senmesh/usercenter/dto/UserContractStatusDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/dto/UserContractStatusDTO.java rename to src/main/java/com/senmesh/usercenter/dto/UserContractStatusDTO.java index 4282432..0cd123f 100644 --- a/src/main/java/com/newyetai/usercenter/dto/UserContractStatusDTO.java +++ b/src/main/java/com/senmesh/usercenter/dto/UserContractStatusDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.dto; +package com.senmesh.usercenter.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/entity/CompanyBankAccount.java b/src/main/java/com/senmesh/usercenter/entity/CompanyBankAccount.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/entity/CompanyBankAccount.java rename to src/main/java/com/senmesh/usercenter/entity/CompanyBankAccount.java index 4887dcc..92fe134 100644 --- a/src/main/java/com/newyetai/usercenter/entity/CompanyBankAccount.java +++ b/src/main/java/com/senmesh/usercenter/entity/CompanyBankAccount.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.entity; +package com.senmesh.usercenter.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.OrgBaseEntity; +import com.senmesh.common.entity.OrgBaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/entity/CompanyContact.java b/src/main/java/com/senmesh/usercenter/entity/CompanyContact.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/entity/CompanyContact.java rename to src/main/java/com/senmesh/usercenter/entity/CompanyContact.java index c212223..24fb5c4 100644 --- a/src/main/java/com/newyetai/usercenter/entity/CompanyContact.java +++ b/src/main/java/com/senmesh/usercenter/entity/CompanyContact.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.entity; +package com.senmesh.usercenter.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.OrgBaseEntity; +import com.senmesh.common.entity.OrgBaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/entity/CompanyExtend.java b/src/main/java/com/senmesh/usercenter/entity/CompanyExtend.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/entity/CompanyExtend.java rename to src/main/java/com/senmesh/usercenter/entity/CompanyExtend.java index 3ec6c2e..f4eaeff 100644 --- a/src/main/java/com/newyetai/usercenter/entity/CompanyExtend.java +++ b/src/main/java/com/senmesh/usercenter/entity/CompanyExtend.java @@ -1,9 +1,7 @@ -package com.newyetai.usercenter.entity; - -import java.io.Serializable; +package com.senmesh.usercenter.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.OrgBaseEntity; +import com.senmesh.common.entity.OrgBaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/entity/CompanyFile.java b/src/main/java/com/senmesh/usercenter/entity/CompanyFile.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/entity/CompanyFile.java rename to src/main/java/com/senmesh/usercenter/entity/CompanyFile.java index 3bcf0d3..fa24683 100644 --- a/src/main/java/com/newyetai/usercenter/entity/CompanyFile.java +++ b/src/main/java/com/senmesh/usercenter/entity/CompanyFile.java @@ -1,13 +1,9 @@ -package com.newyetai.usercenter.entity; - -import java.io.Serializable; -import java.util.Date; +package com.senmesh.usercenter.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.OrgBaseEntity; +import com.senmesh.common.entity.OrgBaseEntity; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/com/newyetai/usercenter/entity/CompanyInvoice.java b/src/main/java/com/senmesh/usercenter/entity/CompanyInvoice.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/entity/CompanyInvoice.java rename to src/main/java/com/senmesh/usercenter/entity/CompanyInvoice.java index 63b67fc..67da8e4 100644 --- a/src/main/java/com/newyetai/usercenter/entity/CompanyInvoice.java +++ b/src/main/java/com/senmesh/usercenter/entity/CompanyInvoice.java @@ -1,13 +1,9 @@ -package com.newyetai.usercenter.entity; - -import java.io.Serializable; -import java.util.Date; +package com.senmesh.usercenter.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.OrgBaseEntity; +import com.senmesh.common.entity.OrgBaseEntity; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/com/newyetai/usercenter/entity/MessageLog.java b/src/main/java/com/senmesh/usercenter/entity/MessageLog.java similarity index 97% rename from src/main/java/com/newyetai/usercenter/entity/MessageLog.java rename to src/main/java/com/senmesh/usercenter/entity/MessageLog.java index 923dfc8..35d289c 100644 --- a/src/main/java/com/newyetai/usercenter/entity/MessageLog.java +++ b/src/main/java/com/senmesh/usercenter/entity/MessageLog.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.entity; +package com.senmesh.usercenter.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/entity/RoleStandardType.java b/src/main/java/com/senmesh/usercenter/entity/RoleStandardType.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/entity/RoleStandardType.java rename to src/main/java/com/senmesh/usercenter/entity/RoleStandardType.java index 3ccabae..49fc836 100644 --- a/src/main/java/com/newyetai/usercenter/entity/RoleStandardType.java +++ b/src/main/java/com/senmesh/usercenter/entity/RoleStandardType.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.entity; +package com.senmesh.usercenter.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/enums/AllocationType.java b/src/main/java/com/senmesh/usercenter/enums/AllocationType.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/enums/AllocationType.java rename to src/main/java/com/senmesh/usercenter/enums/AllocationType.java index 2d1efbb..d8f1ac7 100644 --- a/src/main/java/com/newyetai/usercenter/enums/AllocationType.java +++ b/src/main/java/com/senmesh/usercenter/enums/AllocationType.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.enums; +package com.senmesh.usercenter.enums; /** * @author Jerry.li diff --git a/src/main/java/com/newyetai/usercenter/enums/AuthStatu.java b/src/main/java/com/senmesh/usercenter/enums/AuthStatu.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/enums/AuthStatu.java rename to src/main/java/com/senmesh/usercenter/enums/AuthStatu.java index be4a3ab..d570837 100644 --- a/src/main/java/com/newyetai/usercenter/enums/AuthStatu.java +++ b/src/main/java/com/senmesh/usercenter/enums/AuthStatu.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.enums; +package com.senmesh.usercenter.enums; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; import java.util.Arrays; diff --git a/src/main/java/com/newyetai/usercenter/enums/OrgTypeEnum.java b/src/main/java/com/senmesh/usercenter/enums/OrgTypeEnum.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/enums/OrgTypeEnum.java rename to src/main/java/com/senmesh/usercenter/enums/OrgTypeEnum.java index f493706..7ba0b91 100644 --- a/src/main/java/com/newyetai/usercenter/enums/OrgTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/enums/OrgTypeEnum.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.enums; +package com.senmesh.usercenter.enums; import java.util.Map; import com.baomidou.mybatisplus.annotation.EnumValue; import com.google.common.collect.Maps; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; /** * 机构类型 diff --git a/src/main/java/com/newyetai/usercenter/enums/ResourceType.java b/src/main/java/com/senmesh/usercenter/enums/ResourceType.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/enums/ResourceType.java rename to src/main/java/com/senmesh/usercenter/enums/ResourceType.java index f3ddf7b..4c6582a 100644 --- a/src/main/java/com/newyetai/usercenter/enums/ResourceType.java +++ b/src/main/java/com/senmesh/usercenter/enums/ResourceType.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.enums; +package com.senmesh.usercenter.enums; /** * @author: Jerry.li diff --git a/src/main/java/com/newyetai/usercenter/enums/SmsScenesEnum.java b/src/main/java/com/senmesh/usercenter/enums/SmsScenesEnum.java similarity index 97% rename from src/main/java/com/newyetai/usercenter/enums/SmsScenesEnum.java rename to src/main/java/com/senmesh/usercenter/enums/SmsScenesEnum.java index 296fafc..899749c 100644 --- a/src/main/java/com/newyetai/usercenter/enums/SmsScenesEnum.java +++ b/src/main/java/com/senmesh/usercenter/enums/SmsScenesEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.enums; +package com.senmesh.usercenter.enums; import java.util.Arrays; diff --git a/src/main/java/com/newyetai/usercenter/enums/SmsTemplateCodeEnum.java b/src/main/java/com/senmesh/usercenter/enums/SmsTemplateCodeEnum.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/enums/SmsTemplateCodeEnum.java rename to src/main/java/com/senmesh/usercenter/enums/SmsTemplateCodeEnum.java index 93a4039..ff50c8a 100644 --- a/src/main/java/com/newyetai/usercenter/enums/SmsTemplateCodeEnum.java +++ b/src/main/java/com/senmesh/usercenter/enums/SmsTemplateCodeEnum.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.enums; +package com.senmesh.usercenter.enums; -import com.newyetai.sdk.sms.dto.ITemplateCode; +import com.senmesh.sdk.sms.dto.ITemplateCode; import com.google.common.collect.Maps; import java.util.Map; diff --git a/src/main/java/com/newyetai/usercenter/enums/UserType.java b/src/main/java/com/senmesh/usercenter/enums/UserType.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/enums/UserType.java rename to src/main/java/com/senmesh/usercenter/enums/UserType.java index ca00cac..4b1b50b 100644 --- a/src/main/java/com/newyetai/usercenter/enums/UserType.java +++ b/src/main/java/com/senmesh/usercenter/enums/UserType.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.enums; +package com.senmesh.usercenter.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; /** * @author Jerry.li diff --git a/src/main/java/com/newyetai/usercenter/face/controller/FaceController.java b/src/main/java/com/senmesh/usercenter/face/controller/FaceController.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/face/controller/FaceController.java rename to src/main/java/com/senmesh/usercenter/face/controller/FaceController.java index e8077eb..5946475 100644 --- a/src/main/java/com/newyetai/usercenter/face/controller/FaceController.java +++ b/src/main/java/com/senmesh/usercenter/face/controller/FaceController.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.face.controller; +package com.senmesh.usercenter.face.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.face.dto.FaceCreateDTO; -import com.newyetai.usercenter.face.dto.FaceInfoDTO; -import com.newyetai.usercenter.face.dto.FacePageQueryDTO; -import com.newyetai.usercenter.face.service.FaceService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.face.dto.FaceCreateDTO; +import com.senmesh.usercenter.face.dto.FaceInfoDTO; +import com.senmesh.usercenter.face.dto.FacePageQueryDTO; +import com.senmesh.usercenter.face.service.FaceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/face/dao/FaceMapper.java b/src/main/java/com/senmesh/usercenter/face/dao/FaceMapper.java similarity index 58% rename from src/main/java/com/newyetai/usercenter/face/dao/FaceMapper.java rename to src/main/java/com/senmesh/usercenter/face/dao/FaceMapper.java index a99fb1d..81e44de 100644 --- a/src/main/java/com/newyetai/usercenter/face/dao/FaceMapper.java +++ b/src/main/java/com/senmesh/usercenter/face/dao/FaceMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.face.dao; +package com.senmesh.usercenter.face.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.usercenter.face.dto.FaceInfoDTO; -import com.newyetai.usercenter.face.dto.FacePageQueryDTO; -import com.newyetai.usercenter.face.entity.Face; +import com.senmesh.usercenter.face.dto.FaceInfoDTO; +import com.senmesh.usercenter.face.dto.FacePageQueryDTO; +import com.senmesh.usercenter.face.entity.Face; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/face/dto/FaceCreateDTO.java b/src/main/java/com/senmesh/usercenter/face/dto/FaceCreateDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/face/dto/FaceCreateDTO.java rename to src/main/java/com/senmesh/usercenter/face/dto/FaceCreateDTO.java index 12c3ade..5b334af 100644 --- a/src/main/java/com/newyetai/usercenter/face/dto/FaceCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/face/dto/FaceCreateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.face.dto; +package com.senmesh.usercenter.face.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/face/dto/FaceInfoDTO.java b/src/main/java/com/senmesh/usercenter/face/dto/FaceInfoDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/face/dto/FaceInfoDTO.java rename to src/main/java/com/senmesh/usercenter/face/dto/FaceInfoDTO.java index eb38ca9..419816a 100644 --- a/src/main/java/com/newyetai/usercenter/face/dto/FaceInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/face/dto/FaceInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.face.dto; +package com.senmesh.usercenter.face.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/face/dto/FacePageQueryDTO.java b/src/main/java/com/senmesh/usercenter/face/dto/FacePageQueryDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/face/dto/FacePageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/face/dto/FacePageQueryDTO.java index c63474a..a4b917c 100644 --- a/src/main/java/com/newyetai/usercenter/face/dto/FacePageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/face/dto/FacePageQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.face.dto; +package com.senmesh.usercenter.face.dto; -import com.newyetai.common.dto.PageQueryDTO; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.dto.PageQueryDTO; +import com.senmesh.common.util.UserContextHolder; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/face/entity/Face.java b/src/main/java/com/senmesh/usercenter/face/entity/Face.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/face/entity/Face.java rename to src/main/java/com/senmesh/usercenter/face/entity/Face.java index cb803f8..0dbf343 100644 --- a/src/main/java/com/newyetai/usercenter/face/entity/Face.java +++ b/src/main/java/com/senmesh/usercenter/face/entity/Face.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.face.entity; +package com.senmesh.usercenter.face.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.usercenter.face.enums.FaceTypeEnum; +import com.senmesh.common.entity.BaseEntity; +import com.senmesh.usercenter.face.enums.FaceTypeEnum; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/com/newyetai/usercenter/face/enums/FaceTypeEnum.java b/src/main/java/com/senmesh/usercenter/face/enums/FaceTypeEnum.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/face/enums/FaceTypeEnum.java rename to src/main/java/com/senmesh/usercenter/face/enums/FaceTypeEnum.java index ebc0549..094f7ef 100644 --- a/src/main/java/com/newyetai/usercenter/face/enums/FaceTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/face/enums/FaceTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.face.enums; +package com.senmesh.usercenter.face.enums; import com.baomidou.mybatisplus.annotation.EnumValue; diff --git a/src/main/java/com/newyetai/usercenter/face/mapper/FaceMapper.xml b/src/main/java/com/senmesh/usercenter/face/mapper/FaceMapper.xml similarity index 70% rename from src/main/java/com/newyetai/usercenter/face/mapper/FaceMapper.xml rename to src/main/java/com/senmesh/usercenter/face/mapper/FaceMapper.xml index c3b0d32..55aac08 100644 --- a/src/main/java/com/newyetai/usercenter/face/mapper/FaceMapper.xml +++ b/src/main/java/com/senmesh/usercenter/face/mapper/FaceMapper.xml @@ -1,8 +1,8 @@ - + - select * from uc_user_face f where f.deleted = 0 and f.user_id = #{userId} diff --git a/src/main/java/com/newyetai/usercenter/face/service/FaceService.java b/src/main/java/com/senmesh/usercenter/face/service/FaceService.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/face/service/FaceService.java rename to src/main/java/com/senmesh/usercenter/face/service/FaceService.java index a9aaead..7ccd384 100644 --- a/src/main/java/com/newyetai/usercenter/face/service/FaceService.java +++ b/src/main/java/com/senmesh/usercenter/face/service/FaceService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.face.service; +package com.senmesh.usercenter.face.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.usercenter.face.dto.FaceCreateDTO; -import com.newyetai.usercenter.face.dto.FaceInfoDTO; -import com.newyetai.usercenter.face.dto.FacePageQueryDTO; -import com.newyetai.usercenter.face.entity.Face; +import com.senmesh.usercenter.face.dto.FaceCreateDTO; +import com.senmesh.usercenter.face.dto.FaceInfoDTO; +import com.senmesh.usercenter.face.dto.FacePageQueryDTO; +import com.senmesh.usercenter.face.entity.Face; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/usercenter/face/service/impl/FaceServiceImpl.java b/src/main/java/com/senmesh/usercenter/face/service/impl/FaceServiceImpl.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/face/service/impl/FaceServiceImpl.java rename to src/main/java/com/senmesh/usercenter/face/service/impl/FaceServiceImpl.java index 8c4fba9..15e0ce1 100644 --- a/src/main/java/com/newyetai/usercenter/face/service/impl/FaceServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/face/service/impl/FaceServiceImpl.java @@ -1,18 +1,18 @@ -package com.newyetai.usercenter.face.service.impl; +package com.senmesh.usercenter.face.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.EnumUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.face.dao.FaceMapper; -import com.newyetai.usercenter.face.dto.FaceCreateDTO; -import com.newyetai.usercenter.face.dto.FaceInfoDTO; -import com.newyetai.usercenter.face.dto.FacePageQueryDTO; -import com.newyetai.usercenter.face.entity.Face; -import com.newyetai.usercenter.face.enums.FaceTypeEnum; -import com.newyetai.usercenter.face.service.FaceService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.EnumUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.face.dao.FaceMapper; +import com.senmesh.usercenter.face.dto.FaceCreateDTO; +import com.senmesh.usercenter.face.dto.FaceInfoDTO; +import com.senmesh.usercenter.face.dto.FacePageQueryDTO; +import com.senmesh.usercenter.face.entity.Face; +import com.senmesh.usercenter.face.enums.FaceTypeEnum; +import com.senmesh.usercenter.face.service.FaceService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/usercenter/mapper/UcMessageMapper.xml b/src/main/java/com/senmesh/usercenter/mapper/UcMessageMapper.xml similarity index 83% rename from src/main/java/com/newyetai/usercenter/mapper/UcMessageMapper.xml rename to src/main/java/com/senmesh/usercenter/mapper/UcMessageMapper.xml index 23632c5..e610117 100644 --- a/src/main/java/com/newyetai/usercenter/mapper/UcMessageMapper.xml +++ b/src/main/java/com/senmesh/usercenter/mapper/UcMessageMapper.xml @@ -2,9 +2,9 @@ - + - + insert into xs_message_log ( msg_sender, @@ -28,7 +28,7 @@ ) - select id, msg_sender, @@ -48,7 +48,7 @@ limit 1 - SELECT id, msg_sender, @@ -69,7 +69,7 @@ LIMIT 100 - + update xs_message_log set diff --git a/src/main/java/com/newyetai/usercenter/mapper/XsRoleStandardTypeMapper.xml b/src/main/java/com/senmesh/usercenter/mapper/XsRoleStandardTypeMapper.xml similarity index 75% rename from src/main/java/com/newyetai/usercenter/mapper/XsRoleStandardTypeMapper.xml rename to src/main/java/com/senmesh/usercenter/mapper/XsRoleStandardTypeMapper.xml index af9b7ea..5d8f807 100644 --- a/src/main/java/com/newyetai/usercenter/mapper/XsRoleStandardTypeMapper.xml +++ b/src/main/java/com/senmesh/usercenter/mapper/XsRoleStandardTypeMapper.xml @@ -2,9 +2,9 @@ - + - select * from xs_role_standard_type where deleted = 0 and role_code = #{roleCode} diff --git a/src/main/java/com/newyetai/usercenter/notice/config/NoticeProperties.java b/src/main/java/com/senmesh/usercenter/notice/config/NoticeProperties.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/notice/config/NoticeProperties.java rename to src/main/java/com/senmesh/usercenter/notice/config/NoticeProperties.java index 543280a..2930f2c 100644 --- a/src/main/java/com/newyetai/usercenter/notice/config/NoticeProperties.java +++ b/src/main/java/com/senmesh/usercenter/notice/config/NoticeProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.config; +package com.senmesh.usercenter.notice.config; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeChannelTypeEnum.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeChannelTypeEnum.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeChannelTypeEnum.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeChannelTypeEnum.java index 626f616..36348ea 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeChannelTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeChannelTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; /** * 消息通道类型: diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeContentTemplateConstants.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeContentTemplateConstants.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeContentTemplateConstants.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeContentTemplateConstants.java index cd5a215..bff628e 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeContentTemplateConstants.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeContentTemplateConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeLevelEnum.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeLevelEnum.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeLevelEnum.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeLevelEnum.java index 226917f..e747395 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeLevelEnum.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeLevelEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; /** * 级别: diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeModuleTypeEnum.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeModuleTypeEnum.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeModuleTypeEnum.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeModuleTypeEnum.java index 516feb3..4235ef4 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeModuleTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeModuleTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; /** * 模块分类 diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverSettingConstants.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverSettingConstants.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverSettingConstants.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverSettingConstants.java index d8daa34..c9d5445 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverSettingConstants.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverSettingConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverStatusEnum.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverStatusEnum.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverStatusEnum.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverStatusEnum.java index 50cdf48..e8a3cfd 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverStatusEnum.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; /** * 接收状态: diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverTypeEnum.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverTypeEnum.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverTypeEnum.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverTypeEnum.java index ed85d7a..178b6bb 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeReceiverTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeReceiverTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; /** * 接收人关联类型: diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeSendStatusEnum.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeSendStatusEnum.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeSendStatusEnum.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeSendStatusEnum.java index 7df5ce6..3281532 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeSendStatusEnum.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeSendStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; /** * 接收状态: diff --git a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeTemplateCodeEnum.java b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeTemplateCodeEnum.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/notice/constant/NoticeTemplateCodeEnum.java rename to src/main/java/com/senmesh/usercenter/notice/constant/NoticeTemplateCodeEnum.java index a7b7724..86f042b 100644 --- a/src/main/java/com/newyetai/usercenter/notice/constant/NoticeTemplateCodeEnum.java +++ b/src/main/java/com/senmesh/usercenter/notice/constant/NoticeTemplateCodeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.constant; +package com.senmesh.usercenter.notice.constant; public enum NoticeTemplateCodeEnum { diff --git a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeContentTemplateController.java b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeContentTemplateController.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/notice/controller/NoticeContentTemplateController.java rename to src/main/java/com/senmesh/usercenter/notice/controller/NoticeContentTemplateController.java index 980ca61..4e727f6 100644 --- a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeContentTemplateController.java +++ b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeContentTemplateController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.controller; +package com.senmesh.usercenter.notice.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.Update; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateQueryDTO; -import com.newyetai.usercenter.notice.service.NoticeContentTemplateService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.Update; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateQueryDTO; +import com.senmesh.usercenter.notice.service.NoticeContentTemplateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeReceiverSettingController.java b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeReceiverSettingController.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/notice/controller/NoticeReceiverSettingController.java rename to src/main/java/com/senmesh/usercenter/notice/controller/NoticeReceiverSettingController.java index 8634ccf..3a901ab 100644 --- a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeReceiverSettingController.java +++ b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeReceiverSettingController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.controller; +package com.senmesh.usercenter.notice.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -9,15 +9,15 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRoleDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingUserDTO; -import com.newyetai.usercenter.notice.service.NoticeReceiverSettingService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRoleDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingUserDTO; +import com.senmesh.usercenter.notice.service.NoticeReceiverSettingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeSendRecordController.java b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeSendRecordController.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/notice/controller/NoticeSendRecordController.java rename to src/main/java/com/senmesh/usercenter/notice/controller/NoticeSendRecordController.java index c889a56..f750c5d 100644 --- a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeSendRecordController.java +++ b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeSendRecordController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.controller; +package com.senmesh.usercenter.notice.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -8,12 +8,12 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordQueryDTO; -import com.newyetai.usercenter.notice.service.NoticeSendRecordService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordQueryDTO; +import com.senmesh.usercenter.notice.service.NoticeSendRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeSendRecordDetailController.java b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeSendRecordDetailController.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/notice/controller/NoticeSendRecordDetailController.java rename to src/main/java/com/senmesh/usercenter/notice/controller/NoticeSendRecordDetailController.java index aff75be..8bc4221 100644 --- a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeSendRecordDetailController.java +++ b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeSendRecordDetailController.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.controller; +package com.senmesh.usercenter.notice.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailReqDTO; -import com.newyetai.usercenter.notice.service.NoticeSendRecordDetailService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailReqDTO; +import com.senmesh.usercenter.notice.service.NoticeSendRecordDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeTemplateController.java b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeTemplateController.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/notice/controller/NoticeTemplateController.java rename to src/main/java/com/senmesh/usercenter/notice/controller/NoticeTemplateController.java index 59c9ab3..a26cff4 100644 --- a/src/main/java/com/newyetai/usercenter/notice/controller/NoticeTemplateController.java +++ b/src/main/java/com/senmesh/usercenter/notice/controller/NoticeTemplateController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.controller; +package com.senmesh.usercenter.notice.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.Update; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.notice.dto.NoticeTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateQueryDTO; -import com.newyetai.usercenter.notice.service.NoticeTemplateService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.Update; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.notice.dto.NoticeTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateQueryDTO; +import com.senmesh.usercenter.notice.service.NoticeTemplateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeContentTemplateMapper.java b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeContentTemplateMapper.java similarity index 61% rename from src/main/java/com/newyetai/usercenter/notice/dao/NoticeContentTemplateMapper.java rename to src/main/java/com/senmesh/usercenter/notice/dao/NoticeContentTemplateMapper.java index d1e4da2..38f5b8d 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeContentTemplateMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeContentTemplateMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.notice.dao; +package com.senmesh.usercenter.notice.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateQueryDTO; -import com.newyetai.usercenter.notice.entity.NoticeContentTemplate; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateQueryDTO; +import com.senmesh.usercenter.notice.entity.NoticeContentTemplate; /** * 通知消息体模版 diff --git a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeReceiverSettingMapper.java b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeReceiverSettingMapper.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/notice/dao/NoticeReceiverSettingMapper.java rename to src/main/java/com/senmesh/usercenter/notice/dao/NoticeReceiverSettingMapper.java index 2380d6a..651c1e3 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeReceiverSettingMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeReceiverSettingMapper.java @@ -1,18 +1,18 @@ -package com.newyetai.usercenter.notice.dao; +package com.senmesh.usercenter.notice.dao; import java.util.List; import java.util.Set; import org.apache.ibatis.annotations.Param; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRoleDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingUserDTO; -import com.newyetai.usercenter.notice.entity.NoticeReceiverSetting; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRoleDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingUserDTO; +import com.senmesh.usercenter.notice.entity.NoticeReceiverSetting; /** * 通知接收人设置 diff --git a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeSendRecordDetailMapper.java b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeSendRecordDetailMapper.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/notice/dao/NoticeSendRecordDetailMapper.java rename to src/main/java/com/senmesh/usercenter/notice/dao/NoticeSendRecordDetailMapper.java index 7f3742f..c1c702e 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeSendRecordDetailMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeSendRecordDetailMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.dao; +package com.senmesh.usercenter.notice.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailReqDTO; -import com.newyetai.usercenter.notice.dto.RecordDetailUpdateStatusDTO; -import com.newyetai.usercenter.notice.entity.NoticeSendRecordDetail; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailReqDTO; +import com.senmesh.usercenter.notice.dto.RecordDetailUpdateStatusDTO; +import com.senmesh.usercenter.notice.entity.NoticeSendRecordDetail; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeSendRecordMapper.java b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeSendRecordMapper.java similarity index 65% rename from src/main/java/com/newyetai/usercenter/notice/dao/NoticeSendRecordMapper.java rename to src/main/java/com/senmesh/usercenter/notice/dao/NoticeSendRecordMapper.java index 0ef7580..4e9a6d9 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeSendRecordMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeSendRecordMapper.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.notice.dao; +package com.senmesh.usercenter.notice.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordModifyDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordQueryDTO; -import com.newyetai.usercenter.notice.entity.NoticeSendRecord; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordModifyDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordQueryDTO; +import com.senmesh.usercenter.notice.entity.NoticeSendRecord; /** * 通知发送记录(内容模版级) diff --git a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeTemplateMapper.java b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeTemplateMapper.java similarity index 60% rename from src/main/java/com/newyetai/usercenter/notice/dao/NoticeTemplateMapper.java rename to src/main/java/com/senmesh/usercenter/notice/dao/NoticeTemplateMapper.java index cd4d746..c6a35a0 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dao/NoticeTemplateMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/dao/NoticeTemplateMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.notice.dao; +package com.senmesh.usercenter.notice.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.notice.dto.NoticeTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateQueryDTO; -import com.newyetai.usercenter.notice.entity.NoticeTemplate; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.notice.dto.NoticeTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateQueryDTO; +import com.senmesh.usercenter.notice.entity.NoticeTemplate; /** * 通知模版 diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateDTO.java index c90f080..34b8378 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateDTO.java @@ -1,13 +1,12 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateOperateDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateOperateDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateOperateDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateOperateDTO.java index 744febd..b3b828f 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateOperateDTO.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateQueryDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateQueryDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateQueryDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateQueryDTO.java index 880301a..43ca23e 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeContentTemplateQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeContentTemplateQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingDTO.java index 3e0149c..71851b8 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingDTO.java @@ -1,13 +1,12 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingOperateDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingOperateDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingOperateDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingOperateDTO.java index bc111be..5b4e733 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingOperateDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; import java.util.Set; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingQueryDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingQueryDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingQueryDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingQueryDTO.java index 2491b59..5818b32 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; @@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * PageQueryDTO 范型 NoticeReceiverSettingDTO或其子类 diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingRemoveDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingRemoveDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingRemoveDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingRemoveDTO.java index 741a417..c839105 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingRemoveDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingRemoveDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; import java.util.Set; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingRoleDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingRoleDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingRoleDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingRoleDTO.java index 5a03daa..bbca841 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingRoleDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingRoleDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingUserDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingUserDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingUserDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingUserDTO.java index d86886d..31b0beb 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeReceiverSettingUserDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeReceiverSettingUserDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDTO.java index 8b02b43..2dd83b0 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; import java.util.Collections; @@ -7,13 +7,12 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.util.JsonUtils; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.util.JsonUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailDTO.java index cb1ae16..9548d98 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailDTO.java @@ -1,13 +1,12 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailOperateDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailOperateDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailOperateDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailOperateDTO.java index 80a58cb..96cf653 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailOperateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailQueryDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailQueryDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailQueryDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailQueryDTO.java index 63306cf..2813a72 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailReqDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailReqDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailReqDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailReqDTO.java index d03aba0..53244cd 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordDetailReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordDetailReqDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.util.UserContextHolder; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordModifyDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordModifyDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordModifyDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordModifyDTO.java index 3093944..8809f49 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordModifyDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordModifyDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordOperateDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordOperateDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordOperateDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordOperateDTO.java index 1218c82..5f6c3d0 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordOperateDTO.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; -import com.newyetai.usercenter.notice.constant.NoticeChannelTypeEnum; +import com.senmesh.usercenter.notice.constant.NoticeChannelTypeEnum; import java.io.Serializable; import java.util.Map; import java.util.Set; import com.google.common.collect.Maps; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordQueryDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordQueryDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordQueryDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordQueryDTO.java index d3eee68..a2f5623 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeSendRecordQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeSendRecordQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateDTO.java index 25181d6..6ed6498 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateDTO.java @@ -1,13 +1,12 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateOperateDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateOperateDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateOperateDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateOperateDTO.java index 80b78b6..b028a06 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateOperateDTO.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateQueryDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateQueryDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateQueryDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateQueryDTO.java index d3758f4..4d61bb2 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/NoticeTemplateQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/NoticeTemplateQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/notice/dto/RecordDetailUpdateStatusDTO.java b/src/main/java/com/senmesh/usercenter/notice/dto/RecordDetailUpdateStatusDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/notice/dto/RecordDetailUpdateStatusDTO.java rename to src/main/java/com/senmesh/usercenter/notice/dto/RecordDetailUpdateStatusDTO.java index 598ae1a..1009c59 100644 --- a/src/main/java/com/newyetai/usercenter/notice/dto/RecordDetailUpdateStatusDTO.java +++ b/src/main/java/com/senmesh/usercenter/notice/dto/RecordDetailUpdateStatusDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.dto; +package com.senmesh.usercenter.notice.dto; import java.io.Serializable; import java.util.Set; import javax.validation.constraints.NotEmpty; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeContentTemplate.java b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeContentTemplate.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/notice/entity/NoticeContentTemplate.java rename to src/main/java/com/senmesh/usercenter/notice/entity/NoticeContentTemplate.java index 035715f..d017d05 100644 --- a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeContentTemplate.java +++ b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeContentTemplate.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.entity; +package com.senmesh.usercenter.notice.entity; import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.usercenter.notice.constant.NoticeChannelTypeEnum; +import com.senmesh.common.entity.BaseEntity; +import com.senmesh.usercenter.notice.constant.NoticeChannelTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeReceiverSetting.java b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeReceiverSetting.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/notice/entity/NoticeReceiverSetting.java rename to src/main/java/com/senmesh/usercenter/notice/entity/NoticeReceiverSetting.java index d9bf7f2..fdd031c 100644 --- a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeReceiverSetting.java +++ b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeReceiverSetting.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.notice.entity; +package com.senmesh.usercenter.notice.entity; import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeSendRecord.java b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeSendRecord.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/notice/entity/NoticeSendRecord.java rename to src/main/java/com/senmesh/usercenter/notice/entity/NoticeSendRecord.java index 194d711..bee8df6 100644 --- a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeSendRecord.java +++ b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeSendRecord.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.entity; +package com.senmesh.usercenter.notice.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.usercenter.notice.constant.NoticeChannelTypeEnum; -import com.newyetai.usercenter.notice.constant.NoticeSendStatusEnum; +import com.senmesh.common.entity.BaseEntity; +import com.senmesh.usercenter.notice.constant.NoticeChannelTypeEnum; +import com.senmesh.usercenter.notice.constant.NoticeSendStatusEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeSendRecordDetail.java b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeSendRecordDetail.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/notice/entity/NoticeSendRecordDetail.java rename to src/main/java/com/senmesh/usercenter/notice/entity/NoticeSendRecordDetail.java index 780193a..38be7af 100644 --- a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeSendRecordDetail.java +++ b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeSendRecordDetail.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.notice.entity; +package com.senmesh.usercenter.notice.entity; import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeTemplate.java b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeTemplate.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/notice/entity/NoticeTemplate.java rename to src/main/java/com/senmesh/usercenter/notice/entity/NoticeTemplate.java index fce62d4..f8fe75c 100644 --- a/src/main/java/com/newyetai/usercenter/notice/entity/NoticeTemplate.java +++ b/src/main/java/com/senmesh/usercenter/notice/entity/NoticeTemplate.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.notice.entity; +package com.senmesh.usercenter.notice.entity; import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeContentTemplateMapper.xml b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeContentTemplateMapper.xml similarity index 81% rename from src/main/java/com/newyetai/usercenter/notice/mapper/NoticeContentTemplateMapper.xml rename to src/main/java/com/senmesh/usercenter/notice/mapper/NoticeContentTemplateMapper.xml index fb5dbdc..bef3c1d 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeContentTemplateMapper.xml +++ b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeContentTemplateMapper.xml @@ -2,8 +2,8 @@ - - select * from notice_content_template diff --git a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeReceiverSettingMapper.xml b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeReceiverSettingMapper.xml similarity index 91% rename from src/main/java/com/newyetai/usercenter/notice/mapper/NoticeReceiverSettingMapper.xml rename to src/main/java/com/senmesh/usercenter/notice/mapper/NoticeReceiverSettingMapper.xml index 9ad9397..cf58527 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeReceiverSettingMapper.xml +++ b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeReceiverSettingMapper.xml @@ -2,8 +2,8 @@ - - ( SELECT s.*, @@ -171,7 +171,7 @@ - select s.*, u.username, @@ -187,7 +187,7 @@ and s.receiver_union_type = 1 - select s.*, r.name roleName, diff --git a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeSendRecordDetailMapper.xml b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeSendRecordDetailMapper.xml similarity index 91% rename from src/main/java/com/newyetai/usercenter/notice/mapper/NoticeSendRecordDetailMapper.xml rename to src/main/java/com/senmesh/usercenter/notice/mapper/NoticeSendRecordDetailMapper.xml index 339a3ee..580e3ac 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeSendRecordDetailMapper.xml +++ b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeSendRecordDetailMapper.xml @@ -2,8 +2,8 @@ - - select rd.*, t.template_code, @@ -87,7 +87,7 @@ - + insert into notice_send_record_detail ( record_id, diff --git a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeSendRecordMapper.xml b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeSendRecordMapper.xml similarity index 90% rename from src/main/java/com/newyetai/usercenter/notice/mapper/NoticeSendRecordMapper.xml rename to src/main/java/com/senmesh/usercenter/notice/mapper/NoticeSendRecordMapper.xml index b5fabb8..e843ddb 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeSendRecordMapper.xml +++ b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeSendRecordMapper.xml @@ -2,8 +2,8 @@ - - select r.* from notice_send_record r diff --git a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeTemplateMapper.xml b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeTemplateMapper.xml similarity index 88% rename from src/main/java/com/newyetai/usercenter/notice/mapper/NoticeTemplateMapper.xml rename to src/main/java/com/senmesh/usercenter/notice/mapper/NoticeTemplateMapper.xml index 3877a5c..b8f1fa3 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapper/NoticeTemplateMapper.xml +++ b/src/main/java/com/senmesh/usercenter/notice/mapper/NoticeTemplateMapper.xml @@ -2,8 +2,8 @@ - - select * from notice_template diff --git a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeContentTemplateMapMapper.java b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeContentTemplateMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeContentTemplateMapMapper.java rename to src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeContentTemplateMapMapper.java index 190342b..70b2d90 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeContentTemplateMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeContentTemplateMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.mapstruct; +package com.senmesh.usercenter.notice.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateDTO; -import com.newyetai.usercenter.notice.entity.NoticeContentTemplate; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateDTO; +import com.senmesh.usercenter.notice.entity.NoticeContentTemplate; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateOperateDTO; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeReceiverSettingMapMapper.java b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeReceiverSettingMapMapper.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeReceiverSettingMapMapper.java rename to src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeReceiverSettingMapMapper.java index 68a217c..faa4388 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeReceiverSettingMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeReceiverSettingMapMapper.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.notice.mapstruct; +package com.senmesh.usercenter.notice.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingDTO; -import com.newyetai.usercenter.notice.entity.NoticeReceiverSetting; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingDTO; +import com.senmesh.usercenter.notice.entity.NoticeReceiverSetting; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeSendRecordDetailMapMapper.java b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeSendRecordDetailMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeSendRecordDetailMapMapper.java rename to src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeSendRecordDetailMapMapper.java index e9cf0f4..0ec65f4 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeSendRecordDetailMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeSendRecordDetailMapMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.notice.mapstruct; +package com.senmesh.usercenter.notice.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailDTO; -import com.newyetai.usercenter.notice.entity.NoticeSendRecordDetail; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailDTO; +import com.senmesh.usercenter.notice.entity.NoticeSendRecordDetail; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeSendRecordMapMapper.java b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeSendRecordMapMapper.java similarity index 66% rename from src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeSendRecordMapMapper.java rename to src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeSendRecordMapMapper.java index 34f209a..6bdccaf 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeSendRecordMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeSendRecordMapMapper.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.notice.mapstruct; +package com.senmesh.usercenter.notice.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordOperateDTO; -import com.newyetai.usercenter.notice.entity.NoticeSendRecord; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordOperateDTO; +import com.senmesh.usercenter.notice.entity.NoticeSendRecord; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeTemplateMapMapper.java b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeTemplateMapMapper.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeTemplateMapMapper.java rename to src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeTemplateMapMapper.java index 2c969c5..442cf8e 100644 --- a/src/main/java/com/newyetai/usercenter/notice/mapstruct/NoticeTemplateMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/notice/mapstruct/NoticeTemplateMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.notice.mapstruct; +package com.senmesh.usercenter.notice.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.notice.dto.NoticeTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateOperateDTO; -import com.newyetai.usercenter.notice.entity.NoticeTemplate; +import com.senmesh.usercenter.notice.dto.NoticeTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateOperateDTO; +import com.senmesh.usercenter.notice.entity.NoticeTemplate; /** * @author sr on 2020-12-17 diff --git a/src/main/java/com/newyetai/usercenter/notice/service/INoticeChannelProvider.java b/src/main/java/com/senmesh/usercenter/notice/service/INoticeChannelProvider.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/notice/service/INoticeChannelProvider.java rename to src/main/java/com/senmesh/usercenter/notice/service/INoticeChannelProvider.java index d99717a..aa472f0 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/INoticeChannelProvider.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/INoticeChannelProvider.java @@ -1,20 +1,20 @@ -package com.newyetai.usercenter.notice.service; +package com.senmesh.usercenter.notice.service; import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.freemarker.util.FreeMarkerTemplateUtils; -import com.newyetai.mq.consumer.handler.ITopicMqHandler; -import com.newyetai.mq.dto.TopicMqMessage; -import com.newyetai.mq.util.MqSendUtils; -import com.newyetai.security.util.MockUtils; -import com.newyetai.usercenter.notice.constant.NoticeChannelTypeEnum; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; -import com.newyetai.usercenter.notice.util.NoticeSendRecordUtils; -import com.newyetai.usercenter.userprod.constant.UcMqSelfConstants; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.freemarker.util.FreeMarkerTemplateUtils; +import com.senmesh.mq.consumer.handler.ITopicMqHandler; +import com.senmesh.mq.dto.TopicMqMessage; +import com.senmesh.mq.util.MqSendUtils; +import com.senmesh.security.util.MockUtils; +import com.senmesh.usercenter.notice.constant.NoticeChannelTypeEnum; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.util.NoticeSendRecordUtils; +import com.senmesh.usercenter.userprod.constant.UcMqSelfConstants; public interface INoticeChannelProvider extends ITopicMqHandler{ diff --git a/src/main/java/com/newyetai/usercenter/notice/service/NoticeContentTemplateService.java b/src/main/java/com/senmesh/usercenter/notice/service/NoticeContentTemplateService.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/notice/service/NoticeContentTemplateService.java rename to src/main/java/com/senmesh/usercenter/notice/service/NoticeContentTemplateService.java index 62f8e24..414ab3e 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/NoticeContentTemplateService.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/NoticeContentTemplateService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.notice.service; +package com.senmesh.usercenter.notice.service; import java.util.List; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateDTO; /** * 通知消息体模版 diff --git a/src/main/java/com/newyetai/usercenter/notice/service/NoticeReceiverSettingService.java b/src/main/java/com/senmesh/usercenter/notice/service/NoticeReceiverSettingService.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/notice/service/NoticeReceiverSettingService.java rename to src/main/java/com/senmesh/usercenter/notice/service/NoticeReceiverSettingService.java index 1d128ac..e622ae3 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/NoticeReceiverSettingService.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/NoticeReceiverSettingService.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.notice.service; +package com.senmesh.usercenter.notice.service; import java.util.List; import java.util.Set; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRoleDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingUserDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRoleDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingUserDTO; /** * 通知接收人设置 diff --git a/src/main/java/com/newyetai/usercenter/notice/service/NoticeSendRecordDetailService.java b/src/main/java/com/senmesh/usercenter/notice/service/NoticeSendRecordDetailService.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/notice/service/NoticeSendRecordDetailService.java rename to src/main/java/com/senmesh/usercenter/notice/service/NoticeSendRecordDetailService.java index 6eb2561..28662f5 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/NoticeSendRecordDetailService.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/NoticeSendRecordDetailService.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.notice.service; +package com.senmesh.usercenter.notice.service; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailReqDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailReqDTO; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/notice/service/NoticeSendRecordService.java b/src/main/java/com/senmesh/usercenter/notice/service/NoticeSendRecordService.java similarity index 68% rename from src/main/java/com/newyetai/usercenter/notice/service/NoticeSendRecordService.java rename to src/main/java/com/senmesh/usercenter/notice/service/NoticeSendRecordService.java index 3e99d77..5283d06 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/NoticeSendRecordService.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/NoticeSendRecordService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.notice.service; +package com.senmesh.usercenter.notice.service; import java.util.List; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; /** * 通知发送记录(内容模版级) diff --git a/src/main/java/com/newyetai/usercenter/notice/service/NoticeTemplateService.java b/src/main/java/com/senmesh/usercenter/notice/service/NoticeTemplateService.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/notice/service/NoticeTemplateService.java rename to src/main/java/com/senmesh/usercenter/notice/service/NoticeTemplateService.java index e98e57d..b4cc790 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/NoticeTemplateService.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/NoticeTemplateService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.notice.service; +package com.senmesh.usercenter.notice.service; import java.util.List; -import com.newyetai.usercenter.notice.dto.NoticeTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateQueryDTO; /** * 通知模版 diff --git a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeContentTemplateServiceImpl.java b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeContentTemplateServiceImpl.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeContentTemplateServiceImpl.java rename to src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeContentTemplateServiceImpl.java index 26adfd7..317d699 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeContentTemplateServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeContentTemplateServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.service.impl; +package com.senmesh.usercenter.notice.service.impl; import java.util.List; @@ -7,17 +7,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.notice.constant.NoticeChannelTypeEnum; -import com.newyetai.usercenter.notice.dao.NoticeContentTemplateMapper; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateQueryDTO; -import com.newyetai.usercenter.notice.entity.NoticeContentTemplate; -import com.newyetai.usercenter.notice.mapstruct.NoticeContentTemplateMapMapper; -import com.newyetai.usercenter.notice.service.NoticeContentTemplateService; -import com.newyetai.usercenter.notice.service.NoticeTemplateService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.notice.constant.NoticeChannelTypeEnum; +import com.senmesh.usercenter.notice.dao.NoticeContentTemplateMapper; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateQueryDTO; +import com.senmesh.usercenter.notice.entity.NoticeContentTemplate; +import com.senmesh.usercenter.notice.mapstruct.NoticeContentTemplateMapMapper; +import com.senmesh.usercenter.notice.service.NoticeContentTemplateService; +import com.senmesh.usercenter.notice.service.NoticeTemplateService; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeReceiverSettingServiceImpl.java b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeReceiverSettingServiceImpl.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeReceiverSettingServiceImpl.java rename to src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeReceiverSettingServiceImpl.java index 50cc348..9b0a83d 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeReceiverSettingServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeReceiverSettingServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.service.impl; +package com.senmesh.usercenter.notice.service.impl; import java.util.HashMap; import java.util.List; @@ -11,24 +11,24 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Sets; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.notice.constant.NoticeLevelEnum; -import com.newyetai.usercenter.notice.constant.NoticeReceiverTypeEnum; -import com.newyetai.usercenter.notice.dao.NoticeReceiverSettingMapper; -import com.newyetai.usercenter.notice.dao.NoticeTemplateMapper; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingRoleDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingUserDTO; -import com.newyetai.usercenter.notice.entity.NoticeReceiverSetting; -import com.newyetai.usercenter.notice.entity.NoticeTemplate; -import com.newyetai.usercenter.notice.mapstruct.NoticeReceiverSettingMapMapper; -import com.newyetai.usercenter.notice.service.NoticeReceiverSettingService; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.notice.constant.NoticeLevelEnum; +import com.senmesh.usercenter.notice.constant.NoticeReceiverTypeEnum; +import com.senmesh.usercenter.notice.dao.NoticeReceiverSettingMapper; +import com.senmesh.usercenter.notice.dao.NoticeTemplateMapper; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRemoveDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingRoleDTO; +import com.senmesh.usercenter.notice.dto.NoticeReceiverSettingUserDTO; +import com.senmesh.usercenter.notice.entity.NoticeReceiverSetting; +import com.senmesh.usercenter.notice.entity.NoticeTemplate; +import com.senmesh.usercenter.notice.mapstruct.NoticeReceiverSettingMapMapper; +import com.senmesh.usercenter.notice.service.NoticeReceiverSettingService; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordDetailServiceImpl.java b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeSendRecordDetailServiceImpl.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordDetailServiceImpl.java rename to src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeSendRecordDetailServiceImpl.java index 2e4ccd3..5036004 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordDetailServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeSendRecordDetailServiceImpl.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.notice.service.impl; +package com.senmesh.usercenter.notice.service.impl; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.notice.constant.NoticeChannelTypeEnum; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordDetailMapper; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailReqDTO; -import com.newyetai.usercenter.notice.service.NoticeSendRecordDetailService; -import com.newyetai.usercenter.notice.util.NoticeSendRecordDetailUtils; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.notice.constant.NoticeChannelTypeEnum; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordDetailMapper; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailReqDTO; +import com.senmesh.usercenter.notice.service.NoticeSendRecordDetailService; +import com.senmesh.usercenter.notice.util.NoticeSendRecordDetailUtils; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java rename to src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java index 9a8ed5c..5e96724 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java @@ -1,6 +1,5 @@ -package com.newyetai.usercenter.notice.service.impl; +package com.senmesh.usercenter.notice.service.impl; -import com.newyetai.common.util.DateUtils; import java.util.List; import java.util.Map; import java.util.Set; @@ -13,31 +12,31 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.BaseDtoUtils; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.notice.constant.NoticeLevelEnum; -import com.newyetai.usercenter.notice.constant.NoticeReceiverStatusEnum; -import com.newyetai.usercenter.notice.constant.NoticeSendStatusEnum; -import com.newyetai.usercenter.notice.dao.NoticeContentTemplateMapper; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordDetailMapper; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordMapper; -import com.newyetai.usercenter.notice.dao.NoticeTemplateMapper; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeContentTemplateQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateQueryDTO; -import com.newyetai.usercenter.notice.entity.NoticeSendRecord; -import com.newyetai.usercenter.notice.entity.NoticeSendRecordDetail; -import com.newyetai.usercenter.notice.mapstruct.NoticeSendRecordMapMapper; -import com.newyetai.usercenter.notice.service.INoticeChannelProvider; -import com.newyetai.usercenter.notice.service.NoticeReceiverSettingService; -import com.newyetai.usercenter.notice.service.NoticeSendRecordService; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.BaseDtoUtils; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.notice.constant.NoticeLevelEnum; +import com.senmesh.usercenter.notice.constant.NoticeReceiverStatusEnum; +import com.senmesh.usercenter.notice.constant.NoticeSendStatusEnum; +import com.senmesh.usercenter.notice.dao.NoticeContentTemplateMapper; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordDetailMapper; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordMapper; +import com.senmesh.usercenter.notice.dao.NoticeTemplateMapper; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeContentTemplateQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateQueryDTO; +import com.senmesh.usercenter.notice.entity.NoticeSendRecord; +import com.senmesh.usercenter.notice.entity.NoticeSendRecordDetail; +import com.senmesh.usercenter.notice.mapstruct.NoticeSendRecordMapMapper; +import com.senmesh.usercenter.notice.service.INoticeChannelProvider; +import com.senmesh.usercenter.notice.service.NoticeReceiverSettingService; +import com.senmesh.usercenter.notice.service.NoticeSendRecordService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeTemplateServiceImpl.java b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeTemplateServiceImpl.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeTemplateServiceImpl.java rename to src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeTemplateServiceImpl.java index 5cd97ab..2bb1aaa 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeTemplateServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/impl/NoticeTemplateServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.service.impl; +package com.senmesh.usercenter.notice.service.impl; import java.util.List; @@ -7,17 +7,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.notice.constant.NoticeLevelEnum; -import com.newyetai.usercenter.notice.dao.NoticeTemplateMapper; -import com.newyetai.usercenter.notice.dto.NoticeTemplateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateOperateDTO; -import com.newyetai.usercenter.notice.dto.NoticeTemplateQueryDTO; -import com.newyetai.usercenter.notice.entity.NoticeTemplate; -import com.newyetai.usercenter.notice.mapstruct.NoticeTemplateMapMapper; -import com.newyetai.usercenter.notice.service.NoticeTemplateService; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.notice.constant.NoticeLevelEnum; +import com.senmesh.usercenter.notice.dao.NoticeTemplateMapper; +import com.senmesh.usercenter.notice.dto.NoticeTemplateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateOperateDTO; +import com.senmesh.usercenter.notice.dto.NoticeTemplateQueryDTO; +import com.senmesh.usercenter.notice.entity.NoticeTemplate; +import com.senmesh.usercenter.notice.mapstruct.NoticeTemplateMapMapper; +import com.senmesh.usercenter.notice.service.NoticeTemplateService; /** * @author sr on 2020-12-17 diff --git a/src/main/java/com/newyetai/usercenter/notice/service/provider/AbstractNoticeChannelProvider.java b/src/main/java/com/senmesh/usercenter/notice/service/provider/AbstractNoticeChannelProvider.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/notice/service/provider/AbstractNoticeChannelProvider.java rename to src/main/java/com/senmesh/usercenter/notice/service/provider/AbstractNoticeChannelProvider.java index 4bf51e8..dbb5d59 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/provider/AbstractNoticeChannelProvider.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/provider/AbstractNoticeChannelProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.service.provider; +package com.senmesh.usercenter.notice.service.provider; import java.util.List; import java.util.Map; @@ -8,19 +8,19 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Sets; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.usercenter.notice.constant.NoticeReceiverStatusEnum; -import com.newyetai.usercenter.notice.constant.NoticeSendStatusEnum; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordDetailMapper; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordMapper; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordModifyDTO; -import com.newyetai.usercenter.notice.service.INoticeChannelProvider; -import com.newyetai.usercenter.notice.util.NoticeSendRecordDetailUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.usercenter.notice.constant.NoticeReceiverStatusEnum; +import com.senmesh.usercenter.notice.constant.NoticeSendStatusEnum; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordDetailMapper; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordMapper; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailQueryDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordModifyDTO; +import com.senmesh.usercenter.notice.service.INoticeChannelProvider; +import com.senmesh.usercenter.notice.util.NoticeSendRecordDetailUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/notice/service/provider/SiteNoticeChannelProvider.java b/src/main/java/com/senmesh/usercenter/notice/service/provider/SiteNoticeChannelProvider.java similarity index 55% rename from src/main/java/com/newyetai/usercenter/notice/service/provider/SiteNoticeChannelProvider.java rename to src/main/java/com/senmesh/usercenter/notice/service/provider/SiteNoticeChannelProvider.java index 7daa7f6..54b343d 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/provider/SiteNoticeChannelProvider.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/provider/SiteNoticeChannelProvider.java @@ -1,19 +1,16 @@ -package com.newyetai.usercenter.notice.service.provider; +package com.senmesh.usercenter.notice.service.provider; -import com.newyetai.component.notice.constant.NoticeFirstTypeEnum; -import com.newyetai.component.notice.dto.NoticeMsgDTO; -import com.newyetai.component.notice.util.NoticeUtils; -import org.springframework.beans.factory.annotation.Autowired; +import com.senmesh.component.notice.constant.NoticeFirstTypeEnum; +import com.senmesh.component.notice.dto.NoticeMsgDTO; +import com.senmesh.component.notice.util.NoticeUtils; import org.springframework.stereotype.Service; -import com.newyetai.common.AlitaResult; -import com.newyetai.mq.producer.sender.IMqSender; -import com.newyetai.mq.util.MqSendUtils; -import com.newyetai.usercenter.notice.constant.NoticeChannelTypeEnum; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordDetailMapper; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordMapper; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.notice.constant.NoticeChannelTypeEnum; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordDetailMapper; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordMapper; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailDTO; /** * 站内信 diff --git a/src/main/java/com/newyetai/usercenter/notice/service/provider/WechatOffiaccountNoticeChannelProvider.java b/src/main/java/com/senmesh/usercenter/notice/service/provider/WechatOffiaccountNoticeChannelProvider.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/notice/service/provider/WechatOffiaccountNoticeChannelProvider.java rename to src/main/java/com/senmesh/usercenter/notice/service/provider/WechatOffiaccountNoticeChannelProvider.java index 03adeb9..369a17b 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/provider/WechatOffiaccountNoticeChannelProvider.java +++ b/src/main/java/com/senmesh/usercenter/notice/service/provider/WechatOffiaccountNoticeChannelProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.notice.service.provider; +package com.senmesh.usercenter.notice.service.provider; import java.util.List; import java.util.Map; @@ -7,23 +7,23 @@ import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.sdk.wechat.WechatClient; -import com.newyetai.sdk.wechat.model.KeyData; -import com.newyetai.sdk.wechat.model.TemplateMessageReq; -import com.newyetai.sdk.wechat.util.MessageParamUtils; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailQueryDTO; -import com.newyetai.usercenter.auth.service.AuthDetailService; -import com.newyetai.usercenter.auth.util.AuthClientUtils; -import com.newyetai.usercenter.notice.constant.NoticeChannelTypeEnum; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordDetailMapper; -import com.newyetai.usercenter.notice.dao.NoticeSendRecordMapper; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDTO; -import com.newyetai.usercenter.notice.dto.NoticeSendRecordDetailDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.sdk.wechat.WechatClient; +import com.senmesh.sdk.wechat.model.KeyData; +import com.senmesh.sdk.wechat.model.TemplateMessageReq; +import com.senmesh.sdk.wechat.util.MessageParamUtils; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailQueryDTO; +import com.senmesh.usercenter.auth.service.AuthDetailService; +import com.senmesh.usercenter.auth.util.AuthClientUtils; +import com.senmesh.usercenter.notice.constant.NoticeChannelTypeEnum; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordDetailMapper; +import com.senmesh.usercenter.notice.dao.NoticeSendRecordMapper; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDTO; +import com.senmesh.usercenter.notice.dto.NoticeSendRecordDetailDTO; /** * 微信公众号模版消息发送 diff --git a/src/main/java/com/newyetai/usercenter/notice/util/NoticeSendRecordDetailUtils.java b/src/main/java/com/senmesh/usercenter/notice/util/NoticeSendRecordDetailUtils.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/notice/util/NoticeSendRecordDetailUtils.java rename to src/main/java/com/senmesh/usercenter/notice/util/NoticeSendRecordDetailUtils.java index a1910d8..3a16b53 100644 --- a/src/main/java/com/newyetai/usercenter/notice/util/NoticeSendRecordDetailUtils.java +++ b/src/main/java/com/senmesh/usercenter/notice/util/NoticeSendRecordDetailUtils.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.notice.util; +package com.senmesh.usercenter.notice.util; import java.util.Set; -import com.newyetai.usercenter.notice.constant.NoticeReceiverStatusEnum; -import com.newyetai.usercenter.notice.dto.RecordDetailUpdateStatusDTO; +import com.senmesh.usercenter.notice.constant.NoticeReceiverStatusEnum; +import com.senmesh.usercenter.notice.dto.RecordDetailUpdateStatusDTO; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/notice/util/NoticeSendRecordUtils.java b/src/main/java/com/senmesh/usercenter/notice/util/NoticeSendRecordUtils.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/notice/util/NoticeSendRecordUtils.java rename to src/main/java/com/senmesh/usercenter/notice/util/NoticeSendRecordUtils.java index bbee4a2..40e13b8 100644 --- a/src/main/java/com/newyetai/usercenter/notice/util/NoticeSendRecordUtils.java +++ b/src/main/java/com/senmesh/usercenter/notice/util/NoticeSendRecordUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.notice.util; +package com.senmesh.usercenter.notice.util; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.usercenter.userprod.constant.UcMqSelfConstants; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.usercenter.userprod.constant.UcMqSelfConstants; /** * @author sr on 2020-12-20 diff --git a/src/main/java/com/newyetai/usercenter/org/controller/OrgController.java b/src/main/java/com/senmesh/usercenter/org/controller/OrgController.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/org/controller/OrgController.java rename to src/main/java/com/senmesh/usercenter/org/controller/OrgController.java index 00d35b7..d41459c 100644 --- a/src/main/java/com/newyetai/usercenter/org/controller/OrgController.java +++ b/src/main/java/com/senmesh/usercenter/org/controller/OrgController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.controller; +package com.senmesh.usercenter.org.controller; import java.util.List; @@ -8,24 +8,23 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.enums.OrgTypeEnum; -import com.newyetai.usercenter.org.dto.OrgCreateDTO; -import com.newyetai.usercenter.org.dto.OrgDTO; -import com.newyetai.usercenter.org.dto.OrgModifyDTO; -import com.newyetai.usercenter.org.dto.OrgQueryDTO; -import com.newyetai.usercenter.org.dto.UcOpenOrgPartQueryDTO; -import com.newyetai.usercenter.org.dto.UcOrgInfoReqDTO; -import com.newyetai.usercenter.org.dto.UcOrgInfoResDTO; -import com.newyetai.usercenter.org.dto.UcOrgPartInfoDTO; -import com.newyetai.usercenter.org.dto.UcOrgPartQueryDTO; -import com.newyetai.usercenter.org.service.OrgService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.enums.OrgTypeEnum; +import com.senmesh.usercenter.org.dto.OrgCreateDTO; +import com.senmesh.usercenter.org.dto.OrgDTO; +import com.senmesh.usercenter.org.dto.OrgModifyDTO; +import com.senmesh.usercenter.org.dto.OrgQueryDTO; +import com.senmesh.usercenter.org.dto.UcOpenOrgPartQueryDTO; +import com.senmesh.usercenter.org.dto.UcOrgInfoReqDTO; +import com.senmesh.usercenter.org.dto.UcOrgInfoResDTO; +import com.senmesh.usercenter.org.dto.UcOrgPartInfoDTO; +import com.senmesh.usercenter.org.dto.UcOrgPartQueryDTO; +import com.senmesh.usercenter.org.service.OrgService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/org/controller/OrgRelationController.java b/src/main/java/com/senmesh/usercenter/org/controller/OrgRelationController.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/org/controller/OrgRelationController.java rename to src/main/java/com/senmesh/usercenter/org/controller/OrgRelationController.java index 8d68ee1..c44ee52 100644 --- a/src/main/java/com/newyetai/usercenter/org/controller/OrgRelationController.java +++ b/src/main/java/com/senmesh/usercenter/org/controller/OrgRelationController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.controller; +package com.senmesh.usercenter.org.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -9,15 +9,15 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.org.dto.OrgRelationCreateDTO; -import com.newyetai.usercenter.org.dto.OrgRelationDTO; -import com.newyetai.usercenter.org.dto.OrgRelationModifyDTO; -import com.newyetai.usercenter.org.dto.OrgRelationQueryDTO; -import com.newyetai.usercenter.org.dto.OrgRelationQueryOrgDTO; -import com.newyetai.usercenter.org.dto.SelectOrgDTO; -import com.newyetai.usercenter.org.service.OrgRelationService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.org.dto.OrgRelationCreateDTO; +import com.senmesh.usercenter.org.dto.OrgRelationDTO; +import com.senmesh.usercenter.org.dto.OrgRelationModifyDTO; +import com.senmesh.usercenter.org.dto.OrgRelationQueryDTO; +import com.senmesh.usercenter.org.dto.OrgRelationQueryOrgDTO; +import com.senmesh.usercenter.org.dto.SelectOrgDTO; +import com.senmesh.usercenter.org.service.OrgRelationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/org/dao/ImportDetailOrgMapper.java b/src/main/java/com/senmesh/usercenter/org/dao/ImportDetailOrgMapper.java similarity index 57% rename from src/main/java/com/newyetai/usercenter/org/dao/ImportDetailOrgMapper.java rename to src/main/java/com/senmesh/usercenter/org/dao/ImportDetailOrgMapper.java index 25f77bb..d820947 100644 --- a/src/main/java/com/newyetai/usercenter/org/dao/ImportDetailOrgMapper.java +++ b/src/main/java/com/senmesh/usercenter/org/dao/ImportDetailOrgMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.org.dao; +package com.senmesh.usercenter.org.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.org.entity.ImportDetailOrg; -import com.newyetai.usercenter.org.dto.ImportDetailOrgDTO; -import com.newyetai.usercenter.org.dto.ImportDetailOrgQueryDTO; -import com.newyetai.usercenter.org.dto.ImportDetailOrgPageQueryDTO; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.org.entity.ImportDetailOrg; +import com.senmesh.usercenter.org.dto.ImportDetailOrgDTO; +import com.senmesh.usercenter.org.dto.ImportDetailOrgQueryDTO; +import com.senmesh.usercenter.org.dto.ImportDetailOrgPageQueryDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/newyetai/usercenter/org/dao/OrgMapper.java b/src/main/java/com/senmesh/usercenter/org/dao/OrgMapper.java similarity index 63% rename from src/main/java/com/newyetai/usercenter/org/dao/OrgMapper.java rename to src/main/java/com/senmesh/usercenter/org/dao/OrgMapper.java index d65143d..d28da15 100644 --- a/src/main/java/com/newyetai/usercenter/org/dao/OrgMapper.java +++ b/src/main/java/com/senmesh/usercenter/org/dao/OrgMapper.java @@ -1,19 +1,19 @@ -package com.newyetai.usercenter.org.dao; +package com.senmesh.usercenter.org.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.org.dto.OrgDTO; -import com.newyetai.usercenter.org.dto.OrgModifyDTO; -import com.newyetai.usercenter.org.dto.OrgQueryDTO; -import com.newyetai.usercenter.org.dto.UcOpenOrgPartQueryDTO; -import com.newyetai.usercenter.org.dto.UcOrgInfoReqDTO; -import com.newyetai.usercenter.org.dto.UcOrgInfoResDTO; -import com.newyetai.usercenter.org.dto.UcOrgPartInfoDTO; -import com.newyetai.usercenter.org.dto.UcOrgPartQueryDTO; -import com.newyetai.usercenter.org.entity.Org; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.org.dto.OrgDTO; +import com.senmesh.usercenter.org.dto.OrgModifyDTO; +import com.senmesh.usercenter.org.dto.OrgQueryDTO; +import com.senmesh.usercenter.org.dto.UcOpenOrgPartQueryDTO; +import com.senmesh.usercenter.org.dto.UcOrgInfoReqDTO; +import com.senmesh.usercenter.org.dto.UcOrgInfoResDTO; +import com.senmesh.usercenter.org.dto.UcOrgPartInfoDTO; +import com.senmesh.usercenter.org.dto.UcOrgPartQueryDTO; +import com.senmesh.usercenter.org.entity.Org; /** * 机构 diff --git a/src/main/java/com/newyetai/usercenter/org/dao/OrgRelationMapper.java b/src/main/java/com/senmesh/usercenter/org/dao/OrgRelationMapper.java similarity index 57% rename from src/main/java/com/newyetai/usercenter/org/dao/OrgRelationMapper.java rename to src/main/java/com/senmesh/usercenter/org/dao/OrgRelationMapper.java index 6bda02e..5ea4492 100644 --- a/src/main/java/com/newyetai/usercenter/org/dao/OrgRelationMapper.java +++ b/src/main/java/com/senmesh/usercenter/org/dao/OrgRelationMapper.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.org.dao; +package com.senmesh.usercenter.org.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.org.dto.OrgRelationDTO; -import com.newyetai.usercenter.org.dto.OrgRelationQueryDTO; -import com.newyetai.usercenter.org.dto.OrgRelationQueryOrgDTO; -import com.newyetai.usercenter.org.dto.SelectOrgDTO; -import com.newyetai.usercenter.org.entity.OrgRelation; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.org.dto.OrgRelationDTO; +import com.senmesh.usercenter.org.dto.OrgRelationQueryDTO; +import com.senmesh.usercenter.org.dto.OrgRelationQueryOrgDTO; +import com.senmesh.usercenter.org.dto.SelectOrgDTO; +import com.senmesh.usercenter.org.entity.OrgRelation; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 机构关系表 diff --git a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgDTO.java index 20ee006..5966734 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgDTO.java @@ -1,7 +1,6 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.component.commonimport.dto.ImportDetailSuperDTO; +import com.senmesh.component.commonimport.dto.ImportDetailSuperDTO; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModel; @@ -9,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.SuperBuilder; -import java.util.Date; - /** * 机构导入表 * diff --git a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgExecuteDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgExecuteDTO.java similarity index 63% rename from src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgExecuteDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgExecuteDTO.java index f6a3aca..7875b83 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgExecuteDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgExecuteDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; -import com.newyetai.component.commonimport.dto.ImportExecuteSuperDTO; +import com.senmesh.component.commonimport.dto.ImportExecuteSuperDTO; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgExportDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgExportDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgExportDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgExportDTO.java index 1631ea5..15a4875 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgExportDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgExportDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgListenerDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgListenerDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgListenerDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgListenerDTO.java index 169bb5c..5f934e0 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgListenerDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgListenerDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; -import com.newyetai.component.commonimport.service.IImportDetailForm; +import com.senmesh.component.commonimport.service.IImportDetailForm; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgOperatorDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgOperatorDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgOperatorDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgOperatorDTO.java index 1f7a93a..6ab63c6 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgOperatorDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgOperatorDTO.java @@ -1,12 +1,8 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; - -import org.springframework.format.annotation.DateTimeFormat; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,11 +10,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -import java.util.Date; - /** * 机构导入表 * diff --git a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgPageQueryDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgPageQueryDTO.java index dd886e2..d687d0d 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgPageQueryDTO.java @@ -1,13 +1,11 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgQueryDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgQueryDTO.java similarity index 97% rename from src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgQueryDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgQueryDTO.java index 1f2b125..28e6fb3 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/ImportDetailOrgQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/ImportDetailOrgQueryDTO.java @@ -1,6 +1,4 @@ -package com.newyetai.usercenter.org.dto; - -import com.newyetai.common.dto.BaseDTO; +package com.senmesh.usercenter.org.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgCreateDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgCreateDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgCreateDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgCreateDTO.java index a03ccea..5b67296 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgCreateDTO.java @@ -1,18 +1,12 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import org.junit.jupiter.params.shadow.com.univocity.parsers.annotations.Trim; - -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.annotation.Phone; -import com.newyetai.common.validation.constants.ValidProviderEnum; -import com.newyetai.usercenter.enums.OrgTypeEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgDTO.java index 6ac403d..d0601ab 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import com.google.common.collect.Lists; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.util.TreeNode; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.util.TreeNode; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgModifyDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgModifyDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgModifyDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgModifyDTO.java index 2bfc07c..ce112fa 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgModifyDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgModifyDTO.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import lombok.Data; /** diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgQueryDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgQueryDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgQueryDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgQueryDTO.java index 5a58ee7..067379e 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgQueryDTO.java @@ -1,17 +1,15 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import java.util.Date; import java.util.Set; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import org.springframework.format.annotation.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationCreateDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationCreateDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgRelationCreateDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgRelationCreateDTO.java index 408ac8f..3fbd959 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationCreateDTO.java @@ -1,16 +1,15 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import java.io.Serializable; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Builder.Default; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgRelationDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgRelationDTO.java index c48454e..47859e4 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.notice.dto.NoticeReceiverSettingDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationModifyDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationModifyDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgRelationModifyDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgRelationModifyDTO.java index dbd22e8..9de1478 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationModifyDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationModifyDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationQueryDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgRelationQueryDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgRelationQueryDTO.java index 5272b6e..bb3233a 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import java.io.Serializable; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationQueryOrgDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationQueryOrgDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/org/dto/OrgRelationQueryOrgDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/OrgRelationQueryOrgDTO.java index b0aab15..20278c5 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/OrgRelationQueryOrgDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/OrgRelationQueryOrgDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import java.io.Serializable; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/SelectOrgDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/SelectOrgDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/org/dto/SelectOrgDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/SelectOrgDTO.java index 3c038ae..f25239a 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/SelectOrgDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/SelectOrgDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/UcOpenOrgPartQueryDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/UcOpenOrgPartQueryDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/org/dto/UcOpenOrgPartQueryDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/UcOpenOrgPartQueryDTO.java index 3d7dd18..659ceac 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/UcOpenOrgPartQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/UcOpenOrgPartQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/UcOrgInfoReqDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/UcOrgInfoReqDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/org/dto/UcOrgInfoReqDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/UcOrgInfoReqDTO.java index f98d928..862f7a5 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/UcOrgInfoReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/UcOrgInfoReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/UcOrgInfoResDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/UcOrgInfoResDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/org/dto/UcOrgInfoResDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/UcOrgInfoResDTO.java index 52fee0d..5515265 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/UcOrgInfoResDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/UcOrgInfoResDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/org/dto/UcOrgPartInfoDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/UcOrgPartInfoDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/org/dto/UcOrgPartInfoDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/UcOrgPartInfoDTO.java index c803a0f..da729ad 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/UcOrgPartInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/UcOrgPartInfoDTO.java @@ -1,9 +1,7 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.commons.lang3.StringUtils; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -12,7 +10,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Arrays; import java.util.List; @Data diff --git a/src/main/java/com/newyetai/usercenter/org/dto/UcOrgPartQueryDTO.java b/src/main/java/com/senmesh/usercenter/org/dto/UcOrgPartQueryDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/org/dto/UcOrgPartQueryDTO.java rename to src/main/java/com/senmesh/usercenter/org/dto/UcOrgPartQueryDTO.java index 9e9e2e1..a237dc4 100644 --- a/src/main/java/com/newyetai/usercenter/org/dto/UcOrgPartQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/org/dto/UcOrgPartQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.org.dto; +package com.senmesh.usercenter.org.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/org/entity/ImportDetailOrg.java b/src/main/java/com/senmesh/usercenter/org/entity/ImportDetailOrg.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/org/entity/ImportDetailOrg.java rename to src/main/java/com/senmesh/usercenter/org/entity/ImportDetailOrg.java index 552bcec..efc2736 100644 --- a/src/main/java/com/newyetai/usercenter/org/entity/ImportDetailOrg.java +++ b/src/main/java/com/senmesh/usercenter/org/entity/ImportDetailOrg.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.org.entity; +package com.senmesh.usercenter.org.entity; import io.swagger.annotations.ApiModelProperty; import lombok.*; import com.baomidou.mybatisplus.annotation.*; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; /** * 机构导入表 diff --git a/src/main/java/com/newyetai/usercenter/org/entity/Org.java b/src/main/java/com/senmesh/usercenter/org/entity/Org.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/org/entity/Org.java rename to src/main/java/com/senmesh/usercenter/org/entity/Org.java index 7ea8b4e..21c362b 100644 --- a/src/main/java/com/newyetai/usercenter/org/entity/Org.java +++ b/src/main/java/com/senmesh/usercenter/org/entity/Org.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.org.entity; +package com.senmesh.usercenter.org.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/com/newyetai/usercenter/org/entity/OrgRelation.java b/src/main/java/com/senmesh/usercenter/org/entity/OrgRelation.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/org/entity/OrgRelation.java rename to src/main/java/com/senmesh/usercenter/org/entity/OrgRelation.java index 1313047..fd98440 100644 --- a/src/main/java/com/newyetai/usercenter/org/entity/OrgRelation.java +++ b/src/main/java/com/senmesh/usercenter/org/entity/OrgRelation.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.org.entity; +package com.senmesh.usercenter.org.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/org/enums/RecruitPositionTypeEnum.java b/src/main/java/com/senmesh/usercenter/org/enums/RecruitPositionTypeEnum.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/org/enums/RecruitPositionTypeEnum.java rename to src/main/java/com/senmesh/usercenter/org/enums/RecruitPositionTypeEnum.java index 9cafee3..45b604e 100644 --- a/src/main/java/com/newyetai/usercenter/org/enums/RecruitPositionTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/org/enums/RecruitPositionTypeEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.enums; +package com.senmesh.usercenter.org.enums; public enum RecruitPositionTypeEnum { ODD_JOB("1", "零工"), diff --git a/src/main/java/com/newyetai/usercenter/org/mapper/ImportDetailOrgMapper.xml b/src/main/java/com/senmesh/usercenter/org/mapper/ImportDetailOrgMapper.xml similarity index 93% rename from src/main/java/com/newyetai/usercenter/org/mapper/ImportDetailOrgMapper.xml rename to src/main/java/com/senmesh/usercenter/org/mapper/ImportDetailOrgMapper.xml index fe5f605..f0ffc07 100644 --- a/src/main/java/com/newyetai/usercenter/org/mapper/ImportDetailOrgMapper.xml +++ b/src/main/java/com/senmesh/usercenter/org/mapper/ImportDetailOrgMapper.xml @@ -2,14 +2,14 @@ - + - SELECT t.* - SELECT t.* diff --git a/src/main/java/com/newyetai/usercenter/org/mapper/OrgMapper.xml b/src/main/java/com/senmesh/usercenter/org/mapper/OrgMapper.xml similarity index 91% rename from src/main/java/com/newyetai/usercenter/org/mapper/OrgMapper.xml rename to src/main/java/com/senmesh/usercenter/org/mapper/OrgMapper.xml index b12263c..1fe982f 100644 --- a/src/main/java/com/newyetai/usercenter/org/mapper/OrgMapper.xml +++ b/src/main/java/com/senmesh/usercenter/org/mapper/OrgMapper.xml @@ -1,6 +1,6 @@ - + update xs_org @@ -20,7 +20,7 @@ where id = #{param.id} and deleted = 0 - select o.id, o.org_name, o.org_code, @@ -102,7 +102,7 @@ - SELECT o.id orgId, o.org_code, o.description, @@ -121,7 +121,7 @@ AND o.deleted = 0 AND o.id = #{param.orgId} - SELECT o.id orgId,o.org_name FROM @@ -133,11 +133,11 @@ AND o.org_name like #{orgNameLike} - select id orgId from xs_org where deleted = 0 - SELECT o.id AS orgId, o.org_name as orgName, diff --git a/src/main/java/com/newyetai/usercenter/org/mapper/OrgRelationMapper.xml b/src/main/java/com/senmesh/usercenter/org/mapper/OrgRelationMapper.xml similarity index 84% rename from src/main/java/com/newyetai/usercenter/org/mapper/OrgRelationMapper.xml rename to src/main/java/com/senmesh/usercenter/org/mapper/OrgRelationMapper.xml index 2dc6e97..a04e720 100644 --- a/src/main/java/com/newyetai/usercenter/org/mapper/OrgRelationMapper.xml +++ b/src/main/java/com/senmesh/usercenter/org/mapper/OrgRelationMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_org_relation @@ -24,7 +24,7 @@ - select o.id org_id, o.org_name, uor.parent_id from uc_org_relation uor inner join xs_org o on o.id = uor.org_id diff --git a/src/main/java/com/newyetai/usercenter/org/mapstruct/ImportDetailOrgConvert.java b/src/main/java/com/senmesh/usercenter/org/mapstruct/ImportDetailOrgConvert.java similarity index 63% rename from src/main/java/com/newyetai/usercenter/org/mapstruct/ImportDetailOrgConvert.java rename to src/main/java/com/senmesh/usercenter/org/mapstruct/ImportDetailOrgConvert.java index e01dbd1..d0ea1f9 100644 --- a/src/main/java/com/newyetai/usercenter/org/mapstruct/ImportDetailOrgConvert.java +++ b/src/main/java/com/senmesh/usercenter/org/mapstruct/ImportDetailOrgConvert.java @@ -1,14 +1,12 @@ -package com.newyetai.usercenter.org.mapstruct; +package com.senmesh.usercenter.org.mapstruct; -import com.newyetai.usercenter.org.entity.ImportDetailOrg; -import com.newyetai.usercenter.org.dto.ImportDetailOrgDTO; -import com.newyetai.usercenter.org.dto.ImportDetailOrgOperatorDTO; +import com.senmesh.usercenter.org.entity.ImportDetailOrg; +import com.senmesh.usercenter.org.dto.ImportDetailOrgDTO; +import com.senmesh.usercenter.org.dto.ImportDetailOrgOperatorDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import java.util.List; - /** * 机构导入表 * diff --git a/src/main/java/com/newyetai/usercenter/org/mapstruct/OrgMapMapper.java b/src/main/java/com/senmesh/usercenter/org/mapstruct/OrgMapMapper.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/org/mapstruct/OrgMapMapper.java rename to src/main/java/com/senmesh/usercenter/org/mapstruct/OrgMapMapper.java index c6b511f..cba4054 100644 --- a/src/main/java/com/newyetai/usercenter/org/mapstruct/OrgMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/org/mapstruct/OrgMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.org.mapstruct; +package com.senmesh.usercenter.org.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.org.dto.OrgCreateDTO; -import com.newyetai.usercenter.org.dto.OrgDTO; -import com.newyetai.usercenter.org.entity.Org; +import com.senmesh.usercenter.org.dto.OrgCreateDTO; +import com.senmesh.usercenter.org.dto.OrgDTO; +import com.senmesh.usercenter.org.entity.Org; /** * @author sr on 2024-04-18 diff --git a/src/main/java/com/newyetai/usercenter/org/mapstruct/OrgRelationMapMapper.java b/src/main/java/com/senmesh/usercenter/org/mapstruct/OrgRelationMapMapper.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/org/mapstruct/OrgRelationMapMapper.java rename to src/main/java/com/senmesh/usercenter/org/mapstruct/OrgRelationMapMapper.java index 2126276..3b44f26 100644 --- a/src/main/java/com/newyetai/usercenter/org/mapstruct/OrgRelationMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/org/mapstruct/OrgRelationMapMapper.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.org.mapstruct; +package com.senmesh.usercenter.org.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.org.dto.OrgRelationCreateDTO; -import com.newyetai.usercenter.org.dto.OrgRelationDTO; -import com.newyetai.usercenter.org.entity.OrgRelation; -import com.newyetai.usercenter.org.dto.OrgRelationModifyDTO; +import com.senmesh.usercenter.org.dto.OrgRelationCreateDTO; +import com.senmesh.usercenter.org.dto.OrgRelationDTO; +import com.senmesh.usercenter.org.entity.OrgRelation; +import com.senmesh.usercenter.org.dto.OrgRelationModifyDTO; /** * @author sr on 2022-05-25 diff --git a/src/main/java/com/newyetai/usercenter/org/service/ImportDetailOrgService.java b/src/main/java/com/senmesh/usercenter/org/service/ImportDetailOrgService.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/org/service/ImportDetailOrgService.java rename to src/main/java/com/senmesh/usercenter/org/service/ImportDetailOrgService.java index e178087..df14272 100644 --- a/src/main/java/com/newyetai/usercenter/org/service/ImportDetailOrgService.java +++ b/src/main/java/com/senmesh/usercenter/org/service/ImportDetailOrgService.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.service; +package com.senmesh.usercenter.org.service; import org.springframework.validation.annotation.Validated; @@ -7,7 +7,7 @@ import javax.validation.groups.Default; import java.util.List; -import com.newyetai.usercenter.org.dto.*; +import com.senmesh.usercenter.org.dto.*; /** * 机构导入表 diff --git a/src/main/java/com/newyetai/usercenter/org/service/OrgRelationService.java b/src/main/java/com/senmesh/usercenter/org/service/OrgRelationService.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/org/service/OrgRelationService.java rename to src/main/java/com/senmesh/usercenter/org/service/OrgRelationService.java index ac156f1..936df0e 100644 --- a/src/main/java/com/newyetai/usercenter/org/service/OrgRelationService.java +++ b/src/main/java/com/senmesh/usercenter/org/service/OrgRelationService.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.org.service; +package com.senmesh.usercenter.org.service; import java.util.List; import javax.validation.Valid; -import com.newyetai.usercenter.org.dto.OrgRelationQueryDTO; -import com.newyetai.usercenter.org.dto.OrgRelationQueryOrgDTO; -import com.newyetai.usercenter.org.dto.OrgRelationModifyDTO; -import com.newyetai.usercenter.org.dto.OrgRelationCreateDTO; -import com.newyetai.usercenter.org.dto.OrgRelationDTO; +import com.senmesh.usercenter.org.dto.OrgRelationQueryDTO; +import com.senmesh.usercenter.org.dto.OrgRelationQueryOrgDTO; +import com.senmesh.usercenter.org.dto.OrgRelationModifyDTO; +import com.senmesh.usercenter.org.dto.OrgRelationCreateDTO; +import com.senmesh.usercenter.org.dto.OrgRelationDTO; /** * 机构关系表 diff --git a/src/main/java/com/newyetai/usercenter/org/service/OrgService.java b/src/main/java/com/senmesh/usercenter/org/service/OrgService.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/org/service/OrgService.java rename to src/main/java/com/senmesh/usercenter/org/service/OrgService.java index ba72bb5..e921f9c 100644 --- a/src/main/java/com/newyetai/usercenter/org/service/OrgService.java +++ b/src/main/java/com/senmesh/usercenter/org/service/OrgService.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.service; +package com.senmesh.usercenter.org.service; import java.util.List; import java.util.Set; @@ -8,15 +8,15 @@ import javax.validation.groups.Default; import org.springframework.validation.annotation.Validated; -import com.newyetai.usercenter.org.dto.OrgCreateDTO; -import com.newyetai.usercenter.org.dto.OrgDTO; -import com.newyetai.usercenter.org.dto.OrgModifyDTO; -import com.newyetai.usercenter.org.dto.OrgQueryDTO; -import com.newyetai.usercenter.org.dto.UcOpenOrgPartQueryDTO; -import com.newyetai.usercenter.org.dto.UcOrgInfoReqDTO; -import com.newyetai.usercenter.org.dto.UcOrgInfoResDTO; -import com.newyetai.usercenter.org.dto.UcOrgPartInfoDTO; -import com.newyetai.usercenter.org.dto.UcOrgPartQueryDTO; +import com.senmesh.usercenter.org.dto.OrgCreateDTO; +import com.senmesh.usercenter.org.dto.OrgDTO; +import com.senmesh.usercenter.org.dto.OrgModifyDTO; +import com.senmesh.usercenter.org.dto.OrgQueryDTO; +import com.senmesh.usercenter.org.dto.UcOpenOrgPartQueryDTO; +import com.senmesh.usercenter.org.dto.UcOrgInfoReqDTO; +import com.senmesh.usercenter.org.dto.UcOrgInfoResDTO; +import com.senmesh.usercenter.org.dto.UcOrgPartInfoDTO; +import com.senmesh.usercenter.org.dto.UcOrgPartQueryDTO; @Validated(Default.class) public interface OrgService { diff --git a/src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgExcelListener.java b/src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgExcelListener.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgExcelListener.java rename to src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgExcelListener.java index 74c0869..54d7834 100644 --- a/src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgExcelListener.java +++ b/src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgExcelListener.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.org.service.impl; +package com.senmesh.usercenter.org.service.impl; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.org.dto.ImportDetailOrgListenerDTO; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.org.dto.ImportDetailOrgListenerDTO; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgProvider.java b/src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgProvider.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgProvider.java rename to src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgProvider.java index 47f5137..028547b 100644 --- a/src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgProvider.java +++ b/src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.service.impl; +package com.senmesh.usercenter.org.service.impl; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -6,37 +6,37 @@ import com.google.common.collect.Sets; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.read.builder.ExcelReaderBuilder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.newyetai.common.dto.ExportHeadDetailInfoDTO; -import com.newyetai.common.dto.ExportHeadInfoDTO; -import com.newyetai.common.easyexcel.ExcelUtil; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.component.commonimport.constant.ImportDetailStatusEnum; -import com.newyetai.component.commonimport.constant.ImportStatusEnum; -import com.newyetai.component.commonimport.constant.ImportTypeEnum; -import com.newyetai.component.commonimport.dto.ImportDetailPageDTO; -import com.newyetai.component.commonimport.dto.ImportMainDTO; -import com.newyetai.component.commonimport.dto.ImportMainQueryDTO; -import com.newyetai.component.commonimport.dto.ImportMainUpdateDTO; -import com.newyetai.component.commonimport.service.ImportMainService; -import com.newyetai.component.commonimport.service.impl.AbstractCommonImportProvider; -import com.newyetai.component.dict.util.DictUtils; -import com.newyetai.component.file.entity.FileRecord; -import com.newyetai.component.file.service.FileRecordService; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.org.dao.OrgMapper; -import com.newyetai.usercenter.org.dto.ImportDetailOrgDTO; -import com.newyetai.usercenter.org.dto.ImportDetailOrgExecuteDTO; -import com.newyetai.usercenter.org.dto.ImportDetailOrgExportDTO; -import com.newyetai.usercenter.org.dto.ImportDetailOrgListenerDTO; -import com.newyetai.usercenter.org.dto.ImportDetailOrgOperatorDTO; -import com.newyetai.usercenter.org.dto.ImportDetailOrgPageQueryDTO; -import com.newyetai.usercenter.org.dto.OrgCreateDTO; -import com.newyetai.usercenter.org.entity.Org; -import com.newyetai.usercenter.org.service.ImportDetailOrgService; -import com.newyetai.usercenter.org.service.OrgService; +import com.senmesh.common.dto.ExportHeadDetailInfoDTO; +import com.senmesh.common.dto.ExportHeadInfoDTO; +import com.senmesh.common.easyexcel.ExcelUtil; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.component.commonimport.constant.ImportDetailStatusEnum; +import com.senmesh.component.commonimport.constant.ImportStatusEnum; +import com.senmesh.component.commonimport.constant.ImportTypeEnum; +import com.senmesh.component.commonimport.dto.ImportDetailPageDTO; +import com.senmesh.component.commonimport.dto.ImportMainDTO; +import com.senmesh.component.commonimport.dto.ImportMainQueryDTO; +import com.senmesh.component.commonimport.dto.ImportMainUpdateDTO; +import com.senmesh.component.commonimport.service.ImportMainService; +import com.senmesh.component.commonimport.service.impl.AbstractCommonImportProvider; +import com.senmesh.component.dict.util.DictUtils; +import com.senmesh.component.file.entity.FileRecord; +import com.senmesh.component.file.service.FileRecordService; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.org.dao.OrgMapper; +import com.senmesh.usercenter.org.dto.ImportDetailOrgDTO; +import com.senmesh.usercenter.org.dto.ImportDetailOrgExecuteDTO; +import com.senmesh.usercenter.org.dto.ImportDetailOrgExportDTO; +import com.senmesh.usercenter.org.dto.ImportDetailOrgListenerDTO; +import com.senmesh.usercenter.org.dto.ImportDetailOrgOperatorDTO; +import com.senmesh.usercenter.org.dto.ImportDetailOrgPageQueryDTO; +import com.senmesh.usercenter.org.dto.OrgCreateDTO; +import com.senmesh.usercenter.org.entity.Org; +import com.senmesh.usercenter.org.service.ImportDetailOrgService; +import com.senmesh.usercenter.org.service.OrgService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgServiceImpl.java b/src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgServiceImpl.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgServiceImpl.java rename to src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgServiceImpl.java index b4247bc..bbf6eff 100644 --- a/src/main/java/com/newyetai/usercenter/org/service/impl/ImportDetailOrgServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/org/service/impl/ImportDetailOrgServiceImpl.java @@ -1,19 +1,19 @@ -package com.newyetai.usercenter.org.service.impl; +package com.senmesh.usercenter.org.service.impl; import lombok.extern.slf4j.Slf4j; -import com.newyetai.usercenter.org.entity.ImportDetailOrg; -import com.newyetai.usercenter.org.dto.*; -import com.newyetai.usercenter.org.dao.ImportDetailOrgMapper; -import com.newyetai.usercenter.org.mapstruct.ImportDetailOrgConvert; -import com.newyetai.usercenter.org.service.ImportDetailOrgService; +import com.senmesh.usercenter.org.entity.ImportDetailOrg; +import com.senmesh.usercenter.org.dto.*; +import com.senmesh.usercenter.org.dao.ImportDetailOrgMapper; +import com.senmesh.usercenter.org.mapstruct.ImportDetailOrgConvert; +import com.senmesh.usercenter.org.service.ImportDetailOrgService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.util.UserContextHolder; import javax.annotation.Resource; diff --git a/src/main/java/com/newyetai/usercenter/org/service/impl/OrgRelationServiceImpl.java b/src/main/java/com/senmesh/usercenter/org/service/impl/OrgRelationServiceImpl.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/org/service/impl/OrgRelationServiceImpl.java rename to src/main/java/com/senmesh/usercenter/org/service/impl/OrgRelationServiceImpl.java index 1ffe6d4..ca11151 100644 --- a/src/main/java/com/newyetai/usercenter/org/service/impl/OrgRelationServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/org/service/impl/OrgRelationServiceImpl.java @@ -1,24 +1,24 @@ -package com.newyetai.usercenter.org.service.impl; +package com.senmesh.usercenter.org.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.usercenter.constants.OrgConstants; -import com.newyetai.usercenter.org.dao.OrgRelationMapper; -import com.newyetai.usercenter.org.service.OrgRelationService; -import com.newyetai.usercenter.org.dto.OrgRelationQueryDTO; -import com.newyetai.usercenter.org.dto.OrgRelationQueryOrgDTO; -import com.newyetai.usercenter.org.dto.OrgRelationCreateDTO; -import com.newyetai.usercenter.org.dto.OrgRelationDTO; -import com.newyetai.usercenter.org.dto.OrgRelationModifyDTO; -import com.newyetai.usercenter.org.entity.OrgRelation; -import com.newyetai.usercenter.org.mapstruct.OrgRelationMapMapper; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; +import com.senmesh.usercenter.constants.OrgConstants; +import com.senmesh.usercenter.org.dao.OrgRelationMapper; +import com.senmesh.usercenter.org.service.OrgRelationService; +import com.senmesh.usercenter.org.dto.OrgRelationQueryDTO; +import com.senmesh.usercenter.org.dto.OrgRelationQueryOrgDTO; +import com.senmesh.usercenter.org.dto.OrgRelationCreateDTO; +import com.senmesh.usercenter.org.dto.OrgRelationDTO; +import com.senmesh.usercenter.org.dto.OrgRelationModifyDTO; +import com.senmesh.usercenter.org.entity.OrgRelation; +import com.senmesh.usercenter.org.mapstruct.OrgRelationMapMapper; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; /** * @author sr on 2022-05-25 diff --git a/src/main/java/com/newyetai/usercenter/org/service/impl/OrgServiceImpl.java b/src/main/java/com/senmesh/usercenter/org/service/impl/OrgServiceImpl.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/org/service/impl/OrgServiceImpl.java rename to src/main/java/com/senmesh/usercenter/org/service/impl/OrgServiceImpl.java index 9f81670..9a0f03f 100644 --- a/src/main/java/com/newyetai/usercenter/org/service/impl/OrgServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/org/service/impl/OrgServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.org.service.impl; +package com.senmesh.usercenter.org.service.impl; import java.util.*; import java.util.stream.Collectors; @@ -9,35 +9,35 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.codegenerator.util.CodeUtils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.TreeHelper; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.usercenter.common.constant.CodeTypeEnum; -import com.newyetai.usercenter.enums.OrgTypeEnum; -import com.newyetai.usercenter.org.dao.OrgMapper; -import com.newyetai.usercenter.org.dto.OrgCreateDTO; -import com.newyetai.usercenter.org.dto.OrgDTO; -import com.newyetai.usercenter.org.dto.OrgModifyDTO; -import com.newyetai.usercenter.org.dto.OrgQueryDTO; -import com.newyetai.usercenter.org.dto.OrgRelationCreateDTO; -import com.newyetai.usercenter.org.dto.UcOpenOrgPartQueryDTO; -import com.newyetai.usercenter.org.dto.UcOrgInfoReqDTO; -import com.newyetai.usercenter.org.dto.UcOrgInfoResDTO; -import com.newyetai.usercenter.org.dto.UcOrgPartInfoDTO; -import com.newyetai.usercenter.org.dto.UcOrgPartQueryDTO; -import com.newyetai.usercenter.org.entity.Org; -import com.newyetai.usercenter.org.mapstruct.OrgMapMapper; -import com.newyetai.usercenter.org.service.OrgRelationService; -import com.newyetai.usercenter.org.service.OrgService; -import com.newyetai.usercenter.permissionpackage.service.UcPermissionOrganizationService; -import com.newyetai.usercenter.user.dto.OrgUserCreateDTO; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.codegenerator.util.CodeUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.TreeHelper; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.usercenter.common.constant.CodeTypeEnum; +import com.senmesh.usercenter.enums.OrgTypeEnum; +import com.senmesh.usercenter.org.dao.OrgMapper; +import com.senmesh.usercenter.org.dto.OrgCreateDTO; +import com.senmesh.usercenter.org.dto.OrgDTO; +import com.senmesh.usercenter.org.dto.OrgModifyDTO; +import com.senmesh.usercenter.org.dto.OrgQueryDTO; +import com.senmesh.usercenter.org.dto.OrgRelationCreateDTO; +import com.senmesh.usercenter.org.dto.UcOpenOrgPartQueryDTO; +import com.senmesh.usercenter.org.dto.UcOrgInfoReqDTO; +import com.senmesh.usercenter.org.dto.UcOrgInfoResDTO; +import com.senmesh.usercenter.org.dto.UcOrgPartInfoDTO; +import com.senmesh.usercenter.org.dto.UcOrgPartQueryDTO; +import com.senmesh.usercenter.org.entity.Org; +import com.senmesh.usercenter.org.mapstruct.OrgMapMapper; +import com.senmesh.usercenter.org.service.OrgRelationService; +import com.senmesh.usercenter.org.service.OrgService; +import com.senmesh.usercenter.permissionpackage.service.UcPermissionOrganizationService; +import com.senmesh.usercenter.user.dto.OrgUserCreateDTO; +import com.senmesh.usercenter.user.service.UserService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/constants/PermissionPackageConstants.java b/src/main/java/com/senmesh/usercenter/permissionpackage/constants/PermissionPackageConstants.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/permissionpackage/constants/PermissionPackageConstants.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/constants/PermissionPackageConstants.java index a48c07a..82a9a87 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/constants/PermissionPackageConstants.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/constants/PermissionPackageConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.permissionpackage.constants; +package com.senmesh.usercenter.permissionpackage.constants; /** * @author : yzq diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/controller/UcPermissionPackageController.java b/src/main/java/com/senmesh/usercenter/permissionpackage/controller/UcPermissionPackageController.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/permissionpackage/controller/UcPermissionPackageController.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/controller/UcPermissionPackageController.java index 00f435d..732e4da 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/controller/UcPermissionPackageController.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/controller/UcPermissionPackageController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.permissionpackage.controller; +package com.senmesh.usercenter.permissionpackage.controller; import java.util.List; import java.util.Set; @@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.validation.Check; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.cache.SecurityCacheUtils; -import com.newyetai.usercenter.permissionpackage.dto.PackageResourcesDTO; -import com.newyetai.usercenter.permissionpackage.dto.PackageResourcesOperateDTO; -import com.newyetai.usercenter.permissionpackage.dto.PackageResourcesPageQueryDTO; -import com.newyetai.usercenter.permissionpackage.dto.PermissionOrganizeDTO; -import com.newyetai.usercenter.permissionpackage.dto.PermissionOrganizePageQueryDTO; -import com.newyetai.usercenter.permissionpackage.dto.PermissionPackageDTO; -import com.newyetai.usercenter.permissionpackage.dto.PermissionPackageOperateDTO; -import com.newyetai.usercenter.permissionpackage.dto.PermissionPackagePageQueryDTO; -import com.newyetai.usercenter.permissionpackage.service.UcPermissionOrganizationService; -import com.newyetai.usercenter.permissionpackage.service.UcPermissionPackageService; -import com.newyetai.usercenter.permissionpackage.service.UcPermissionResourceService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.validation.Check; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.cache.SecurityCacheUtils; +import com.senmesh.usercenter.permissionpackage.dto.PackageResourcesDTO; +import com.senmesh.usercenter.permissionpackage.dto.PackageResourcesOperateDTO; +import com.senmesh.usercenter.permissionpackage.dto.PackageResourcesPageQueryDTO; +import com.senmesh.usercenter.permissionpackage.dto.PermissionOrganizeDTO; +import com.senmesh.usercenter.permissionpackage.dto.PermissionOrganizePageQueryDTO; +import com.senmesh.usercenter.permissionpackage.dto.PermissionPackageDTO; +import com.senmesh.usercenter.permissionpackage.dto.PermissionPackageOperateDTO; +import com.senmesh.usercenter.permissionpackage.dto.PermissionPackagePageQueryDTO; +import com.senmesh.usercenter.permissionpackage.service.UcPermissionOrganizationService; +import com.senmesh.usercenter.permissionpackage.service.UcPermissionPackageService; +import com.senmesh.usercenter.permissionpackage.service.UcPermissionResourceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionPackageMapper.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionPackageMapper.java similarity index 52% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionPackageMapper.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionPackageMapper.java index d548048..29c882c 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionPackageMapper.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionPackageMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.permissionpackage.dao; +package com.senmesh.usercenter.permissionpackage.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.permissionpackage.dto.PermissionPackageDTO; -import com.newyetai.usercenter.permissionpackage.dto.PermissionPackagePageQueryDTO; -import com.newyetai.usercenter.permissionpackage.entity.PermissionPackage; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.permissionpackage.dto.PermissionPackageDTO; +import com.senmesh.usercenter.permissionpackage.dto.PermissionPackagePageQueryDTO; +import com.senmesh.usercenter.permissionpackage.entity.PermissionPackage; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionPackageOrgMapper.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionPackageOrgMapper.java similarity index 60% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionPackageOrgMapper.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionPackageOrgMapper.java index 434f440..bc45358 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionPackageOrgMapper.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionPackageOrgMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.permissionpackage.dao; +package com.senmesh.usercenter.permissionpackage.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.permissionpackage.dto.PermissionOrganizeDTO; -import com.newyetai.usercenter.permissionpackage.dto.PermissionOrganizePageQueryDTO; -import com.newyetai.usercenter.permissionpackage.entity.PermissionOrganization; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.permissionpackage.dto.PermissionOrganizeDTO; +import com.senmesh.usercenter.permissionpackage.dto.PermissionOrganizePageQueryDTO; +import com.senmesh.usercenter.permissionpackage.entity.PermissionOrganization; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionResourceMapper.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionResourceMapper.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionResourceMapper.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionResourceMapper.java index 0f69cee..f141428 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dao/PermissionResourceMapper.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dao/PermissionResourceMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.permissionpackage.dao; +package com.senmesh.usercenter.permissionpackage.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.permissionpackage.dto.PackageResourcesOperateDTO; -import com.newyetai.usercenter.permissionpackage.dto.PackageResourcesPageQueryDTO; -import com.newyetai.usercenter.permissionpackage.entity.PermissionResources; -import com.newyetai.usercenter.resource.dto.UrlDTO; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.permissionpackage.dto.PackageResourcesOperateDTO; +import com.senmesh.usercenter.permissionpackage.dto.PackageResourcesPageQueryDTO; +import com.senmesh.usercenter.permissionpackage.entity.PermissionResources; +import com.senmesh.usercenter.resource.dto.UrlDTO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesDTO.java index 6d93adf..6ee665b 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesOperateDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesOperateDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesOperateDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesOperateDTO.java index 2379e25..786c554 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesOperateDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.constants.SecurityValidateConstants; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.usercenter.constants.SecurityValidateConstants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesPageQueryDTO.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesPageQueryDTO.java index 34c46ce..ddbdaa3 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PackageResourcesPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PackageResourcesPageQueryDTO.java @@ -1,15 +1,11 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; -import com.newyetai.common.dto.PageQueryDTO; -import com.newyetai.common.validation.Check; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.constants.SecurityValidateConstants; +import com.senmesh.common.dto.PageQueryDTO; +import com.senmesh.common.validation.Check; +import com.senmesh.usercenter.constants.SecurityValidateConstants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrgCreateDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrgCreateDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrgCreateDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrgCreateDTO.java index 05d753b..2d82e0d 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrgCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrgCreateDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; import java.util.Set; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrganizeDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrganizeDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrganizeDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrganizeDTO.java index 34cef51..ee6b6e6 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrganizeDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrganizeDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.usercenter.constants.SecurityValidateConstants; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.usercenter.constants.SecurityValidateConstants; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrganizePageQueryDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrganizePageQueryDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrganizePageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrganizePageQueryDTO.java index d594071..9912f97 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionOrganizePageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionOrganizePageQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; -import com.newyetai.common.dto.PageQueryDTO; -import com.newyetai.usercenter.constants.SecurityValidateConstants; +import com.senmesh.common.dto.PageQueryDTO; +import com.senmesh.usercenter.constants.SecurityValidateConstants; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackageDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackageDTO.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackageDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackageDTO.java index 5c4bef5..5121c32 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackageDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackageDTO.java @@ -1,11 +1,8 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.Check; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.constants.SecurityValidateConstants; -import com.newyetai.usercenter.enums.OrgTypeEnum; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.usercenter.constants.SecurityValidateConstants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -14,7 +11,6 @@ import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * @author yzq diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackageOperateDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackageOperateDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackageOperateDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackageOperateDTO.java index abef898..dfe4354 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackageOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackageOperateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.constants.SecurityValidateConstants; -import com.newyetai.usercenter.resource.dto.UrlDTO; +import com.senmesh.common.validation.Update; +import com.senmesh.usercenter.constants.SecurityValidateConstants; +import com.senmesh.usercenter.resource.dto.UrlDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackagePageQueryDTO.java b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackagePageQueryDTO.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackagePageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackagePageQueryDTO.java index 6ff51ba..08fd3d8 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/dto/PermissionPackagePageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/dto/PermissionPackagePageQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.permissionpackage.dto; +package com.senmesh.usercenter.permissionpackage.dto; -import com.newyetai.common.dto.PageQueryDTO; -import com.newyetai.usercenter.constants.SecurityValidateConstants; -import com.newyetai.usercenter.enums.OrgTypeEnum; +import com.senmesh.common.dto.PageQueryDTO; +import com.senmesh.usercenter.constants.SecurityValidateConstants; +import com.senmesh.usercenter.enums.OrgTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionOrganization.java b/src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionOrganization.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionOrganization.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionOrganization.java index 04f4e90..a47ed46 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionOrganization.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionOrganization.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.permissionpackage.entity; +package com.senmesh.usercenter.permissionpackage.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionPackage.java b/src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionPackage.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionPackage.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionPackage.java index 8c880fe..70bf718 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionPackage.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionPackage.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.permissionpackage.entity; +package com.senmesh.usercenter.permissionpackage.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.usercenter.enums.OrgTypeEnum; +import com.senmesh.common.entity.BaseEntity; +import com.senmesh.usercenter.enums.OrgTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionResources.java b/src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionResources.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionResources.java rename to src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionResources.java index 21c76f3..c836322 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/entity/PermissionResources.java +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/entity/PermissionResources.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.permissionpackage.entity; +package com.senmesh.usercenter.permissionpackage.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/permissionpackage/mapper/PermissionPackageMapper.xml b/src/main/java/com/senmesh/usercenter/permissionpackage/mapper/PermissionPackageMapper.xml similarity index 88% rename from src/main/java/com/newyetai/usercenter/permissionpackage/mapper/PermissionPackageMapper.xml rename to src/main/java/com/senmesh/usercenter/permissionpackage/mapper/PermissionPackageMapper.xml index ae0558d..ea306c2 100644 --- a/src/main/java/com/newyetai/usercenter/permissionpackage/mapper/PermissionPackageMapper.xml +++ b/src/main/java/com/senmesh/usercenter/permissionpackage/mapper/PermissionPackageMapper.xml @@ -2,9 +2,9 @@ - + + resultType="com.senmesh.usercenter.permissionpackage.dto.PermissionOrganizeDTO"> SELECT t1.*, t1.type AS orgType @@ -38,7 +38,7 @@ + + + - SELECT t1.* FROM diff --git a/src/main/java/com/newyetai/usercenter/resource/mapper/UcUrlMapper.xml b/src/main/java/com/senmesh/usercenter/resource/mapper/UcUrlMapper.xml similarity index 89% rename from src/main/java/com/newyetai/usercenter/resource/mapper/UcUrlMapper.xml rename to src/main/java/com/senmesh/usercenter/resource/mapper/UcUrlMapper.xml index ebf8f36..3fc8047 100644 --- a/src/main/java/com/newyetai/usercenter/resource/mapper/UcUrlMapper.xml +++ b/src/main/java/com/senmesh/usercenter/resource/mapper/UcUrlMapper.xml @@ -2,7 +2,7 @@ - + SELECT id, @@ -21,7 +21,7 @@ xs_url - WHERE deleted = 0 @@ -47,7 +47,7 @@ - where deleted = 0 @@ -92,7 +92,7 @@ AND deleted = 0 - SELECT t1.* FROM diff --git a/src/main/java/com/newyetai/usercenter/resource/mapstruct/ResourceMapMapper.java b/src/main/java/com/senmesh/usercenter/resource/mapstruct/ResourceMapMapper.java similarity index 59% rename from src/main/java/com/newyetai/usercenter/resource/mapstruct/ResourceMapMapper.java rename to src/main/java/com/senmesh/usercenter/resource/mapstruct/ResourceMapMapper.java index ca6f882..57ee546 100644 --- a/src/main/java/com/newyetai/usercenter/resource/mapstruct/ResourceMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/resource/mapstruct/ResourceMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.resource.mapstruct; +package com.senmesh.usercenter.resource.mapstruct; -import com.newyetai.usercenter.authority.dto.PermissionDTO; -import com.newyetai.usercenter.authority.entity.Permission; -import com.newyetai.usercenter.resource.dto.ComponentDTO; -import com.newyetai.usercenter.resource.dto.UrlDTO; -import com.newyetai.usercenter.resource.entity.Component; -import com.newyetai.usercenter.resource.entity.Url; +import com.senmesh.usercenter.authority.dto.PermissionDTO; +import com.senmesh.usercenter.authority.entity.Permission; +import com.senmesh.usercenter.resource.dto.ComponentDTO; +import com.senmesh.usercenter.resource.dto.UrlDTO; +import com.senmesh.usercenter.resource.entity.Component; +import com.senmesh.usercenter.resource.entity.Url; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/src/main/java/com/newyetai/usercenter/resource/service/UcComponentService.java b/src/main/java/com/senmesh/usercenter/resource/service/UcComponentService.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/resource/service/UcComponentService.java rename to src/main/java/com/senmesh/usercenter/resource/service/UcComponentService.java index 81fd183..a90a3ce 100644 --- a/src/main/java/com/newyetai/usercenter/resource/service/UcComponentService.java +++ b/src/main/java/com/senmesh/usercenter/resource/service/UcComponentService.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.resource.service; +package com.senmesh.usercenter.resource.service; -import com.newyetai.usercenter.resource.dto.ComponentDTO; -import com.newyetai.usercenter.resource.dto.ComponentPageQueryDTO; +import com.senmesh.usercenter.resource.dto.ComponentDTO; +import com.senmesh.usercenter.resource.dto.ComponentPageQueryDTO; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/resource/service/UcResourceService.java b/src/main/java/com/senmesh/usercenter/resource/service/UcResourceService.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/resource/service/UcResourceService.java rename to src/main/java/com/senmesh/usercenter/resource/service/UcResourceService.java index 4f5c82b..d198bba 100644 --- a/src/main/java/com/newyetai/usercenter/resource/service/UcResourceService.java +++ b/src/main/java/com/senmesh/usercenter/resource/service/UcResourceService.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.resource.service; +package com.senmesh.usercenter.resource.service; -import com.newyetai.usercenter.authority.dto.PermissionOperateDTO; +import com.senmesh.usercenter.authority.dto.PermissionOperateDTO; /** * 所有资源service diff --git a/src/main/java/com/newyetai/usercenter/resource/service/UcUrlService.java b/src/main/java/com/senmesh/usercenter/resource/service/UcUrlService.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/resource/service/UcUrlService.java rename to src/main/java/com/senmesh/usercenter/resource/service/UcUrlService.java index 33fd903..bdd4cb4 100644 --- a/src/main/java/com/newyetai/usercenter/resource/service/UcUrlService.java +++ b/src/main/java/com/senmesh/usercenter/resource/service/UcUrlService.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.resource.service; +package com.senmesh.usercenter.resource.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.authority.dto.PermissionDTO; -import com.newyetai.usercenter.authority.dto.PermissionOperateDTO; -import com.newyetai.usercenter.authority.dto.PermissionPageQueryDTO; -import com.newyetai.usercenter.authority.dto.PermissionResourcesDTO; -import com.newyetai.usercenter.resource.dto.UrlDTO; -import com.newyetai.usercenter.resource.dto.UrlPageQueryDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.authority.dto.PermissionDTO; +import com.senmesh.usercenter.authority.dto.PermissionOperateDTO; +import com.senmesh.usercenter.authority.dto.PermissionPageQueryDTO; +import com.senmesh.usercenter.authority.dto.PermissionResourcesDTO; +import com.senmesh.usercenter.resource.dto.UrlDTO; +import com.senmesh.usercenter.resource.dto.UrlPageQueryDTO; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/resource/service/impl/UcComponentServiceImpl.java b/src/main/java/com/senmesh/usercenter/resource/service/impl/UcComponentServiceImpl.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/resource/service/impl/UcComponentServiceImpl.java rename to src/main/java/com/senmesh/usercenter/resource/service/impl/UcComponentServiceImpl.java index 5a81b84..2238946 100644 --- a/src/main/java/com/newyetai/usercenter/resource/service/impl/UcComponentServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/resource/service/impl/UcComponentServiceImpl.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.resource.service.impl; +package com.senmesh.usercenter.resource.service.impl; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.cache.SecurityCacheUtils; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.resource.dao.UcComponentMapper; -import com.newyetai.usercenter.resource.dto.ComponentDTO; -import com.newyetai.usercenter.resource.dto.ComponentPageQueryDTO; -import com.newyetai.usercenter.resource.entity.Component; -import com.newyetai.usercenter.resource.mapstruct.ResourceMapMapper; -import com.newyetai.usercenter.resource.service.UcComponentService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.cache.SecurityCacheUtils; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.resource.dao.UcComponentMapper; +import com.senmesh.usercenter.resource.dto.ComponentDTO; +import com.senmesh.usercenter.resource.dto.ComponentPageQueryDTO; +import com.senmesh.usercenter.resource.entity.Component; +import com.senmesh.usercenter.resource.mapstruct.ResourceMapMapper; +import com.senmesh.usercenter.resource.service.UcComponentService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/main/java/com/newyetai/usercenter/resource/service/impl/UcResourceServiceImpl.java b/src/main/java/com/senmesh/usercenter/resource/service/impl/UcResourceServiceImpl.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/resource/service/impl/UcResourceServiceImpl.java rename to src/main/java/com/senmesh/usercenter/resource/service/impl/UcResourceServiceImpl.java index 65bad11..b3c760c 100644 --- a/src/main/java/com/newyetai/usercenter/resource/service/impl/UcResourceServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/resource/service/impl/UcResourceServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.resource.service.impl; +package com.senmesh.usercenter.resource.service.impl; import java.util.List; import java.util.Map; @@ -11,23 +11,23 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Lists; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.usercenter.authority.constants.PermissionConstants; -import com.newyetai.usercenter.authority.dao.UcPermissionMapper; -import com.newyetai.usercenter.authority.dao.UcRoleMapper; -import com.newyetai.usercenter.authority.dto.PermissionOperateDTO; -import com.newyetai.usercenter.authority.entity.Permission; -import com.newyetai.usercenter.cache.SecurityCacheEvict; -import com.newyetai.usercenter.constants.RoleConstants; -import com.newyetai.usercenter.constants.SecurityExceptionMsg; -import com.newyetai.usercenter.dto.ResourceDTO; -import com.newyetai.usercenter.resource.dao.UcComponentMapper; -import com.newyetai.usercenter.resource.dao.UcUrlMapper; -import com.newyetai.usercenter.resource.dto.ComponentDTO; -import com.newyetai.usercenter.resource.dto.UrlDTO; -import com.newyetai.usercenter.resource.service.UcResourceService; -import com.newyetai.usercenter.utils.PermissionUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.usercenter.authority.constants.PermissionConstants; +import com.senmesh.usercenter.authority.dao.UcPermissionMapper; +import com.senmesh.usercenter.authority.dao.UcRoleMapper; +import com.senmesh.usercenter.authority.dto.PermissionOperateDTO; +import com.senmesh.usercenter.authority.entity.Permission; +import com.senmesh.usercenter.cache.SecurityCacheEvict; +import com.senmesh.usercenter.constants.RoleConstants; +import com.senmesh.usercenter.constants.SecurityExceptionMsg; +import com.senmesh.usercenter.dto.ResourceDTO; +import com.senmesh.usercenter.resource.dao.UcComponentMapper; +import com.senmesh.usercenter.resource.dao.UcUrlMapper; +import com.senmesh.usercenter.resource.dto.ComponentDTO; +import com.senmesh.usercenter.resource.dto.UrlDTO; +import com.senmesh.usercenter.resource.service.UcResourceService; +import com.senmesh.usercenter.utils.PermissionUtils; /** * 所有资源 diff --git a/src/main/java/com/newyetai/usercenter/resource/service/impl/UcUrlServiceImpl.java b/src/main/java/com/senmesh/usercenter/resource/service/impl/UcUrlServiceImpl.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/resource/service/impl/UcUrlServiceImpl.java rename to src/main/java/com/senmesh/usercenter/resource/service/impl/UcUrlServiceImpl.java index 9bcf27f..d82db71 100644 --- a/src/main/java/com/newyetai/usercenter/resource/service/impl/UcUrlServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/resource/service/impl/UcUrlServiceImpl.java @@ -1,25 +1,25 @@ -package com.newyetai.usercenter.resource.service.impl; +package com.senmesh.usercenter.resource.service.impl; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.common.util.TreeHelper; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.authority.constants.PermissionConstants; -import com.newyetai.usercenter.authority.dao.UcPermissionMapper; -import com.newyetai.usercenter.authority.dto.PermissionDTO; -import com.newyetai.usercenter.authority.dto.PermissionOperateDTO; -import com.newyetai.usercenter.authority.dto.PermissionPageQueryDTO; -import com.newyetai.usercenter.authority.dto.PermissionResourcesDTO; -import com.newyetai.usercenter.cache.SecurityCacheUtils; -import com.newyetai.usercenter.constants.SecurityConstants; -import com.newyetai.usercenter.resource.dao.UcUrlMapper; -import com.newyetai.usercenter.resource.dto.UrlDTO; -import com.newyetai.usercenter.resource.dto.UrlPageQueryDTO; -import com.newyetai.usercenter.resource.entity.Url; -import com.newyetai.usercenter.resource.mapstruct.ResourceMapMapper; -import com.newyetai.usercenter.resource.service.UcUrlService; -import com.newyetai.usercenter.utils.UrlUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.common.util.TreeHelper; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.authority.constants.PermissionConstants; +import com.senmesh.usercenter.authority.dao.UcPermissionMapper; +import com.senmesh.usercenter.authority.dto.PermissionDTO; +import com.senmesh.usercenter.authority.dto.PermissionOperateDTO; +import com.senmesh.usercenter.authority.dto.PermissionPageQueryDTO; +import com.senmesh.usercenter.authority.dto.PermissionResourcesDTO; +import com.senmesh.usercenter.cache.SecurityCacheUtils; +import com.senmesh.usercenter.constants.SecurityConstants; +import com.senmesh.usercenter.resource.dao.UcUrlMapper; +import com.senmesh.usercenter.resource.dto.UrlDTO; +import com.senmesh.usercenter.resource.dto.UrlPageQueryDTO; +import com.senmesh.usercenter.resource.entity.Url; +import com.senmesh.usercenter.resource.mapstruct.ResourceMapMapper; +import com.senmesh.usercenter.resource.service.UcUrlService; +import com.senmesh.usercenter.utils.UrlUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +28,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/controller/SearchHistoryController.java b/src/main/java/com/senmesh/usercenter/searchHistory/controller/SearchHistoryController.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/searchHistory/controller/SearchHistoryController.java rename to src/main/java/com/senmesh/usercenter/searchHistory/controller/SearchHistoryController.java index fa7e926..c0fa49a 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/controller/SearchHistoryController.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/controller/SearchHistoryController.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.searchHistory.controller; +package com.senmesh.usercenter.searchHistory.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryCreateDTO; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryInfoDTO; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryPageQueryDTO; -import com.newyetai.usercenter.searchHistory.service.SearchHistoryService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryCreateDTO; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryInfoDTO; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryPageQueryDTO; +import com.senmesh.usercenter.searchHistory.service.SearchHistoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/dao/SearchHistoryMapper.java b/src/main/java/com/senmesh/usercenter/searchHistory/dao/SearchHistoryMapper.java similarity index 53% rename from src/main/java/com/newyetai/usercenter/searchHistory/dao/SearchHistoryMapper.java rename to src/main/java/com/senmesh/usercenter/searchHistory/dao/SearchHistoryMapper.java index 910cf87..241af56 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/dao/SearchHistoryMapper.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/dao/SearchHistoryMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.searchHistory.dao; +package com.senmesh.usercenter.searchHistory.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryInfoDTO; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryPageQueryDTO; -import com.newyetai.usercenter.searchHistory.entity.SearchHistory; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryInfoDTO; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryPageQueryDTO; +import com.senmesh.usercenter.searchHistory.entity.SearchHistory; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryCreateDTO.java b/src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryCreateDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryCreateDTO.java rename to src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryCreateDTO.java index 12ec641..d279ae1 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryCreateDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.searchHistory.dto; +package com.senmesh.usercenter.searchHistory.dto; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryInfoDTO.java b/src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryInfoDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryInfoDTO.java rename to src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryInfoDTO.java index 4e5d0d8..3c75fb3 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryInfoDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.searchHistory.dto; +package com.senmesh.usercenter.searchHistory.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryPageQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryPageQueryDTO.java index dc05d7c..53f39b1 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/dto/SearchHistoryPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/dto/SearchHistoryPageQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.searchHistory.dto; +package com.senmesh.usercenter.searchHistory.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/entity/SearchHistory.java b/src/main/java/com/senmesh/usercenter/searchHistory/entity/SearchHistory.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/searchHistory/entity/SearchHistory.java rename to src/main/java/com/senmesh/usercenter/searchHistory/entity/SearchHistory.java index 71fdd2d..97f0129 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/entity/SearchHistory.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/entity/SearchHistory.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.searchHistory.entity; +package com.senmesh.usercenter.searchHistory.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/enums/SearchHistoryTypeEnum.java b/src/main/java/com/senmesh/usercenter/searchHistory/enums/SearchHistoryTypeEnum.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/searchHistory/enums/SearchHistoryTypeEnum.java rename to src/main/java/com/senmesh/usercenter/searchHistory/enums/SearchHistoryTypeEnum.java index e513f1d..1ee5618 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/enums/SearchHistoryTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/enums/SearchHistoryTypeEnum.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.searchHistory.enums; +package com.senmesh.usercenter.searchHistory.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; /** diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/mapper/SearchHistoryMapper.xml b/src/main/java/com/senmesh/usercenter/searchHistory/mapper/SearchHistoryMapper.xml similarity index 67% rename from src/main/java/com/newyetai/usercenter/searchHistory/mapper/SearchHistoryMapper.xml rename to src/main/java/com/senmesh/usercenter/searchHistory/mapper/SearchHistoryMapper.xml index 10c931e..ba7160e 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/mapper/SearchHistoryMapper.xml +++ b/src/main/java/com/senmesh/usercenter/searchHistory/mapper/SearchHistoryMapper.xml @@ -2,9 +2,9 @@ - + - SELECT sh.context, count(*) count diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/service/SearchHistoryService.java b/src/main/java/com/senmesh/usercenter/searchHistory/service/SearchHistoryService.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/searchHistory/service/SearchHistoryService.java rename to src/main/java/com/senmesh/usercenter/searchHistory/service/SearchHistoryService.java index 664626d..e3e04c7 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/service/SearchHistoryService.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/service/SearchHistoryService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.searchHistory.service; +package com.senmesh.usercenter.searchHistory.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryCreateDTO; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryInfoDTO; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryPageQueryDTO; -import com.newyetai.usercenter.searchHistory.entity.SearchHistory; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryCreateDTO; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryInfoDTO; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryPageQueryDTO; +import com.senmesh.usercenter.searchHistory.entity.SearchHistory; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/usercenter/searchHistory/service/impl/SearchHistoryServiceImpl.java b/src/main/java/com/senmesh/usercenter/searchHistory/service/impl/SearchHistoryServiceImpl.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/searchHistory/service/impl/SearchHistoryServiceImpl.java rename to src/main/java/com/senmesh/usercenter/searchHistory/service/impl/SearchHistoryServiceImpl.java index 7142f1f..a38795a 100644 --- a/src/main/java/com/newyetai/usercenter/searchHistory/service/impl/SearchHistoryServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/searchHistory/service/impl/SearchHistoryServiceImpl.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.searchHistory.service.impl; +package com.senmesh.usercenter.searchHistory.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.searchHistory.dao.SearchHistoryMapper; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryCreateDTO; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryInfoDTO; -import com.newyetai.usercenter.searchHistory.dto.SearchHistoryPageQueryDTO; -import com.newyetai.usercenter.searchHistory.entity.SearchHistory; -import com.newyetai.usercenter.searchHistory.service.SearchHistoryService; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.searchHistory.dao.SearchHistoryMapper; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryCreateDTO; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryInfoDTO; +import com.senmesh.usercenter.searchHistory.dto.SearchHistoryPageQueryDTO; +import com.senmesh.usercenter.searchHistory.entity.SearchHistory; +import com.senmesh.usercenter.searchHistory.service.SearchHistoryService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/senmesh/usercenter/service/AuthService.java b/src/main/java/com/senmesh/usercenter/service/AuthService.java new file mode 100644 index 0000000..7e46376 --- /dev/null +++ b/src/main/java/com/senmesh/usercenter/service/AuthService.java @@ -0,0 +1,4 @@ +package com.senmesh.usercenter.service; + +public interface AuthService { +} diff --git a/src/main/java/com/newyetai/usercenter/service/UcDictionaryService.java b/src/main/java/com/senmesh/usercenter/service/UcDictionaryService.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/service/UcDictionaryService.java rename to src/main/java/com/senmesh/usercenter/service/UcDictionaryService.java index 3b83b02..4142d7c 100644 --- a/src/main/java/com/newyetai/usercenter/service/UcDictionaryService.java +++ b/src/main/java/com/senmesh/usercenter/service/UcDictionaryService.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.service; +package com.senmesh.usercenter.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.component.dict.dto.DictDTO; -import com.newyetai.component.dict.dto.DictDetailDTO; -import com.newyetai.component.dict.dto.DictDetailQueryDTO; -import com.newyetai.component.dict.dto.DictQueryDTO; -import com.newyetai.component.dict.service.DictDetailService; -import com.newyetai.component.dict.service.DictService; +import com.senmesh.common.AlitaResult; +import com.senmesh.component.dict.dto.DictDTO; +import com.senmesh.component.dict.dto.DictDetailDTO; +import com.senmesh.component.dict.dto.DictDetailQueryDTO; +import com.senmesh.component.dict.dto.DictQueryDTO; +import com.senmesh.component.dict.service.DictDetailService; +import com.senmesh.component.dict.service.DictService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/service/UcRoleStandardTypeService.java b/src/main/java/com/senmesh/usercenter/service/UcRoleStandardTypeService.java similarity index 59% rename from src/main/java/com/newyetai/usercenter/service/UcRoleStandardTypeService.java rename to src/main/java/com/senmesh/usercenter/service/UcRoleStandardTypeService.java index 41e1d4f..079f0ca 100644 --- a/src/main/java/com/newyetai/usercenter/service/UcRoleStandardTypeService.java +++ b/src/main/java/com/senmesh/usercenter/service/UcRoleStandardTypeService.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.service; +package com.senmesh.usercenter.service; import java.util.List; -import com.newyetai.usercenter.dto.RoleStandardTypeDTO; -import com.newyetai.usercenter.query.RoleStandardTypeQuery; +import com.senmesh.usercenter.dto.RoleStandardTypeDTO; +import com.senmesh.usercenter.query.RoleStandardTypeQuery; /** * @Author dylanyuan diff --git a/src/main/java/com/newyetai/usercenter/service/UcSmsService.java b/src/main/java/com/senmesh/usercenter/service/UcSmsService.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/service/UcSmsService.java rename to src/main/java/com/senmesh/usercenter/service/UcSmsService.java index 874a674..758ea2a 100644 --- a/src/main/java/com/newyetai/usercenter/service/UcSmsService.java +++ b/src/main/java/com/senmesh/usercenter/service/UcSmsService.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.service; +package com.senmesh.usercenter.service; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.enums.SmsScenesEnum; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.enums.SmsScenesEnum; /** * @author chenyun diff --git a/src/main/java/com/newyetai/usercenter/service/impl/UcRoleStandardTypeServiceImpl.java b/src/main/java/com/senmesh/usercenter/service/impl/UcRoleStandardTypeServiceImpl.java similarity index 65% rename from src/main/java/com/newyetai/usercenter/service/impl/UcRoleStandardTypeServiceImpl.java rename to src/main/java/com/senmesh/usercenter/service/impl/UcRoleStandardTypeServiceImpl.java index 2108b4f..ff339a4 100644 --- a/src/main/java/com/newyetai/usercenter/service/impl/UcRoleStandardTypeServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/service/impl/UcRoleStandardTypeServiceImpl.java @@ -1,10 +1,9 @@ -package com.newyetai.usercenter.service.impl; +package com.senmesh.usercenter.service.impl; -import com.newyetai.usercenter.dao.XsRoleStandardTypeMapper; -import com.newyetai.usercenter.dto.RoleStandardTypeDTO; -import com.newyetai.usercenter.entity.RoleStandardType; -import com.newyetai.usercenter.query.RoleStandardTypeQuery; -import com.newyetai.usercenter.service.UcRoleStandardTypeService; +import com.senmesh.usercenter.dao.XsRoleStandardTypeMapper; +import com.senmesh.usercenter.dto.RoleStandardTypeDTO; +import com.senmesh.usercenter.query.RoleStandardTypeQuery; +import com.senmesh.usercenter.service.UcRoleStandardTypeService; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/sys/constant/DomainSettingConstant.java b/src/main/java/com/senmesh/usercenter/sys/constant/DomainSettingConstant.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/sys/constant/DomainSettingConstant.java rename to src/main/java/com/senmesh/usercenter/sys/constant/DomainSettingConstant.java index 1a22e47..ad9077c 100644 --- a/src/main/java/com/newyetai/usercenter/sys/constant/DomainSettingConstant.java +++ b/src/main/java/com/senmesh/usercenter/sys/constant/DomainSettingConstant.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.sys.constant; +package com.senmesh.usercenter.sys.constant; /** * @description: diff --git a/src/main/java/com/newyetai/usercenter/sys/controller/DomainAnonController.java b/src/main/java/com/senmesh/usercenter/sys/controller/DomainAnonController.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/sys/controller/DomainAnonController.java rename to src/main/java/com/senmesh/usercenter/sys/controller/DomainAnonController.java index 598a1d5..6b02ba0 100644 --- a/src/main/java/com/newyetai/usercenter/sys/controller/DomainAnonController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/DomainAnonController.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.sys.controller; +package com.senmesh.usercenter.sys.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.dto.DomainSettingReqDTO; -import com.newyetai.usercenter.dto.DomainSettingResDTO; -import com.newyetai.usercenter.sys.service.DomainSettingService; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.dto.DomainSettingReqDTO; +import com.senmesh.usercenter.dto.DomainSettingResDTO; +import com.senmesh.usercenter.sys.service.DomainSettingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/sys/controller/DomainAuthController.java b/src/main/java/com/senmesh/usercenter/sys/controller/DomainAuthController.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/sys/controller/DomainAuthController.java rename to src/main/java/com/senmesh/usercenter/sys/controller/DomainAuthController.java index c56f71c..ffddd22 100644 --- a/src/main/java/com/newyetai/usercenter/sys/controller/DomainAuthController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/DomainAuthController.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.sys.controller; +package com.senmesh.usercenter.sys.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.sys.dto.DomainAuthDTO; -import com.newyetai.usercenter.sys.dto.DomainAuthOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainAuthQueryDTO; -import com.newyetai.usercenter.sys.service.DomainAuthService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.sys.dto.DomainAuthDTO; +import com.senmesh.usercenter.sys.dto.DomainAuthOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainAuthQueryDTO; +import com.senmesh.usercenter.sys.service.DomainAuthService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/sys/controller/DomainController.java b/src/main/java/com/senmesh/usercenter/sys/controller/DomainController.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/sys/controller/DomainController.java rename to src/main/java/com/senmesh/usercenter/sys/controller/DomainController.java index c03c8d9..ebc8a12 100644 --- a/src/main/java/com/newyetai/usercenter/sys/controller/DomainController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/DomainController.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.sys.controller; +package com.senmesh.usercenter.sys.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.sys.dto.DomainDTO; -import com.newyetai.usercenter.sys.dto.DomainOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainQueryDTO; -import com.newyetai.usercenter.sys.service.DomainService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.sys.dto.DomainDTO; +import com.senmesh.usercenter.sys.dto.DomainOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainQueryDTO; +import com.senmesh.usercenter.sys.service.DomainService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/sys/controller/DomainSettingController.java b/src/main/java/com/senmesh/usercenter/sys/controller/DomainSettingController.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/sys/controller/DomainSettingController.java rename to src/main/java/com/senmesh/usercenter/sys/controller/DomainSettingController.java index b14d340..9580cf2 100644 --- a/src/main/java/com/newyetai/usercenter/sys/controller/DomainSettingController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/DomainSettingController.java @@ -1,14 +1,13 @@ -package com.newyetai.usercenter.sys.controller; +package com.senmesh.usercenter.sys.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.dto.DomainSettingOperateDTO; -import com.newyetai.usercenter.dto.DomainSettingReqDTO; -import com.newyetai.usercenter.dto.DomainSettingResDTO; -import com.newyetai.usercenter.sys.dto.DomainSettingBannerOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainSettingQuickOperateDTO; -import com.newyetai.usercenter.sys.service.DomainSettingService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.validation.Update; +import com.senmesh.usercenter.dto.DomainSettingOperateDTO; +import com.senmesh.usercenter.dto.DomainSettingReqDTO; +import com.senmesh.usercenter.dto.DomainSettingResDTO; +import com.senmesh.usercenter.sys.dto.DomainSettingBannerOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainSettingQuickOperateDTO; +import com.senmesh.usercenter.sys.service.DomainSettingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/sys/controller/FaqController.java b/src/main/java/com/senmesh/usercenter/sys/controller/FaqController.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/sys/controller/FaqController.java rename to src/main/java/com/senmesh/usercenter/sys/controller/FaqController.java index 2187113..3845957 100644 --- a/src/main/java/com/newyetai/usercenter/sys/controller/FaqController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/FaqController.java @@ -1,25 +1,23 @@ -package com.newyetai.usercenter.sys.controller; +package com.senmesh.usercenter.sys.controller; -import com.newyetai.common.validation.Create; -import org.apache.commons.lang3.StringUtils; +import com.senmesh.common.validation.Create; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PathVariable; -import com.newyetai.common.validation.Update; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.sys.dto.FaqQueryDTO; -import com.newyetai.usercenter.sys.service.FaqService; -import com.newyetai.usercenter.sys.dto.FaqDTO; -import com.newyetai.usercenter.sys.dto.FaqOperateDTO; +import com.senmesh.common.validation.Update; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.sys.dto.FaqQueryDTO; +import com.senmesh.usercenter.sys.service.FaqService; +import com.senmesh.usercenter.sys.dto.FaqDTO; +import com.senmesh.usercenter.sys.dto.FaqOperateDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/sys/controller/FaqFileController.java b/src/main/java/com/senmesh/usercenter/sys/controller/FaqFileController.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/sys/controller/FaqFileController.java rename to src/main/java/com/senmesh/usercenter/sys/controller/FaqFileController.java index 7fc4b1f..d504ec1 100644 --- a/src/main/java/com/newyetai/usercenter/sys/controller/FaqFileController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/FaqFileController.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.sys.controller; +package com.senmesh.usercenter.sys.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.sys.dto.FaqFileDTO; -import com.newyetai.usercenter.sys.dto.FaqFileQueryDTO; -import com.newyetai.usercenter.sys.service.FaqFileService; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.sys.dto.FaqFileDTO; +import com.senmesh.usercenter.sys.dto.FaqFileQueryDTO; +import com.senmesh.usercenter.sys.service.FaqFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/sys/controller/FeedbackController.java b/src/main/java/com/senmesh/usercenter/sys/controller/FeedbackController.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/sys/controller/FeedbackController.java rename to src/main/java/com/senmesh/usercenter/sys/controller/FeedbackController.java index ab26736..ad8e1b6 100644 --- a/src/main/java/com/newyetai/usercenter/sys/controller/FeedbackController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/FeedbackController.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.sys.controller; +package com.senmesh.usercenter.sys.controller; -import com.newyetai.common.validation.Create; -import com.newyetai.usercenter.sys.dto.FeedbackDTO; -import com.newyetai.usercenter.sys.dto.FeedbackOperateDTO; -import com.newyetai.usercenter.sys.dto.FeedbackQueryDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.usercenter.sys.dto.FeedbackDTO; +import com.senmesh.usercenter.sys.dto.FeedbackOperateDTO; +import com.senmesh.usercenter.sys.dto.FeedbackQueryDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -15,10 +15,10 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PathVariable; -import com.newyetai.common.validation.Update; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.sys.service.FeedbackService; +import com.senmesh.common.validation.Update; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.sys.service.FeedbackService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/sys/controller/PlatformController.java b/src/main/java/com/senmesh/usercenter/sys/controller/PlatformController.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/sys/controller/PlatformController.java rename to src/main/java/com/senmesh/usercenter/sys/controller/PlatformController.java index 2730dfd..26ba3ac 100644 --- a/src/main/java/com/newyetai/usercenter/sys/controller/PlatformController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/PlatformController.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.sys.controller; +package com.senmesh.usercenter.sys.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.validation.Update; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.sys.dto.PlatformDTO; -import com.newyetai.usercenter.sys.dto.PlatformOperateDTO; -import com.newyetai.usercenter.sys.dto.PlatformPageQueryDTO; -import com.newyetai.usercenter.sys.dto.PlatformQueryDTO; -import com.newyetai.usercenter.sys.service.PlatformService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.validation.Update; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.sys.dto.PlatformDTO; +import com.senmesh.usercenter.sys.dto.PlatformOperateDTO; +import com.senmesh.usercenter.sys.dto.PlatformPageQueryDTO; +import com.senmesh.usercenter.sys.dto.PlatformQueryDTO; +import com.senmesh.usercenter.sys.service.PlatformService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/sys/dao/DomainAuthMapper.java b/src/main/java/com/senmesh/usercenter/sys/dao/DomainAuthMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/sys/dao/DomainAuthMapper.java rename to src/main/java/com/senmesh/usercenter/sys/dao/DomainAuthMapper.java index 708744e..a3c1fe6 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dao/DomainAuthMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/dao/DomainAuthMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.sys.dao; +package com.senmesh.usercenter.sys.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.usercenter.sys.dto.DomainAuthDTO; -import com.newyetai.usercenter.sys.dto.DomainAuthQueryDTO; -import com.newyetai.usercenter.sys.entity.DomainAuth; +import com.senmesh.usercenter.sys.dto.DomainAuthDTO; +import com.senmesh.usercenter.sys.dto.DomainAuthQueryDTO; +import com.senmesh.usercenter.sys.entity.DomainAuth; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/sys/dao/DomainMapper.java b/src/main/java/com/senmesh/usercenter/sys/dao/DomainMapper.java similarity index 63% rename from src/main/java/com/newyetai/usercenter/sys/dao/DomainMapper.java rename to src/main/java/com/senmesh/usercenter/sys/dao/DomainMapper.java index 4d88d67..c309fb0 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dao/DomainMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/dao/DomainMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.sys.dao; +package com.senmesh.usercenter.sys.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.sys.dto.DomainDTO; -import com.newyetai.usercenter.sys.dto.DomainQueryDTO; -import com.newyetai.usercenter.sys.entity.Domain; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.sys.dto.DomainDTO; +import com.senmesh.usercenter.sys.dto.DomainQueryDTO; +import com.senmesh.usercenter.sys.entity.Domain; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/sys/dao/DomainSettingMapper.java b/src/main/java/com/senmesh/usercenter/sys/dao/DomainSettingMapper.java similarity index 50% rename from src/main/java/com/newyetai/usercenter/sys/dao/DomainSettingMapper.java rename to src/main/java/com/senmesh/usercenter/sys/dao/DomainSettingMapper.java index 82377e4..414de5f 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dao/DomainSettingMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/dao/DomainSettingMapper.java @@ -1,10 +1,9 @@ -package com.newyetai.usercenter.sys.dao; +package com.senmesh.usercenter.sys.dao; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.dto.DomainSettingReqDTO; -import com.newyetai.usercenter.dto.DomainSettingResDTO; -import com.newyetai.usercenter.sys.entity.DomainSetting; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.dto.DomainSettingReqDTO; +import com.senmesh.usercenter.dto.DomainSettingResDTO; +import com.senmesh.usercenter.sys.entity.DomainSetting; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/newyetai/usercenter/sys/dao/FaqFileMapper.java b/src/main/java/com/senmesh/usercenter/sys/dao/FaqFileMapper.java similarity index 57% rename from src/main/java/com/newyetai/usercenter/sys/dao/FaqFileMapper.java rename to src/main/java/com/senmesh/usercenter/sys/dao/FaqFileMapper.java index 3c4abb6..e319d0d 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dao/FaqFileMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/dao/FaqFileMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.sys.dao; +package com.senmesh.usercenter.sys.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.sys.dto.FaqFileDTO; -import com.newyetai.usercenter.sys.dto.FaqFileQueryDTO; -import com.newyetai.usercenter.sys.entity.FaqFile; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.sys.dto.FaqFileDTO; +import com.senmesh.usercenter.sys.dto.FaqFileQueryDTO; +import com.senmesh.usercenter.sys.entity.FaqFile; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/sys/dao/FaqMapper.java b/src/main/java/com/senmesh/usercenter/sys/dao/FaqMapper.java similarity index 59% rename from src/main/java/com/newyetai/usercenter/sys/dao/FaqMapper.java rename to src/main/java/com/senmesh/usercenter/sys/dao/FaqMapper.java index 116a97c..3b5a239 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dao/FaqMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/dao/FaqMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.sys.dao; +package com.senmesh.usercenter.sys.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.sys.dto.FaqDTO; -import com.newyetai.usercenter.sys.dto.FaqQueryDTO; -import com.newyetai.usercenter.sys.entity.Faq; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.sys.dto.FaqDTO; +import com.senmesh.usercenter.sys.dto.FaqQueryDTO; +import com.senmesh.usercenter.sys.entity.Faq; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 常见问题表 diff --git a/src/main/java/com/newyetai/usercenter/sys/dao/FeedbackMapper.java b/src/main/java/com/senmesh/usercenter/sys/dao/FeedbackMapper.java similarity index 60% rename from src/main/java/com/newyetai/usercenter/sys/dao/FeedbackMapper.java rename to src/main/java/com/senmesh/usercenter/sys/dao/FeedbackMapper.java index 99f9dad..1043e9e 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dao/FeedbackMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/dao/FeedbackMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.sys.dao; +package com.senmesh.usercenter.sys.dao; import java.util.List; -import com.newyetai.usercenter.sys.dto.FeedbackDTO; -import com.newyetai.usercenter.sys.dto.FeedbackQueryDTO; +import com.senmesh.usercenter.sys.dto.FeedbackDTO; +import com.senmesh.usercenter.sys.dto.FeedbackQueryDTO; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.sys.entity.Feedback; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.sys.entity.Feedback; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 反馈表 diff --git a/src/main/java/com/newyetai/usercenter/sys/dao/PlatformMapper.java b/src/main/java/com/senmesh/usercenter/sys/dao/PlatformMapper.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/sys/dao/PlatformMapper.java rename to src/main/java/com/senmesh/usercenter/sys/dao/PlatformMapper.java index 55f07c1..cde2f4d 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dao/PlatformMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/dao/PlatformMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.sys.dao; +package com.senmesh.usercenter.sys.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.sys.dto.PlatformDTO; -import com.newyetai.usercenter.sys.dto.PlatformPageQueryDTO; -import com.newyetai.usercenter.sys.dto.PlatformQueryDTO; -import com.newyetai.usercenter.sys.entity.Platform; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.sys.dto.PlatformDTO; +import com.senmesh.usercenter.sys.dto.PlatformPageQueryDTO; +import com.senmesh.usercenter.sys.dto.PlatformQueryDTO; +import com.senmesh.usercenter.sys.entity.Platform; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthDTO.java index 27d16ae..c9d9464 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthDTO.java @@ -1,10 +1,9 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.OrgBaseDTO; +import com.senmesh.common.dto.OrgBaseDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthOperateDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthOperateDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthOperateDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthOperateDTO.java index 29cc9c7..5a83265 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthOperateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthQueryDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthQueryDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthQueryDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthQueryDTO.java index 70eaa64..cf4c73b 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/DomainAuthQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/DomainAuthQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/DomainDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/DomainDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/sys/dto/DomainDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/DomainDTO.java index af967e0..ff4b3ce 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/DomainDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/DomainDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.OrgBaseDTO; +import com.senmesh.common.dto.OrgBaseDTO; import io.swagger.annotations.ApiModel; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/DomainOperateDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/DomainOperateDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/sys/dto/DomainOperateDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/DomainOperateDTO.java index 744d5fa..9663fb1 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/DomainOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/DomainOperateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/DomainQueryDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/DomainQueryDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/sys/dto/DomainQueryDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/DomainQueryDTO.java index 0f7078a..94822d6 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/DomainQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/DomainQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/DomainSettingBannerOperateDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/DomainSettingBannerOperateDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/sys/dto/DomainSettingBannerOperateDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/DomainSettingBannerOperateDTO.java index 003c8ee..4a00245 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/DomainSettingBannerOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/DomainSettingBannerOperateDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/DomainSettingQuickOperateDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/DomainSettingQuickOperateDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/sys/dto/DomainSettingQuickOperateDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/DomainSettingQuickOperateDTO.java index ee44966..cbf4dfc 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/DomainSettingQuickOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/DomainSettingQuickOperateDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/FaqDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/FaqDTO.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/sys/dto/FaqDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/FaqDTO.java index 319aec3..12e19f6 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/FaqDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/FaqDTO.java @@ -1,11 +1,9 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.dto.OrgBaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/FaqFileDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/FaqFileDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/sys/dto/FaqFileDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/FaqFileDTO.java index 2e28a11..7cb6c15 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/FaqFileDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/FaqFileDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/FaqFileQueryDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/FaqFileQueryDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/sys/dto/FaqFileQueryDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/FaqFileQueryDTO.java index 3445e7a..801d99b 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/FaqFileQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/FaqFileQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/FaqOperateDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/FaqOperateDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/sys/dto/FaqOperateDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/FaqOperateDTO.java index 5057e22..cca1c47 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/FaqOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/FaqOperateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; import java.io.Serializable; -import com.newyetai.common.validation.Create; +import com.senmesh.common.validation.Create; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,9 +10,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/FaqQueryDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/FaqQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/sys/dto/FaqQueryDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/FaqQueryDTO.java index fe79797..647878c 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/FaqQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/FaqQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.PageQueryDTO; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/FeedbackDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/FeedbackDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/sys/dto/FeedbackDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/FeedbackDTO.java index 7de9647..4fd7cb1 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/FeedbackDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/FeedbackDTO.java @@ -1,7 +1,6 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.dto.OrgBaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/FeedbackOperateDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/FeedbackOperateDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/sys/dto/FeedbackOperateDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/FeedbackOperateDTO.java index 7228270..aa7fa6b 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/FeedbackOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/FeedbackOperateDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.common.validation.annotation.Phone; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.common.validation.annotation.Phone; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/FeedbackQueryDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/FeedbackQueryDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/sys/dto/FeedbackQueryDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/FeedbackQueryDTO.java index d30f662..b539b77 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/FeedbackQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/FeedbackQueryDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/PlatformDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/PlatformDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/sys/dto/PlatformDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/PlatformDTO.java index f9135c6..c6857cc 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/PlatformDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/PlatformDTO.java @@ -1,11 +1,9 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.dto.OrgBaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/PlatformOperateDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/PlatformOperateDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/sys/dto/PlatformOperateDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/PlatformOperateDTO.java index 6f1fd5a..805a14c 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/PlatformOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/PlatformOperateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; import java.io.Serializable; @@ -9,9 +9,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/PlatformPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/PlatformPageQueryDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/sys/dto/PlatformPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/PlatformPageQueryDTO.java index ed304a6..448816a 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/PlatformPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/PlatformPageQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/sys/dto/PlatformQueryDTO.java b/src/main/java/com/senmesh/usercenter/sys/dto/PlatformQueryDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/sys/dto/PlatformQueryDTO.java rename to src/main/java/com/senmesh/usercenter/sys/dto/PlatformQueryDTO.java index 3d4c147..a6f2a35 100644 --- a/src/main/java/com/newyetai/usercenter/sys/dto/PlatformQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/sys/dto/PlatformQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.sys.dto; +package com.senmesh.usercenter.sys.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/sys/entity/Domain.java b/src/main/java/com/senmesh/usercenter/sys/entity/Domain.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/sys/entity/Domain.java rename to src/main/java/com/senmesh/usercenter/sys/entity/Domain.java index a3fe197..9fe89fa 100644 --- a/src/main/java/com/newyetai/usercenter/sys/entity/Domain.java +++ b/src/main/java/com/senmesh/usercenter/sys/entity/Domain.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.sys.entity; +package com.senmesh.usercenter.sys.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.OrgBaseEntity; +import com.senmesh.common.entity.OrgBaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/sys/entity/DomainAuth.java b/src/main/java/com/senmesh/usercenter/sys/entity/DomainAuth.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/sys/entity/DomainAuth.java rename to src/main/java/com/senmesh/usercenter/sys/entity/DomainAuth.java index 8f4189c..aa78b02 100644 --- a/src/main/java/com/newyetai/usercenter/sys/entity/DomainAuth.java +++ b/src/main/java/com/senmesh/usercenter/sys/entity/DomainAuth.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.sys.entity; +package com.senmesh.usercenter.sys.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/sys/entity/DomainSetting.java b/src/main/java/com/senmesh/usercenter/sys/entity/DomainSetting.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/sys/entity/DomainSetting.java rename to src/main/java/com/senmesh/usercenter/sys/entity/DomainSetting.java index 0a58e2a..1756570 100644 --- a/src/main/java/com/newyetai/usercenter/sys/entity/DomainSetting.java +++ b/src/main/java/com/senmesh/usercenter/sys/entity/DomainSetting.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.sys.entity; +package com.senmesh.usercenter.sys.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/com/newyetai/usercenter/sys/entity/Faq.java b/src/main/java/com/senmesh/usercenter/sys/entity/Faq.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/sys/entity/Faq.java rename to src/main/java/com/senmesh/usercenter/sys/entity/Faq.java index 01a184b..1d8c9de 100644 --- a/src/main/java/com/newyetai/usercenter/sys/entity/Faq.java +++ b/src/main/java/com/senmesh/usercenter/sys/entity/Faq.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.sys.entity; +package com.senmesh.usercenter.sys.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/sys/entity/FaqFile.java b/src/main/java/com/senmesh/usercenter/sys/entity/FaqFile.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/sys/entity/FaqFile.java rename to src/main/java/com/senmesh/usercenter/sys/entity/FaqFile.java index f1d769f..14fd667 100644 --- a/src/main/java/com/newyetai/usercenter/sys/entity/FaqFile.java +++ b/src/main/java/com/senmesh/usercenter/sys/entity/FaqFile.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.sys.entity; +package com.senmesh.usercenter.sys.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/sys/entity/Feedback.java b/src/main/java/com/senmesh/usercenter/sys/entity/Feedback.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/sys/entity/Feedback.java rename to src/main/java/com/senmesh/usercenter/sys/entity/Feedback.java index 7890ee8..ad43096 100644 --- a/src/main/java/com/newyetai/usercenter/sys/entity/Feedback.java +++ b/src/main/java/com/senmesh/usercenter/sys/entity/Feedback.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.sys.entity; +package com.senmesh.usercenter.sys.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.common.validation.annotation.Phone; +import com.senmesh.common.entity.BaseEntity; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.common.validation.annotation.Phone; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/sys/entity/Platform.java b/src/main/java/com/senmesh/usercenter/sys/entity/Platform.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/sys/entity/Platform.java rename to src/main/java/com/senmesh/usercenter/sys/entity/Platform.java index 451b74a..62962b0 100644 --- a/src/main/java/com/newyetai/usercenter/sys/entity/Platform.java +++ b/src/main/java/com/senmesh/usercenter/sys/entity/Platform.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.sys.entity; +package com.senmesh.usercenter.sys.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/sys/mapper/DomainAuthMapper.xml b/src/main/java/com/senmesh/usercenter/sys/mapper/DomainAuthMapper.xml similarity index 82% rename from src/main/java/com/newyetai/usercenter/sys/mapper/DomainAuthMapper.xml rename to src/main/java/com/senmesh/usercenter/sys/mapper/DomainAuthMapper.xml index 26281e9..9f42186 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapper/DomainAuthMapper.xml +++ b/src/main/java/com/senmesh/usercenter/sys/mapper/DomainAuthMapper.xml @@ -2,8 +2,8 @@ - - SELECT da.*, ac.client_name clientName, @@ -20,7 +20,7 @@ and da.domain_id = #{param.domainId} - SELECT ac.id authClientId, ac.client_name clientName, diff --git a/src/main/java/com/newyetai/usercenter/sys/mapper/DomainMapper.xml b/src/main/java/com/senmesh/usercenter/sys/mapper/DomainMapper.xml similarity index 77% rename from src/main/java/com/newyetai/usercenter/sys/mapper/DomainMapper.xml rename to src/main/java/com/senmesh/usercenter/sys/mapper/DomainMapper.xml index faae941..c210320 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapper/DomainMapper.xml +++ b/src/main/java/com/senmesh/usercenter/sys/mapper/DomainMapper.xml @@ -2,8 +2,8 @@ - - select d.*,o.org_name from uc_domain d @@ -20,7 +20,7 @@ and (d.domain_name = #{param.domainOrIp} or d.ip_port = #{param.domainOrIp}) - select d.* from uc_domain d diff --git a/src/main/java/com/newyetai/usercenter/sys/mapper/DomainSettingMapper.xml b/src/main/java/com/senmesh/usercenter/sys/mapper/DomainSettingMapper.xml similarity index 88% rename from src/main/java/com/newyetai/usercenter/sys/mapper/DomainSettingMapper.xml rename to src/main/java/com/senmesh/usercenter/sys/mapper/DomainSettingMapper.xml index ca9296d..80adbd7 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapper/DomainSettingMapper.xml +++ b/src/main/java/com/senmesh/usercenter/sys/mapper/DomainSettingMapper.xml @@ -1,8 +1,8 @@ - + - SELECT ds.id, ds.type, ds.remark, diff --git a/src/main/java/com/newyetai/usercenter/sys/mapper/FaqFileMapper.xml b/src/main/java/com/senmesh/usercenter/sys/mapper/FaqFileMapper.xml similarity index 66% rename from src/main/java/com/newyetai/usercenter/sys/mapper/FaqFileMapper.xml rename to src/main/java/com/senmesh/usercenter/sys/mapper/FaqFileMapper.xml index a33cef6..87a2a06 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapper/FaqFileMapper.xml +++ b/src/main/java/com/senmesh/usercenter/sys/mapper/FaqFileMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_faq_file diff --git a/src/main/java/com/newyetai/usercenter/sys/mapper/FaqMapper.xml b/src/main/java/com/senmesh/usercenter/sys/mapper/FaqMapper.xml similarity index 83% rename from src/main/java/com/newyetai/usercenter/sys/mapper/FaqMapper.xml rename to src/main/java/com/senmesh/usercenter/sys/mapper/FaqMapper.xml index 4dfee6f..236455e 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapper/FaqMapper.xml +++ b/src/main/java/com/senmesh/usercenter/sys/mapper/FaqMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_faq diff --git a/src/main/java/com/newyetai/usercenter/sys/mapper/FeedbackMapper.xml b/src/main/java/com/senmesh/usercenter/sys/mapper/FeedbackMapper.xml similarity index 87% rename from src/main/java/com/newyetai/usercenter/sys/mapper/FeedbackMapper.xml rename to src/main/java/com/senmesh/usercenter/sys/mapper/FeedbackMapper.xml index d1c1752..dbf9bd9 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapper/FeedbackMapper.xml +++ b/src/main/java/com/senmesh/usercenter/sys/mapper/FeedbackMapper.xml @@ -2,8 +2,8 @@ - - select f.*,u.nickname from uc_feedback f left join uc_user u on f.user_id = u.id diff --git a/src/main/java/com/newyetai/usercenter/sys/mapper/PlatformMapper.xml b/src/main/java/com/senmesh/usercenter/sys/mapper/PlatformMapper.xml similarity index 72% rename from src/main/java/com/newyetai/usercenter/sys/mapper/PlatformMapper.xml rename to src/main/java/com/senmesh/usercenter/sys/mapper/PlatformMapper.xml index 2616b49..d6126a5 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapper/PlatformMapper.xml +++ b/src/main/java/com/senmesh/usercenter/sys/mapper/PlatformMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_platform @@ -16,7 +16,7 @@ and business = #{param.business} - select * from uc_platform diff --git a/src/main/java/com/newyetai/usercenter/sys/mapstruct/DomainAuthMapMapper.java b/src/main/java/com/senmesh/usercenter/sys/mapstruct/DomainAuthMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/sys/mapstruct/DomainAuthMapMapper.java rename to src/main/java/com/senmesh/usercenter/sys/mapstruct/DomainAuthMapMapper.java index c6299be..ab3ba2b 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapstruct/DomainAuthMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/mapstruct/DomainAuthMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.sys.mapstruct; +package com.senmesh.usercenter.sys.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.sys.dto.DomainAuthDTO; -import com.newyetai.usercenter.sys.entity.DomainAuth; -import com.newyetai.usercenter.sys.dto.DomainAuthOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainAuthDTO; +import com.senmesh.usercenter.sys.entity.DomainAuth; +import com.senmesh.usercenter.sys.dto.DomainAuthOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/sys/mapstruct/DomainMapMapper.java b/src/main/java/com/senmesh/usercenter/sys/mapstruct/DomainMapMapper.java similarity index 66% rename from src/main/java/com/newyetai/usercenter/sys/mapstruct/DomainMapMapper.java rename to src/main/java/com/senmesh/usercenter/sys/mapstruct/DomainMapMapper.java index d3ce7c9..fd3139a 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapstruct/DomainMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/mapstruct/DomainMapMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.sys.mapstruct; +package com.senmesh.usercenter.sys.mapstruct; -import com.newyetai.usercenter.dto.DomainSettingOperateDTO; -import com.newyetai.usercenter.sys.entity.DomainSetting; +import com.senmesh.usercenter.dto.DomainSettingOperateDTO; +import com.senmesh.usercenter.sys.entity.DomainSetting; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.sys.dto.DomainDTO; -import com.newyetai.usercenter.sys.entity.Domain; -import com.newyetai.usercenter.sys.dto.DomainOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainDTO; +import com.senmesh.usercenter.sys.entity.Domain; +import com.senmesh.usercenter.sys.dto.DomainOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/sys/mapstruct/FaqFileMapMapper.java b/src/main/java/com/senmesh/usercenter/sys/mapstruct/FaqFileMapMapper.java similarity index 63% rename from src/main/java/com/newyetai/usercenter/sys/mapstruct/FaqFileMapMapper.java rename to src/main/java/com/senmesh/usercenter/sys/mapstruct/FaqFileMapMapper.java index 2d0d57c..b5ce384 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapstruct/FaqFileMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/mapstruct/FaqFileMapMapper.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.sys.mapstruct; +package com.senmesh.usercenter.sys.mapstruct; -import com.newyetai.usercenter.sys.dto.FaqFileDTO; -import com.newyetai.usercenter.sys.entity.FaqFile; +import com.senmesh.usercenter.sys.dto.FaqFileDTO; +import com.senmesh.usercenter.sys.entity.FaqFile; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/src/main/java/com/newyetai/usercenter/sys/mapstruct/FaqMapMapper.java b/src/main/java/com/senmesh/usercenter/sys/mapstruct/FaqMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/sys/mapstruct/FaqMapMapper.java rename to src/main/java/com/senmesh/usercenter/sys/mapstruct/FaqMapMapper.java index 465a294..c901bb2 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapstruct/FaqMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/mapstruct/FaqMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.sys.mapstruct; +package com.senmesh.usercenter.sys.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.sys.dto.FaqDTO; -import com.newyetai.usercenter.sys.entity.Faq; -import com.newyetai.usercenter.sys.dto.FaqOperateDTO; +import com.senmesh.usercenter.sys.dto.FaqDTO; +import com.senmesh.usercenter.sys.entity.Faq; +import com.senmesh.usercenter.sys.dto.FaqOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/sys/mapstruct/FeedbackMapMapper.java b/src/main/java/com/senmesh/usercenter/sys/mapstruct/FeedbackMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/sys/mapstruct/FeedbackMapMapper.java rename to src/main/java/com/senmesh/usercenter/sys/mapstruct/FeedbackMapMapper.java index 7d1cb4e..1c5247f 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapstruct/FeedbackMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/mapstruct/FeedbackMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.sys.mapstruct; +package com.senmesh.usercenter.sys.mapstruct; -import com.newyetai.usercenter.sys.dto.FeedbackDTO; -import com.newyetai.usercenter.sys.dto.FeedbackOperateDTO; +import com.senmesh.usercenter.sys.dto.FeedbackDTO; +import com.senmesh.usercenter.sys.dto.FeedbackOperateDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.sys.entity.Feedback; +import com.senmesh.usercenter.sys.entity.Feedback; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/sys/mapstruct/PlatformMapMapper.java b/src/main/java/com/senmesh/usercenter/sys/mapstruct/PlatformMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/sys/mapstruct/PlatformMapMapper.java rename to src/main/java/com/senmesh/usercenter/sys/mapstruct/PlatformMapMapper.java index 4f87f53..19ef2a9 100644 --- a/src/main/java/com/newyetai/usercenter/sys/mapstruct/PlatformMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/sys/mapstruct/PlatformMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.sys.mapstruct; +package com.senmesh.usercenter.sys.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.sys.dto.PlatformDTO; -import com.newyetai.usercenter.sys.entity.Platform; -import com.newyetai.usercenter.sys.dto.PlatformOperateDTO; +import com.senmesh.usercenter.sys.dto.PlatformDTO; +import com.senmesh.usercenter.sys.entity.Platform; +import com.senmesh.usercenter.sys.dto.PlatformOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/sys/service/DomainAuthService.java b/src/main/java/com/senmesh/usercenter/sys/service/DomainAuthService.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/sys/service/DomainAuthService.java rename to src/main/java/com/senmesh/usercenter/sys/service/DomainAuthService.java index 3e95e84..5f8ffd9 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/DomainAuthService.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/DomainAuthService.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.sys.service; +package com.senmesh.usercenter.sys.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.common.validation.Create; -import com.newyetai.usercenter.sys.dto.DomainAuthDTO; -import com.newyetai.usercenter.sys.dto.DomainAuthOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainAuthQueryDTO; -import com.newyetai.usercenter.sys.entity.DomainAuth; +import com.senmesh.common.validation.Create; +import com.senmesh.usercenter.sys.dto.DomainAuthDTO; +import com.senmesh.usercenter.sys.dto.DomainAuthOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainAuthQueryDTO; +import com.senmesh.usercenter.sys.entity.DomainAuth; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/DomainService.java b/src/main/java/com/senmesh/usercenter/sys/service/DomainService.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/sys/service/DomainService.java rename to src/main/java/com/senmesh/usercenter/sys/service/DomainService.java index ed33282..7e74640 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/DomainService.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/DomainService.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.sys.service; +package com.senmesh.usercenter.sys.service; import java.util.List; @@ -7,11 +7,11 @@ import javax.validation.groups.Default; import org.springframework.validation.annotation.Validated; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.sys.dto.DomainDTO; -import com.newyetai.usercenter.sys.dto.DomainOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainQueryDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.usercenter.sys.dto.DomainDTO; +import com.senmesh.usercenter.sys.dto.DomainOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainQueryDTO; /** * 域名 diff --git a/src/main/java/com/newyetai/usercenter/sys/service/DomainSettingService.java b/src/main/java/com/senmesh/usercenter/sys/service/DomainSettingService.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/sys/service/DomainSettingService.java rename to src/main/java/com/senmesh/usercenter/sys/service/DomainSettingService.java index 325c4d2..0e85ab6 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/DomainSettingService.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/DomainSettingService.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.sys.service; +package com.senmesh.usercenter.sys.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.dto.DomainSettingOperateDTO; -import com.newyetai.usercenter.dto.DomainSettingReqDTO; -import com.newyetai.usercenter.dto.DomainSettingResDTO; -import com.newyetai.usercenter.sys.dto.DomainSettingBannerOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainSettingQuickOperateDTO; -import com.newyetai.usercenter.sys.entity.DomainSetting; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.usercenter.dto.DomainSettingOperateDTO; +import com.senmesh.usercenter.dto.DomainSettingReqDTO; +import com.senmesh.usercenter.dto.DomainSettingResDTO; +import com.senmesh.usercenter.sys.dto.DomainSettingBannerOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainSettingQuickOperateDTO; +import com.senmesh.usercenter.sys.entity.DomainSetting; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/FaqFileService.java b/src/main/java/com/senmesh/usercenter/sys/service/FaqFileService.java similarity index 51% rename from src/main/java/com/newyetai/usercenter/sys/service/FaqFileService.java rename to src/main/java/com/senmesh/usercenter/sys/service/FaqFileService.java index 98eb6b3..dc42ca8 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/FaqFileService.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/FaqFileService.java @@ -1,8 +1,7 @@ -package com.newyetai.usercenter.sys.service; +package com.senmesh.usercenter.sys.service; -import com.newyetai.usercenter.sys.dto.FaqFileDTO; -import com.newyetai.usercenter.sys.dto.FaqFileQueryDTO; -import com.newyetai.usercenter.sys.entity.FaqFile; +import com.senmesh.usercenter.sys.dto.FaqFileDTO; +import com.senmesh.usercenter.sys.dto.FaqFileQueryDTO; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/FaqService.java b/src/main/java/com/senmesh/usercenter/sys/service/FaqService.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/sys/service/FaqService.java rename to src/main/java/com/senmesh/usercenter/sys/service/FaqService.java index 84897b2..12f6795 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/FaqService.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/FaqService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.sys.service; +package com.senmesh.usercenter.sys.service; import java.util.List; -import com.newyetai.usercenter.sys.dto.FaqQueryDTO; -import com.newyetai.usercenter.sys.dto.FaqOperateDTO; -import com.newyetai.usercenter.sys.dto.FaqDTO; +import com.senmesh.usercenter.sys.dto.FaqQueryDTO; +import com.senmesh.usercenter.sys.dto.FaqOperateDTO; +import com.senmesh.usercenter.sys.dto.FaqDTO; /** * 常见问题表 diff --git a/src/main/java/com/newyetai/usercenter/sys/service/FeedbackService.java b/src/main/java/com/senmesh/usercenter/sys/service/FeedbackService.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/sys/service/FeedbackService.java rename to src/main/java/com/senmesh/usercenter/sys/service/FeedbackService.java index ed85117..328ea44 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/FeedbackService.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/FeedbackService.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.sys.service; +package com.senmesh.usercenter.sys.service; -import com.newyetai.usercenter.sys.dto.FeedbackDTO; -import com.newyetai.usercenter.sys.dto.FeedbackOperateDTO; -import com.newyetai.usercenter.sys.dto.FeedbackQueryDTO; +import com.senmesh.usercenter.sys.dto.FeedbackDTO; +import com.senmesh.usercenter.sys.dto.FeedbackOperateDTO; +import com.senmesh.usercenter.sys.dto.FeedbackQueryDTO; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/IDomainOrgService.java b/src/main/java/com/senmesh/usercenter/sys/service/IDomainOrgService.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/sys/service/IDomainOrgService.java rename to src/main/java/com/senmesh/usercenter/sys/service/IDomainOrgService.java index 10161a2..d7ac932 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/IDomainOrgService.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/IDomainOrgService.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.sys.service; +package com.senmesh.usercenter.sys.service; import java.util.Set; -import com.newyetai.common.AlitaResult; +import com.senmesh.common.AlitaResult; public interface IDomainOrgService { diff --git a/src/main/java/com/newyetai/usercenter/sys/service/PlatformService.java b/src/main/java/com/senmesh/usercenter/sys/service/PlatformService.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/sys/service/PlatformService.java rename to src/main/java/com/senmesh/usercenter/sys/service/PlatformService.java index fc61581..306d505 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/PlatformService.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/PlatformService.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.sys.service; +package com.senmesh.usercenter.sys.service; -import com.newyetai.usercenter.sys.dto.PlatformDTO; -import com.newyetai.usercenter.sys.dto.PlatformOperateDTO; -import com.newyetai.usercenter.sys.dto.PlatformPageQueryDTO; -import com.newyetai.usercenter.sys.dto.PlatformQueryDTO; +import com.senmesh.usercenter.sys.dto.PlatformDTO; +import com.senmesh.usercenter.sys.dto.PlatformOperateDTO; +import com.senmesh.usercenter.sys.dto.PlatformPageQueryDTO; +import com.senmesh.usercenter.sys.dto.PlatformQueryDTO; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/impl/DomainAuthServiceImpl.java b/src/main/java/com/senmesh/usercenter/sys/service/impl/DomainAuthServiceImpl.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/sys/service/impl/DomainAuthServiceImpl.java rename to src/main/java/com/senmesh/usercenter/sys/service/impl/DomainAuthServiceImpl.java index 553113a..e2cd2cf 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/impl/DomainAuthServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/impl/DomainAuthServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.sys.service.impl; +package com.senmesh.usercenter.sys.service.impl; import java.util.List; import java.util.Objects; @@ -10,17 +10,17 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Sets; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.sys.dao.DomainAuthMapper; -import com.newyetai.usercenter.sys.dto.DomainAuthDTO; -import com.newyetai.usercenter.sys.dto.DomainAuthOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainAuthQueryDTO; -import com.newyetai.usercenter.sys.entity.DomainAuth; -import com.newyetai.usercenter.sys.service.DomainAuthService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.sys.dao.DomainAuthMapper; +import com.senmesh.usercenter.sys.dto.DomainAuthDTO; +import com.senmesh.usercenter.sys.dto.DomainAuthOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainAuthQueryDTO; +import com.senmesh.usercenter.sys.entity.DomainAuth; +import com.senmesh.usercenter.sys.service.DomainAuthService; import cn.hutool.core.date.DateUtil; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/impl/DomainServiceImpl.java b/src/main/java/com/senmesh/usercenter/sys/service/impl/DomainServiceImpl.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/sys/service/impl/DomainServiceImpl.java rename to src/main/java/com/senmesh/usercenter/sys/service/impl/DomainServiceImpl.java index 962abd3..8cfd26b 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/impl/DomainServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/impl/DomainServiceImpl.java @@ -1,19 +1,19 @@ -package com.newyetai.usercenter.sys.service.impl; +package com.senmesh.usercenter.sys.service.impl; import com.google.common.collect.Sets; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.security.util.HostContextHolder; -import com.newyetai.usercenter.sys.dao.DomainMapper; -import com.newyetai.usercenter.sys.dto.DomainDTO; -import com.newyetai.usercenter.sys.dto.DomainOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainQueryDTO; -import com.newyetai.usercenter.sys.entity.Domain; -import com.newyetai.usercenter.sys.mapstruct.DomainMapMapper; -import com.newyetai.usercenter.sys.service.DomainService; -import com.newyetai.usercenter.sys.util.DomainUtils; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.security.util.HostContextHolder; +import com.senmesh.usercenter.sys.dao.DomainMapper; +import com.senmesh.usercenter.sys.dto.DomainDTO; +import com.senmesh.usercenter.sys.dto.DomainOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainQueryDTO; +import com.senmesh.usercenter.sys.entity.Domain; +import com.senmesh.usercenter.sys.mapstruct.DomainMapMapper; +import com.senmesh.usercenter.sys.service.DomainService; +import com.senmesh.usercenter.sys.util.DomainUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/impl/DomainSettingServiceImpl.java b/src/main/java/com/senmesh/usercenter/sys/service/impl/DomainSettingServiceImpl.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/sys/service/impl/DomainSettingServiceImpl.java rename to src/main/java/com/senmesh/usercenter/sys/service/impl/DomainSettingServiceImpl.java index 8301fb1..c423ca3 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/impl/DomainSettingServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/impl/DomainSettingServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.sys.service.impl; +package com.senmesh.usercenter.sys.service.impl; import java.util.ArrayList; @@ -22,26 +22,26 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.exception.util.UUIDUtils; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.security.util.HostContextHolder; -import com.newyetai.usercenter.dto.DomainSettingOperateDTO; -import com.newyetai.usercenter.dto.DomainSettingReqDTO; -import com.newyetai.usercenter.dto.DomainSettingResDTO; -import com.newyetai.usercenter.sys.constant.DomainSettingConstant; -import com.newyetai.usercenter.sys.dao.DomainMapper; -import com.newyetai.usercenter.sys.dao.DomainSettingMapper; -import com.newyetai.usercenter.sys.dto.DomainDTO; -import com.newyetai.usercenter.sys.dto.DomainQueryDTO; -import com.newyetai.usercenter.sys.dto.DomainSettingBannerOperateDTO; -import com.newyetai.usercenter.sys.dto.DomainSettingQuickOperateDTO; -import com.newyetai.usercenter.sys.entity.DomainSetting; -import com.newyetai.usercenter.sys.mapstruct.DomainMapMapper; -import com.newyetai.usercenter.sys.service.DomainService; -import com.newyetai.usercenter.sys.service.DomainSettingService; -import com.newyetai.usercenter.sys.util.DomainUtils; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.exception.util.UUIDUtils; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.security.util.HostContextHolder; +import com.senmesh.usercenter.dto.DomainSettingOperateDTO; +import com.senmesh.usercenter.dto.DomainSettingReqDTO; +import com.senmesh.usercenter.dto.DomainSettingResDTO; +import com.senmesh.usercenter.sys.constant.DomainSettingConstant; +import com.senmesh.usercenter.sys.dao.DomainMapper; +import com.senmesh.usercenter.sys.dao.DomainSettingMapper; +import com.senmesh.usercenter.sys.dto.DomainDTO; +import com.senmesh.usercenter.sys.dto.DomainQueryDTO; +import com.senmesh.usercenter.sys.dto.DomainSettingBannerOperateDTO; +import com.senmesh.usercenter.sys.dto.DomainSettingQuickOperateDTO; +import com.senmesh.usercenter.sys.entity.DomainSetting; +import com.senmesh.usercenter.sys.mapstruct.DomainMapMapper; +import com.senmesh.usercenter.sys.service.DomainService; +import com.senmesh.usercenter.sys.service.DomainSettingService; +import com.senmesh.usercenter.sys.util.DomainUtils; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONArray; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/impl/FaqFileServiceImpl.java b/src/main/java/com/senmesh/usercenter/sys/service/impl/FaqFileServiceImpl.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/sys/service/impl/FaqFileServiceImpl.java rename to src/main/java/com/senmesh/usercenter/sys/service/impl/FaqFileServiceImpl.java index 7afdd50..9244f50 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/impl/FaqFileServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/impl/FaqFileServiceImpl.java @@ -1,14 +1,13 @@ -package com.newyetai.usercenter.sys.service.impl; +package com.senmesh.usercenter.sys.service.impl; -import com.newyetai.usercenter.sys.dao.FaqFileMapper; -import com.newyetai.usercenter.sys.dto.FaqFileDTO; -import com.newyetai.usercenter.sys.dto.FaqFileQueryDTO; -import com.newyetai.usercenter.sys.entity.FaqFile; -import com.newyetai.usercenter.sys.mapstruct.FaqFileMapMapper; -import com.newyetai.usercenter.sys.service.FaqFileService; +import com.senmesh.usercenter.sys.dao.FaqFileMapper; +import com.senmesh.usercenter.sys.dto.FaqFileDTO; +import com.senmesh.usercenter.sys.dto.FaqFileQueryDTO; +import com.senmesh.usercenter.sys.entity.FaqFile; +import com.senmesh.usercenter.sys.mapstruct.FaqFileMapMapper; +import com.senmesh.usercenter.sys.service.FaqFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.Assert; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/impl/FaqServiceImpl.java b/src/main/java/com/senmesh/usercenter/sys/service/impl/FaqServiceImpl.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/sys/service/impl/FaqServiceImpl.java rename to src/main/java/com/senmesh/usercenter/sys/service/impl/FaqServiceImpl.java index 73b562d..ca201f6 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/impl/FaqServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/impl/FaqServiceImpl.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.sys.service.impl; +package com.senmesh.usercenter.sys.service.impl; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.sys.dao.FaqMapper; -import com.newyetai.usercenter.sys.dto.FaqDTO; -import com.newyetai.usercenter.sys.dto.FaqOperateDTO; -import com.newyetai.usercenter.sys.dto.FaqQueryDTO; -import com.newyetai.usercenter.sys.entity.Faq; -import com.newyetai.usercenter.sys.mapstruct.FaqMapMapper; -import com.newyetai.usercenter.sys.service.FaqService; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.sys.dao.FaqMapper; +import com.senmesh.usercenter.sys.dto.FaqDTO; +import com.senmesh.usercenter.sys.dto.FaqOperateDTO; +import com.senmesh.usercenter.sys.dto.FaqQueryDTO; +import com.senmesh.usercenter.sys.entity.Faq; +import com.senmesh.usercenter.sys.mapstruct.FaqMapMapper; +import com.senmesh.usercenter.sys.service.FaqService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/impl/FeedbackServiceImpl.java b/src/main/java/com/senmesh/usercenter/sys/service/impl/FeedbackServiceImpl.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/sys/service/impl/FeedbackServiceImpl.java rename to src/main/java/com/senmesh/usercenter/sys/service/impl/FeedbackServiceImpl.java index 2c09978..ab1835d 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/impl/FeedbackServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/impl/FeedbackServiceImpl.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.sys.service.impl; +package com.senmesh.usercenter.sys.service.impl; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.common.util.SensitiveWordUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.sys.dao.FeedbackMapper; -import com.newyetai.usercenter.sys.dto.FeedbackDTO; -import com.newyetai.usercenter.sys.dto.FeedbackOperateDTO; -import com.newyetai.usercenter.sys.dto.FeedbackQueryDTO; -import com.newyetai.usercenter.sys.entity.Feedback; -import com.newyetai.usercenter.sys.mapstruct.FeedbackMapMapper; -import com.newyetai.usercenter.sys.service.FeedbackService; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.common.util.SensitiveWordUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.sys.dao.FeedbackMapper; +import com.senmesh.usercenter.sys.dto.FeedbackDTO; +import com.senmesh.usercenter.sys.dto.FeedbackOperateDTO; +import com.senmesh.usercenter.sys.dto.FeedbackQueryDTO; +import com.senmesh.usercenter.sys.entity.Feedback; +import com.senmesh.usercenter.sys.mapstruct.FeedbackMapMapper; +import com.senmesh.usercenter.sys.service.FeedbackService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/usercenter/sys/service/impl/PlatformServiceImpl.java b/src/main/java/com/senmesh/usercenter/sys/service/impl/PlatformServiceImpl.java similarity index 66% rename from src/main/java/com/newyetai/usercenter/sys/service/impl/PlatformServiceImpl.java rename to src/main/java/com/senmesh/usercenter/sys/service/impl/PlatformServiceImpl.java index a2d7ada..1761899 100644 --- a/src/main/java/com/newyetai/usercenter/sys/service/impl/PlatformServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/sys/service/impl/PlatformServiceImpl.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.sys.service.impl; +package com.senmesh.usercenter.sys.service.impl; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.sys.dao.PlatformMapper; -import com.newyetai.usercenter.sys.dto.PlatformDTO; -import com.newyetai.usercenter.sys.dto.PlatformOperateDTO; -import com.newyetai.usercenter.sys.dto.PlatformPageQueryDTO; -import com.newyetai.usercenter.sys.dto.PlatformQueryDTO; -import com.newyetai.usercenter.sys.entity.Platform; -import com.newyetai.usercenter.sys.service.PlatformService; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.sys.dao.PlatformMapper; +import com.senmesh.usercenter.sys.dto.PlatformDTO; +import com.senmesh.usercenter.sys.dto.PlatformOperateDTO; +import com.senmesh.usercenter.sys.dto.PlatformPageQueryDTO; +import com.senmesh.usercenter.sys.dto.PlatformQueryDTO; +import com.senmesh.usercenter.sys.entity.Platform; +import com.senmesh.usercenter.sys.service.PlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/usercenter/sys/util/DomainOrgUtils.java b/src/main/java/com/senmesh/usercenter/sys/util/DomainOrgUtils.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/sys/util/DomainOrgUtils.java rename to src/main/java/com/senmesh/usercenter/sys/util/DomainOrgUtils.java index 62ec841..2cbe70c 100644 --- a/src/main/java/com/newyetai/usercenter/sys/util/DomainOrgUtils.java +++ b/src/main/java/com/senmesh/usercenter/sys/util/DomainOrgUtils.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.sys.util; +package com.senmesh.usercenter.sys.util; import java.util.Set; import org.springframework.stereotype.Component; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.sys.service.IDomainOrgService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.sys.service.IDomainOrgService; @Component public class DomainOrgUtils { diff --git a/src/main/java/com/newyetai/usercenter/sys/util/DomainUtils.java b/src/main/java/com/senmesh/usercenter/sys/util/DomainUtils.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/sys/util/DomainUtils.java rename to src/main/java/com/senmesh/usercenter/sys/util/DomainUtils.java index 9ecab57..9d77d22 100644 --- a/src/main/java/com/newyetai/usercenter/sys/util/DomainUtils.java +++ b/src/main/java/com/senmesh/usercenter/sys/util/DomainUtils.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.sys.util; +package com.senmesh.usercenter.sys.util; import org.apache.commons.lang3.StringUtils; -import com.newyetai.security.util.HostContextHolder; +import com.senmesh.security.util.HostContextHolder; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/tag/controller/AnonTagRelationshipController.java b/src/main/java/com/senmesh/usercenter/tag/controller/AnonTagRelationshipController.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/tag/controller/AnonTagRelationshipController.java rename to src/main/java/com/senmesh/usercenter/tag/controller/AnonTagRelationshipController.java index 123bf97..38eb08c 100644 --- a/src/main/java/com/newyetai/usercenter/tag/controller/AnonTagRelationshipController.java +++ b/src/main/java/com/senmesh/usercenter/tag/controller/AnonTagRelationshipController.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.tag.controller; +package com.senmesh.usercenter.tag.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.tag.dto.TagRelationshipMapQueryDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipQueryDTO; -import com.newyetai.usercenter.tag.service.ITagRelationshipService; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.tag.dto.TagRelationshipMapQueryDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipQueryDTO; +import com.senmesh.usercenter.tag.service.ITagRelationshipService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/tag/controller/TagController.java b/src/main/java/com/senmesh/usercenter/tag/controller/TagController.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/tag/controller/TagController.java rename to src/main/java/com/senmesh/usercenter/tag/controller/TagController.java index bd9e2c6..36e0f80 100644 --- a/src/main/java/com/newyetai/usercenter/tag/controller/TagController.java +++ b/src/main/java/com/senmesh/usercenter/tag/controller/TagController.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.tag.controller; +package com.senmesh.usercenter.tag.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.tag.dto.*; -import com.newyetai.usercenter.tag.service.ITagService; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.tag.dto.*; +import com.senmesh.usercenter.tag.service.ITagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/tag/controller/TagRelationshipController.java b/src/main/java/com/senmesh/usercenter/tag/controller/TagRelationshipController.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/tag/controller/TagRelationshipController.java rename to src/main/java/com/senmesh/usercenter/tag/controller/TagRelationshipController.java index cd30d04..469a6a2 100644 --- a/src/main/java/com/newyetai/usercenter/tag/controller/TagRelationshipController.java +++ b/src/main/java/com/senmesh/usercenter/tag/controller/TagRelationshipController.java @@ -1,19 +1,15 @@ -package com.newyetai.usercenter.tag.controller; +package com.senmesh.usercenter.tag.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.tag.dto.TagRelationshipDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipMapQueryDTO; -import com.newyetai.usercenter.tag.service.ITagRelationshipService; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.tag.dto.TagRelationshipDTO; +import com.senmesh.usercenter.tag.service.ITagRelationshipService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.Map; - /** *

* 前端控制器 diff --git a/src/main/java/com/newyetai/usercenter/tag/dao/TagMapper.java b/src/main/java/com/senmesh/usercenter/tag/dao/TagMapper.java similarity index 59% rename from src/main/java/com/newyetai/usercenter/tag/dao/TagMapper.java rename to src/main/java/com/senmesh/usercenter/tag/dao/TagMapper.java index 9c90925..e9aaef2 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dao/TagMapper.java +++ b/src/main/java/com/senmesh/usercenter/tag/dao/TagMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.tag.dao; +package com.senmesh.usercenter.tag.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.usercenter.tag.dto.TagDTO; -import com.newyetai.usercenter.tag.dto.TagPageQueryDTO; -import com.newyetai.usercenter.tag.entity.Tag; +import com.senmesh.usercenter.tag.dto.TagDTO; +import com.senmesh.usercenter.tag.dto.TagPageQueryDTO; +import com.senmesh.usercenter.tag.entity.Tag; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/tag/dao/TagRelationshipMapper.java b/src/main/java/com/senmesh/usercenter/tag/dao/TagRelationshipMapper.java similarity index 58% rename from src/main/java/com/newyetai/usercenter/tag/dao/TagRelationshipMapper.java rename to src/main/java/com/senmesh/usercenter/tag/dao/TagRelationshipMapper.java index 2cffdef..762d19b 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dao/TagRelationshipMapper.java +++ b/src/main/java/com/senmesh/usercenter/tag/dao/TagRelationshipMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.tag.dao; +package com.senmesh.usercenter.tag.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.newyetai.usercenter.tag.dto.HrOperatingPostDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipInfoDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipMapQueryDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipQueryDTO; -import com.newyetai.usercenter.tag.entity.TagRelationship; +import com.senmesh.usercenter.tag.dto.HrOperatingPostDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipInfoDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipMapQueryDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipQueryDTO; +import com.senmesh.usercenter.tag.entity.TagRelationship; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/HrOperatingPostDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/HrOperatingPostDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/tag/dto/HrOperatingPostDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/HrOperatingPostDTO.java index fba844d..6f7e5a6 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/HrOperatingPostDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/HrOperatingPostDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagBatchCreateDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagBatchCreateDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagBatchCreateDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagBatchCreateDTO.java index ce2d90f..20ebf29 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagBatchCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagBatchCreateDTO.java @@ -1,12 +1,11 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagCreateDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagCreateDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagCreateDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagCreateDTO.java index 8a7a62a..f3ea62d 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagCreateDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagDTO.java index f122c89..2d70c9b 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagPageQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagPageQueryDTO.java index 54addfb..79b8c90 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagPageQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipDTO.java index 37efeee..9a20e18 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipInfoDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipInfoDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipInfoDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipInfoDTO.java index 9991d4b..5ebdc8e 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipMapQueryDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipMapQueryDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipMapQueryDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipMapQueryDTO.java index 1bbce4a..5a14654 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipMapQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipMapQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipQueryDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipQueryDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipQueryDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipQueryDTO.java index 81742b5..0808a58 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagRelationshipQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagRelationshipQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/tag/dto/TagUpdateDTO.java b/src/main/java/com/senmesh/usercenter/tag/dto/TagUpdateDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/tag/dto/TagUpdateDTO.java rename to src/main/java/com/senmesh/usercenter/tag/dto/TagUpdateDTO.java index 1c5c754..2941f25 100644 --- a/src/main/java/com/newyetai/usercenter/tag/dto/TagUpdateDTO.java +++ b/src/main/java/com/senmesh/usercenter/tag/dto/TagUpdateDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.tag.dto; +package com.senmesh.usercenter.tag.dto; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/tag/entity/Tag.java b/src/main/java/com/senmesh/usercenter/tag/entity/Tag.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/tag/entity/Tag.java rename to src/main/java/com/senmesh/usercenter/tag/entity/Tag.java index 0298e6b..b0a6e12 100644 --- a/src/main/java/com/newyetai/usercenter/tag/entity/Tag.java +++ b/src/main/java/com/senmesh/usercenter/tag/entity/Tag.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.tag.entity; +package com.senmesh.usercenter.tag.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/com/newyetai/usercenter/tag/entity/TagRelationship.java b/src/main/java/com/senmesh/usercenter/tag/entity/TagRelationship.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/tag/entity/TagRelationship.java rename to src/main/java/com/senmesh/usercenter/tag/entity/TagRelationship.java index 55bf7b1..64b2676 100644 --- a/src/main/java/com/newyetai/usercenter/tag/entity/TagRelationship.java +++ b/src/main/java/com/senmesh/usercenter/tag/entity/TagRelationship.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.tag.entity; +package com.senmesh.usercenter.tag.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.*; import lombok.experimental.Accessors; diff --git a/src/main/java/com/newyetai/usercenter/tag/enums/SourceTypeEnum.java b/src/main/java/com/senmesh/usercenter/tag/enums/SourceTypeEnum.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/tag/enums/SourceTypeEnum.java rename to src/main/java/com/senmesh/usercenter/tag/enums/SourceTypeEnum.java index ae60454..fd025da 100644 --- a/src/main/java/com/newyetai/usercenter/tag/enums/SourceTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/tag/enums/SourceTypeEnum.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.tag.enums; +package com.senmesh.usercenter.tag.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; /** diff --git a/src/main/java/com/newyetai/usercenter/tag/enums/TagTypeEnum.java b/src/main/java/com/senmesh/usercenter/tag/enums/TagTypeEnum.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/tag/enums/TagTypeEnum.java rename to src/main/java/com/senmesh/usercenter/tag/enums/TagTypeEnum.java index 0233330..a76400d 100644 --- a/src/main/java/com/newyetai/usercenter/tag/enums/TagTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/tag/enums/TagTypeEnum.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.tag.enums; +package com.senmesh.usercenter.tag.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.newyetai.mybatis.handle.BaseEnum; +import com.senmesh.mybatis.handle.BaseEnum; /** diff --git a/src/main/java/com/newyetai/usercenter/tag/mapper/TagMapper.xml b/src/main/java/com/senmesh/usercenter/tag/mapper/TagMapper.xml similarity index 79% rename from src/main/java/com/newyetai/usercenter/tag/mapper/TagMapper.xml rename to src/main/java/com/senmesh/usercenter/tag/mapper/TagMapper.xml index 54f6f90..de82574 100644 --- a/src/main/java/com/newyetai/usercenter/tag/mapper/TagMapper.xml +++ b/src/main/java/com/senmesh/usercenter/tag/mapper/TagMapper.xml @@ -1,8 +1,8 @@ - + - select t.* from xs_tag t where t.deleted = 0 diff --git a/src/main/java/com/newyetai/usercenter/tag/mapper/TagRelationshipMapper.xml b/src/main/java/com/senmesh/usercenter/tag/mapper/TagRelationshipMapper.xml similarity index 86% rename from src/main/java/com/newyetai/usercenter/tag/mapper/TagRelationshipMapper.xml rename to src/main/java/com/senmesh/usercenter/tag/mapper/TagRelationshipMapper.xml index 40d7cb1..03e67c0 100644 --- a/src/main/java/com/newyetai/usercenter/tag/mapper/TagRelationshipMapper.xml +++ b/src/main/java/com/senmesh/usercenter/tag/mapper/TagRelationshipMapper.xml @@ -1,6 +1,6 @@ - + update hr_operating_post set update_time = now(), @@ -10,14 +10,14 @@ and id = #{id} - select id, affiliation_tags affiliationTags from hr_operating_post where deleted = 0 and id = #{id} - SELECT tr.id, t.tag_name, diff --git a/src/main/java/com/newyetai/usercenter/tag/mapstruct/TagMapMapper.java b/src/main/java/com/senmesh/usercenter/tag/mapstruct/TagMapMapper.java similarity index 59% rename from src/main/java/com/newyetai/usercenter/tag/mapstruct/TagMapMapper.java rename to src/main/java/com/senmesh/usercenter/tag/mapstruct/TagMapMapper.java index e999e8c..6b0b968 100644 --- a/src/main/java/com/newyetai/usercenter/tag/mapstruct/TagMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/tag/mapstruct/TagMapMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.tag.mapstruct; +package com.senmesh.usercenter.tag.mapstruct; -import com.newyetai.usercenter.tag.dto.TagCreateDTO; -import com.newyetai.usercenter.tag.dto.TagDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipDTO; -import com.newyetai.usercenter.tag.entity.Tag; -import com.newyetai.usercenter.tag.entity.TagRelationship; +import com.senmesh.usercenter.tag.dto.TagCreateDTO; +import com.senmesh.usercenter.tag.dto.TagDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipDTO; +import com.senmesh.usercenter.tag.entity.Tag; +import com.senmesh.usercenter.tag.entity.TagRelationship; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/src/main/java/com/newyetai/usercenter/tag/service/ITagRelationshipService.java b/src/main/java/com/senmesh/usercenter/tag/service/ITagRelationshipService.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/tag/service/ITagRelationshipService.java rename to src/main/java/com/senmesh/usercenter/tag/service/ITagRelationshipService.java index 798815d..bb8f729 100644 --- a/src/main/java/com/newyetai/usercenter/tag/service/ITagRelationshipService.java +++ b/src/main/java/com/senmesh/usercenter/tag/service/ITagRelationshipService.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.tag.service; +package com.senmesh.usercenter.tag.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.usercenter.tag.dto.TagBatchCreateDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipMapQueryDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipQueryDTO; -import com.newyetai.usercenter.tag.entity.TagRelationship; +import com.senmesh.usercenter.tag.dto.TagBatchCreateDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipMapQueryDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipQueryDTO; +import com.senmesh.usercenter.tag.entity.TagRelationship; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/usercenter/tag/service/ITagService.java b/src/main/java/com/senmesh/usercenter/tag/service/ITagService.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/tag/service/ITagService.java rename to src/main/java/com/senmesh/usercenter/tag/service/ITagService.java index a2b4d3c..c8578ea 100644 --- a/src/main/java/com/newyetai/usercenter/tag/service/ITagService.java +++ b/src/main/java/com/senmesh/usercenter/tag/service/ITagService.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.tag.service; +package com.senmesh.usercenter.tag.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.newyetai.usercenter.tag.dto.*; -import com.newyetai.usercenter.tag.entity.Tag; +import com.senmesh.usercenter.tag.dto.*; +import com.senmesh.usercenter.tag.entity.Tag; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/usercenter/tag/service/impl/ITagRelationshipServiceImpl.java b/src/main/java/com/senmesh/usercenter/tag/service/impl/ITagRelationshipServiceImpl.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/tag/service/impl/ITagRelationshipServiceImpl.java rename to src/main/java/com/senmesh/usercenter/tag/service/impl/ITagRelationshipServiceImpl.java index 6b6d70c..8903303 100644 --- a/src/main/java/com/newyetai/usercenter/tag/service/impl/ITagRelationshipServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/tag/service/impl/ITagRelationshipServiceImpl.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.tag.service.impl; +package com.senmesh.usercenter.tag.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.newyetai.usercenter.tag.dao.TagRelationshipMapper; -import com.newyetai.usercenter.tag.dto.*; -import com.newyetai.usercenter.tag.entity.TagRelationship; -import com.newyetai.usercenter.tag.mapstruct.TagMapMapper; -import com.newyetai.usercenter.tag.service.ITagRelationshipService; +import com.senmesh.usercenter.tag.dao.TagRelationshipMapper; +import com.senmesh.usercenter.tag.dto.*; +import com.senmesh.usercenter.tag.entity.TagRelationship; +import com.senmesh.usercenter.tag.mapstruct.TagMapMapper; +import com.senmesh.usercenter.tag.service.ITagRelationshipService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/tag/service/impl/ITagServiceImpl.java b/src/main/java/com/senmesh/usercenter/tag/service/impl/ITagServiceImpl.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/tag/service/impl/ITagServiceImpl.java rename to src/main/java/com/senmesh/usercenter/tag/service/impl/ITagServiceImpl.java index 988c488..122ce55 100644 --- a/src/main/java/com/newyetai/usercenter/tag/service/impl/ITagServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/tag/service/impl/ITagServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.tag.service.impl; +package com.senmesh.usercenter.tag.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -17,18 +17,18 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.tag.dao.TagMapper; -import com.newyetai.usercenter.tag.dto.TagBatchCreateDTO; -import com.newyetai.usercenter.tag.dto.TagCreateDTO; -import com.newyetai.usercenter.tag.dto.TagDTO; -import com.newyetai.usercenter.tag.dto.TagPageQueryDTO; -import com.newyetai.usercenter.tag.dto.TagRelationshipDTO; -import com.newyetai.usercenter.tag.dto.TagUpdateDTO; -import com.newyetai.usercenter.tag.entity.Tag; -import com.newyetai.usercenter.tag.mapstruct.TagMapMapper; -import com.newyetai.usercenter.tag.service.ITagRelationshipService; -import com.newyetai.usercenter.tag.service.ITagService; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.tag.dao.TagMapper; +import com.senmesh.usercenter.tag.dto.TagBatchCreateDTO; +import com.senmesh.usercenter.tag.dto.TagCreateDTO; +import com.senmesh.usercenter.tag.dto.TagDTO; +import com.senmesh.usercenter.tag.dto.TagPageQueryDTO; +import com.senmesh.usercenter.tag.dto.TagRelationshipDTO; +import com.senmesh.usercenter.tag.dto.TagUpdateDTO; +import com.senmesh.usercenter.tag.entity.Tag; +import com.senmesh.usercenter.tag.mapstruct.TagMapMapper; +import com.senmesh.usercenter.tag.service.ITagRelationshipService; +import com.senmesh.usercenter.tag.service.ITagService; import cn.hutool.core.date.DateUtil; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/constant/UserBizAuthStatusEnum.java b/src/main/java/com/senmesh/usercenter/user/constant/UserBizAuthStatusEnum.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/constant/UserBizAuthStatusEnum.java rename to src/main/java/com/senmesh/usercenter/user/constant/UserBizAuthStatusEnum.java index c490665..f59fbde 100644 --- a/src/main/java/com/newyetai/usercenter/user/constant/UserBizAuthStatusEnum.java +++ b/src/main/java/com/senmesh/usercenter/user/constant/UserBizAuthStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.constant; +package com.senmesh.usercenter.user.constant; /** * 用户类型 diff --git a/src/main/java/com/newyetai/usercenter/user/constant/UserCancelConstants.java b/src/main/java/com/senmesh/usercenter/user/constant/UserCancelConstants.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/constant/UserCancelConstants.java rename to src/main/java/com/senmesh/usercenter/user/constant/UserCancelConstants.java index f931689..35ca226 100644 --- a/src/main/java/com/newyetai/usercenter/user/constant/UserCancelConstants.java +++ b/src/main/java/com/senmesh/usercenter/user/constant/UserCancelConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.constant; +package com.senmesh.usercenter.user.constant; /** diff --git a/src/main/java/com/newyetai/usercenter/user/constant/UserConfigConstants.java b/src/main/java/com/senmesh/usercenter/user/constant/UserConfigConstants.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/user/constant/UserConfigConstants.java rename to src/main/java/com/senmesh/usercenter/user/constant/UserConfigConstants.java index 769014e..1f030d4 100644 --- a/src/main/java/com/newyetai/usercenter/user/constant/UserConfigConstants.java +++ b/src/main/java/com/senmesh/usercenter/user/constant/UserConfigConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.constant; +package com.senmesh.usercenter.user.constant; /** * @author sr on 2021-08-12 diff --git a/src/main/java/com/newyetai/usercenter/user/constant/UserIdentityPhotoConstants.java b/src/main/java/com/senmesh/usercenter/user/constant/UserIdentityPhotoConstants.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/constant/UserIdentityPhotoConstants.java rename to src/main/java/com/senmesh/usercenter/user/constant/UserIdentityPhotoConstants.java index eec3503..4401d7c 100644 --- a/src/main/java/com/newyetai/usercenter/user/constant/UserIdentityPhotoConstants.java +++ b/src/main/java/com/senmesh/usercenter/user/constant/UserIdentityPhotoConstants.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.constant; +package com.senmesh.usercenter.user.constant; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/user/constant/UserStatusEnum.java b/src/main/java/com/senmesh/usercenter/user/constant/UserStatusEnum.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/constant/UserStatusEnum.java rename to src/main/java/com/senmesh/usercenter/user/constant/UserStatusEnum.java index 497a6ff..8f56b5c 100644 --- a/src/main/java/com/newyetai/usercenter/user/constant/UserStatusEnum.java +++ b/src/main/java/com/senmesh/usercenter/user/constant/UserStatusEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.constant; +package com.senmesh.usercenter.user.constant; /** * 用户类型 diff --git a/src/main/java/com/newyetai/usercenter/user/constant/UserTypeEnum.java b/src/main/java/com/senmesh/usercenter/user/constant/UserTypeEnum.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/constant/UserTypeEnum.java rename to src/main/java/com/senmesh/usercenter/user/constant/UserTypeEnum.java index 676bbb9..89b3bcf 100644 --- a/src/main/java/com/newyetai/usercenter/user/constant/UserTypeEnum.java +++ b/src/main/java/com/senmesh/usercenter/user/constant/UserTypeEnum.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.constant; +package com.senmesh.usercenter.user.constant; import java.util.Map; import com.google.common.collect.Maps; -import com.newyetai.common.exception.util.Assert; +import com.senmesh.common.exception.util.Assert; /** * 用户类型 diff --git a/src/main/java/com/newyetai/usercenter/user/controller/OrgUserController.java b/src/main/java/com/senmesh/usercenter/user/controller/OrgUserController.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/user/controller/OrgUserController.java rename to src/main/java/com/senmesh/usercenter/user/controller/OrgUserController.java index 385e868..40be2a5 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/OrgUserController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/OrgUserController.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.Create; -import com.newyetai.security.jwt.JwtTokenUtils; -import com.newyetai.usercenter.user.dto.OrgUserInfoDTO; -import com.newyetai.usercenter.user.dto.OrgUserInfoQueryDTO; -import com.newyetai.usercenter.user.dto.OrgUserOperateDTO; -import com.newyetai.usercenter.user.login.dto.OrgDetailDTO; -import com.newyetai.usercenter.user.service.OrgUserService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.Create; +import com.senmesh.security.jwt.JwtTokenUtils; +import com.senmesh.usercenter.user.dto.OrgUserInfoDTO; +import com.senmesh.usercenter.user.dto.OrgUserInfoQueryDTO; +import com.senmesh.usercenter.user.dto.OrgUserOperateDTO; +import com.senmesh.usercenter.user.login.dto.OrgDetailDTO; +import com.senmesh.usercenter.user.service.OrgUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserAuthController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserAuthController.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/user/controller/UserAuthController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserAuthController.java index d584777..ffdd94c 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserAuthController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserAuthController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -10,15 +10,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.validation.annotation.Validated; -import com.newyetai.common.validation.Update; -import com.newyetai.common.AlitaResult; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.user.dto.UserAuthQueryDTO; -import com.newyetai.usercenter.user.service.UserAuthService; -import com.newyetai.usercenter.user.dto.UserAuthDTO; -import com.newyetai.usercenter.user.dto.UserAuthOperateDTO; +import com.senmesh.common.validation.Update; +import com.senmesh.common.AlitaResult; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.user.dto.UserAuthQueryDTO; +import com.senmesh.usercenter.user.service.UserAuthService; +import com.senmesh.usercenter.user.dto.UserAuthDTO; +import com.senmesh.usercenter.user.dto.UserAuthOperateDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserBankAccountController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserBankAccountController.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/controller/UserBankAccountController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserBankAccountController.java index 397059f..6bf8ee9 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserBankAccountController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserBankAccountController.java @@ -1,11 +1,10 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PutMapping; @@ -14,12 +13,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.dto.UserBankAccountDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountModifyDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountQueryDTO; -import com.newyetai.usercenter.user.service.UserBankAccountService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.dto.UserBankAccountDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountModifyDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountQueryDTO; +import com.senmesh.usercenter.user.service.UserBankAccountService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserCancelController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserCancelController.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/user/controller/UserCancelController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserCancelController.java index 840578c..0aba2ce 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserCancelController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserCancelController.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.user.dto.UserCancelApplyReqDTO; -import com.newyetai.usercenter.user.dto.UserCancelDTO; -import com.newyetai.usercenter.user.dto.UserCancelPageQueryDTO; -import com.newyetai.usercenter.user.service.UserCancelService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.user.dto.UserCancelApplyReqDTO; +import com.senmesh.usercenter.user.dto.UserCancelDTO; +import com.senmesh.usercenter.user.dto.UserCancelPageQueryDTO; +import com.senmesh.usercenter.user.service.UserCancelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserConfigController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserConfigController.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/user/controller/UserConfigController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserConfigController.java index 8957cef..c929f33 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserConfigController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserConfigController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.user.dto.UserConfigDTO; -import com.newyetai.usercenter.user.dto.UserConfigOperateDTO; -import com.newyetai.usercenter.user.dto.UserConfigQueryDTO; -import com.newyetai.usercenter.user.service.UserConfigService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.user.dto.UserConfigDTO; +import com.senmesh.usercenter.user.dto.UserConfigOperateDTO; +import com.senmesh.usercenter.user.dto.UserConfigQueryDTO; +import com.senmesh.usercenter.user.service.UserConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserController.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/controller/UserController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserController.java index 9cef86b..d4bd18d 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserController.java @@ -1,21 +1,21 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.Update; -import com.newyetai.security.dto.UserInfoDTO; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.dto.OrgUserEditDTO; -import com.newyetai.usercenter.dto.SuperResetPasswordDTO; -import com.newyetai.usercenter.user.constant.UserConfigConstants; -import com.newyetai.usercenter.user.dto.*; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; -import com.newyetai.usercenter.user.phone.util.PhoneCodeUtils; -import com.newyetai.usercenter.user.service.UserConfigService; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.Update; +import com.senmesh.security.dto.UserInfoDTO; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.dto.OrgUserEditDTO; +import com.senmesh.usercenter.dto.SuperResetPasswordDTO; +import com.senmesh.usercenter.user.constant.UserConfigConstants; +import com.senmesh.usercenter.user.dto.*; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.util.PhoneCodeUtils; +import com.senmesh.usercenter.user.service.UserConfigService; +import com.senmesh.usercenter.user.service.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserExtensionController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserExtensionController.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/user/controller/UserExtensionController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserExtensionController.java index 61898b5..6706931 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserExtensionController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserExtensionController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -7,13 +7,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.dto.UserExtendStatusDTO; -import com.newyetai.usercenter.user.dto.UserExtensionDTO; -import com.newyetai.usercenter.user.dto.UserExtensionOperateDTO; -import com.newyetai.usercenter.user.service.UserExtensionService; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.dto.UserExtendStatusDTO; +import com.senmesh.usercenter.user.dto.UserExtensionDTO; +import com.senmesh.usercenter.user.dto.UserExtensionOperateDTO; +import com.senmesh.usercenter.user.service.UserExtensionService; +import com.senmesh.usercenter.user.service.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserIdentityPhotoController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserIdentityPhotoController.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/controller/UserIdentityPhotoController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserIdentityPhotoController.java index e93ad1d..5ed45ab 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserIdentityPhotoController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserIdentityPhotoController.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; -import com.newyetai.common.validation.Create; +import com.senmesh.common.validation.Create; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -12,17 +12,16 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.validation.annotation.Validated; -import com.newyetai.common.validation.Update; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoQueryDTO; -import com.newyetai.usercenter.user.service.UserIdentityPhotoService; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoInfoDTO; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoDTO; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoOperateDTO; +import com.senmesh.common.validation.Update; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoQueryDTO; +import com.senmesh.usercenter.user.service.UserIdentityPhotoService; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoInfoDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoOperateDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserPostalInfoController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserPostalInfoController.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/user/controller/UserPostalInfoController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserPostalInfoController.java index cd72a9c..919892f 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserPostalInfoController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserPostalInfoController.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.validation.Update; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.user.dto.UserPostalInfoDTO; -import com.newyetai.usercenter.user.dto.UserPostalInfoOperateDTO; -import com.newyetai.usercenter.user.dto.UserPostalInfoQueryDTO; -import com.newyetai.usercenter.user.service.UserPostalInfoService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.validation.Update; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.user.dto.UserPostalInfoDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoOperateDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoQueryDTO; +import com.senmesh.usercenter.user.service.UserPostalInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/newyetai/usercenter/user/controller/UserRegisterController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserRegisterController.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/user/controller/UserRegisterController.java rename to src/main/java/com/senmesh/usercenter/user/controller/UserRegisterController.java index ba6ec83..4a50fae 100644 --- a/src/main/java/com/newyetai/usercenter/user/controller/UserRegisterController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserRegisterController.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.controller; +package com.senmesh.usercenter.user.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.tkmybatis.pojo.Page; -import com.newyetai.usercenter.user.dto.UserRegisterCodeDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCodeInfoDTO; -import com.newyetai.usercenter.user.dto.UserRegisterInfoDTO; -import com.newyetai.usercenter.user.dto.UserRegisterInfoQueryDTO; -import com.newyetai.usercenter.user.service.UserRegisterService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.tkmybatis.pojo.Page; +import com.senmesh.usercenter.user.dto.UserRegisterCodeDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCodeInfoDTO; +import com.senmesh.usercenter.user.dto.UserRegisterInfoDTO; +import com.senmesh.usercenter.user.dto.UserRegisterInfoQueryDTO; +import com.senmesh.usercenter.user.service.UserRegisterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/user/dao/OrgUserMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/OrgUserMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/dao/OrgUserMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/OrgUserMapper.java index b2eca50..a54536c 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/OrgUserMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/OrgUserMapper.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.dto.OrgUserDTO; -import com.newyetai.usercenter.user.dto.OrgUserInfoDTO; -import com.newyetai.usercenter.user.dto.OrgUserInfoQueryDTO; -import com.newyetai.usercenter.user.dto.OrgUserQueryDTO; -import com.newyetai.usercenter.user.entity.OrgUser; -import com.newyetai.usercenter.user.login.dto.OrgDetailDTO; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.OrgUserDTO; +import com.senmesh.usercenter.user.dto.OrgUserInfoDTO; +import com.senmesh.usercenter.user.dto.OrgUserInfoQueryDTO; +import com.senmesh.usercenter.user.dto.OrgUserQueryDTO; +import com.senmesh.usercenter.user.entity.OrgUser; +import com.senmesh.usercenter.user.login.dto.OrgDetailDTO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserAuthMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserAuthMapper.java similarity index 63% rename from src/main/java/com/newyetai/usercenter/user/dao/UserAuthMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserAuthMapper.java index 5637e31..52d6997 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserAuthMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserAuthMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.user.dto.UserAuthDTO; -import com.newyetai.usercenter.user.dto.UserAuthQueryDTO; -import com.newyetai.usercenter.user.entity.UserAuth; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserAuthDTO; +import com.senmesh.usercenter.user.dto.UserAuthQueryDTO; +import com.senmesh.usercenter.user.entity.UserAuth; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 用户授权中间表 diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserBankAccountMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserBankAccountMapper.java similarity index 53% rename from src/main/java/com/newyetai/usercenter/user/dao/UserBankAccountMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserBankAccountMapper.java index 20bdaf4..297264e 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserBankAccountMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserBankAccountMapper.java @@ -1,14 +1,12 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.dto.UserBankAccountDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountModifyDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountQueryDTO; -import com.newyetai.usercenter.user.entity.UcUserBankAccount; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserBankAccountDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountModifyDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountQueryDTO; +import com.senmesh.usercenter.user.entity.UcUserBankAccount; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; /** *

diff --git a/src/main/java/com/senmesh/usercenter/user/dao/UserBankCardFourVerificationMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserBankCardFourVerificationMapper.java new file mode 100644 index 0000000..1734903 --- /dev/null +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserBankCardFourVerificationMapper.java @@ -0,0 +1,27 @@ +package com.senmesh.usercenter.user.dao; + +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserBankCardFourVerificationDTO; +import com.senmesh.usercenter.user.dto.UserBankCardFourVerificationQueryDTO; +import com.senmesh.usercenter.user.entity.UserBankCardFourVerification; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +/** + * @author czy + * @date 2021-06-23 + */ +public interface UserBankCardFourVerificationMapper extends MyMapper { + + + /** + * 查询 + * + * @param userBankCardFourVerificationQueryDTO + * @return + * @author sr on 2021-08-04 + */ + List listUserBankCardFourVerificationDTO( + @Param("param") UserBankCardFourVerificationQueryDTO userBankCardFourVerificationQueryDTO); + +} diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserBankCardThreeVerificationMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserBankCardThreeVerificationMapper.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/user/dao/UserBankCardThreeVerificationMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserBankCardThreeVerificationMapper.java index 46845b2..c593392 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserBankCardThreeVerificationMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserBankCardThreeVerificationMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.dto.UserBankCardThreeVerificationDTO; -import com.newyetai.usercenter.user.dto.UserBankCardThreeVerificationQueryDTO; -import com.newyetai.usercenter.user.entity.UserBankCardThreeVerification; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserBankCardThreeVerificationDTO; +import com.senmesh.usercenter.user.dto.UserBankCardThreeVerificationQueryDTO; +import com.senmesh.usercenter.user.entity.UserBankCardThreeVerification; /** * @author czy diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserCancelMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserCancelMapper.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/user/dao/UserCancelMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserCancelMapper.java index 79fc3d6..ee16412 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserCancelMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserCancelMapper.java @@ -1,12 +1,11 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.dto.UserCancelDTO; -import com.newyetai.usercenter.user.dto.UserCancelPageQueryDTO; -import com.newyetai.usercenter.user.entity.UserCancel; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserCancelDTO; +import com.senmesh.usercenter.user.dto.UserCancelPageQueryDTO; +import com.senmesh.usercenter.user.entity.UserCancel; import org.apache.ibatis.annotations.Param; -import java.math.BigDecimal; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserConfigMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserConfigMapper.java similarity index 60% rename from src/main/java/com/newyetai/usercenter/user/dao/UserConfigMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserConfigMapper.java index c8f0f9f..45fa518 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserConfigMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserConfigMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.user.dto.UserConfigDTO; -import com.newyetai.usercenter.user.dto.UserConfigQueryDTO; -import com.newyetai.usercenter.user.entity.UserConfig; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserConfigDTO; +import com.senmesh.usercenter.user.dto.UserConfigQueryDTO; +import com.senmesh.usercenter.user.entity.UserConfig; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 用户配置 diff --git a/src/main/java/com/senmesh/usercenter/user/dao/UserExtensionMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserExtensionMapper.java new file mode 100644 index 0000000..3280ccc --- /dev/null +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserExtensionMapper.java @@ -0,0 +1,19 @@ +package com.senmesh.usercenter.user.dao; + +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserExtensionDTO; +import com.senmesh.usercenter.user.entity.UserExtension; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * 用户扩展信息 + * + * @author czy on 2021-06-15 + */ +public interface UserExtensionMapper extends MyMapper { + + @Select("select * from uc_user_extension where deleted = 0 and user_id = #{userId}") + UserExtensionDTO getByUserId(@Param("userId") Long userId); + +} diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserIdentityPhotoMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserIdentityPhotoMapper.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/user/dao/UserIdentityPhotoMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserIdentityPhotoMapper.java index c294042..2d2d469 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserIdentityPhotoMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserIdentityPhotoMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoDTO; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoQueryDTO; -import com.newyetai.usercenter.user.entity.UserIdentityPhoto; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoQueryDTO; +import com.senmesh.usercenter.user.entity.UserIdentityPhoto; +import com.senmesh.tkmybatis.mybatis.MyMapper; import org.apache.ibatis.annotations.Select; /** diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserMapper.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/dao/UserMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserMapper.java index c42f369..f186f6e 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserMapper.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; -import com.newyetai.security.dto.UserInfoDTO; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.dto.*; -import com.newyetai.usercenter.user.entity.User; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.security.dto.UserInfoDTO; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.*; +import com.senmesh.usercenter.user.entity.User; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserPhoneThreeVerificationMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserPhoneThreeVerificationMapper.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/user/dao/UserPhoneThreeVerificationMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserPhoneThreeVerificationMapper.java index 3b0a291..b62b34f 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserPhoneThreeVerificationMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserPhoneThreeVerificationMapper.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; -import com.newyetai.tkmybatis.mybatis.MyMapper; -import com.newyetai.usercenter.user.dto.UserPhoneThreeVerificationDTO; -import com.newyetai.usercenter.user.dto.UserPhoneThreeVerificationQueryDTO; -import com.newyetai.usercenter.user.entity.UserPhoneThreeVerification; +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserPhoneThreeVerificationDTO; +import com.senmesh.usercenter.user.dto.UserPhoneThreeVerificationQueryDTO; +import com.senmesh.usercenter.user.entity.UserPhoneThreeVerification; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserPostalInfoMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserPostalInfoMapper.java similarity index 63% rename from src/main/java/com/newyetai/usercenter/user/dao/UserPostalInfoMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserPostalInfoMapper.java index 0b35e70..1f3085d 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserPostalInfoMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserPostalInfoMapper.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.user.dto.UserPostalInfoDTO; -import com.newyetai.usercenter.user.dto.UserPostalInfoQueryDTO; -import com.newyetai.usercenter.user.entity.UserPostalInfo; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserPostalInfoDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoQueryDTO; +import com.senmesh.usercenter.user.entity.UserPostalInfo; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 用户邮寄信息 diff --git a/src/main/java/com/senmesh/usercenter/user/dao/UserRealNameTwoVerificationMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserRealNameTwoVerificationMapper.java new file mode 100644 index 0000000..640ba65 --- /dev/null +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserRealNameTwoVerificationMapper.java @@ -0,0 +1,12 @@ +package com.senmesh.usercenter.user.dao; + +import com.senmesh.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.entity.UserRealNameTwoVerification; + +/** + * @author fzp + * @date 2021年7月14日10:24:46 + */ +public interface UserRealNameTwoVerificationMapper extends MyMapper { + +} diff --git a/src/main/java/com/newyetai/usercenter/user/dao/UserRegisterMapper.java b/src/main/java/com/senmesh/usercenter/user/dao/UserRegisterMapper.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/user/dao/UserRegisterMapper.java rename to src/main/java/com/senmesh/usercenter/user/dao/UserRegisterMapper.java index 48828d6..a8e7d28 100644 --- a/src/main/java/com/newyetai/usercenter/user/dao/UserRegisterMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/dao/UserRegisterMapper.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.user.dao; +package com.senmesh.usercenter.user.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.newyetai.usercenter.user.dto.UserRegisterDTO; -import com.newyetai.usercenter.user.dto.UserRegisterInfoDTO; -import com.newyetai.usercenter.user.dto.UserRegisterInfoQueryDTO; -import com.newyetai.usercenter.user.dto.UserRegisterQueryDTO; -import com.newyetai.usercenter.user.entity.UserRegister; -import com.newyetai.tkmybatis.mybatis.MyMapper; +import com.senmesh.usercenter.user.dto.UserRegisterDTO; +import com.senmesh.usercenter.user.dto.UserRegisterInfoDTO; +import com.senmesh.usercenter.user.dto.UserRegisterInfoQueryDTO; +import com.senmesh.usercenter.user.dto.UserRegisterQueryDTO; +import com.senmesh.usercenter.user.entity.UserRegister; +import com.senmesh.tkmybatis.mybatis.MyMapper; /** * 用户注册表 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/AuthenticateUserDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/AuthenticateUserDTO.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/dto/AuthenticateUserDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/AuthenticateUserDTO.java index 4c66141..986a202 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/AuthenticateUserDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/AuthenticateUserDTO.java @@ -1,13 +1,11 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.annotation.Phone; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.annotation.Phone; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/BindPhoneDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/BindPhoneDTO.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/user/dto/BindPhoneDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/BindPhoneDTO.java index f2846fa..4243de1 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/BindPhoneDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/BindPhoneDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; +import com.senmesh.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/ChangePhoneDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/ChangePhoneDTO.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/user/dto/ChangePhoneDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/ChangePhoneDTO.java index 45eacb8..eee92c3 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/ChangePhoneDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/ChangePhoneDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; +import com.senmesh.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/ChangePhoneMqDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/ChangePhoneMqDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/user/dto/ChangePhoneMqDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/ChangePhoneMqDTO.java index cba7c7a..71484e5 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/ChangePhoneMqDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/ChangePhoneMqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/CheckSecurityCodeReqDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/CheckSecurityCodeReqDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/dto/CheckSecurityCodeReqDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/CheckSecurityCodeReqDTO.java index 5d6134d..2ef271f 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/CheckSecurityCodeReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/CheckSecurityCodeReqDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.util.ValidateUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.util.ValidateUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/IUserPhoneCode.java b/src/main/java/com/senmesh/usercenter/user/dto/IUserPhoneCode.java similarity index 60% rename from src/main/java/com/newyetai/usercenter/user/dto/IUserPhoneCode.java rename to src/main/java/com/senmesh/usercenter/user/dto/IUserPhoneCode.java index e7bfcf3..21b63f0 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/IUserPhoneCode.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/IUserPhoneCode.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.usercenter.user.phone.dto.ICode; +import com.senmesh.usercenter.user.phone.dto.ICode; /** * 用户短信验证码-验证 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/IUserPhoneCodeSms.java b/src/main/java/com/senmesh/usercenter/user/dto/IUserPhoneCodeSms.java similarity index 74% rename from src/main/java/com/newyetai/usercenter/user/dto/IUserPhoneCodeSms.java rename to src/main/java/com/senmesh/usercenter/user/dto/IUserPhoneCodeSms.java index a07b5e2..013b56c 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/IUserPhoneCodeSms.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/IUserPhoneCodeSms.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; -import com.newyetai.usercenter.user.phone.dto.IPhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; +import com.senmesh.usercenter.user.phone.dto.IPhoneCodeSmsDTO; /** * 用户短信验证码-发送 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/InitUserPasswordDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/InitUserPasswordDTO.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/dto/InitUserPasswordDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/InitUserPasswordDTO.java index b7c7a8c..fc7e01a 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/InitUserPasswordDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/InitUserPasswordDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/ModifyPasswordDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/ModifyPasswordDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/user/dto/ModifyPasswordDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/ModifyPasswordDTO.java index 17bfa67..8899488 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/ModifyPasswordDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/ModifyPasswordDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserCreateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserCreateDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/user/dto/OrgUserCreateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/OrgUserCreateDTO.java index 80b771c..2e31f7e 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserCreateDTO.java @@ -1,10 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import javax.validation.constraints.NotNull; - -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/dto/OrgUserDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/OrgUserDTO.java index c547b3c..f3aa258 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserDTO.java @@ -1,10 +1,9 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.OrgBaseDTO; +import com.senmesh.common.dto.OrgBaseDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserInfoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserInfoDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/user/dto/OrgUserInfoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/OrgUserInfoDTO.java index 9fa9604..cb79533 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserInfoQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserInfoQueryDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/user/dto/OrgUserInfoQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/OrgUserInfoQueryDTO.java index 2351c30..4b1ad4c 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserInfoQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserInfoQueryDTO.java @@ -1,9 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import io.swagger.annotations.ApiModelProperty; import lombok.*; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserModifyDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserModifyDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/user/dto/OrgUserModifyDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/OrgUserModifyDTO.java index 9966f1f..aae2562 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserModifyDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserModifyDTO.java @@ -1,9 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Update; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserOperateDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/dto/OrgUserOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/OrgUserOperateDTO.java index bc2bf63..ec65999 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserOperateDTO.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/OrgUserQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/OrgUserQueryDTO.java index 9d4b23a..096aac4 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/OrgUserQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/OrgUserQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/PersonUserCardCreateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/PersonUserCardCreateDTO.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/dto/PersonUserCardCreateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/PersonUserCardCreateDTO.java index 0cbf685..3dd3c4d 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/PersonUserCardCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/PersonUserCardCreateDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.annotation.Phone; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.annotation.Phone; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/PersonUserCardCreateResultDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/PersonUserCardCreateResultDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/dto/PersonUserCardCreateResultDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/PersonUserCardCreateResultDTO.java index 7b8f8d0..ff6d0b7 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/PersonUserCardCreateResultDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/PersonUserCardCreateResultDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/PersonUserPhoneCreateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/PersonUserPhoneCreateDTO.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/user/dto/PersonUserPhoneCreateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/PersonUserPhoneCreateDTO.java index df24467..bb5a01f 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/PersonUserPhoneCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/PersonUserPhoneCreateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/PlatformUserInfoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/PlatformUserInfoDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/PlatformUserInfoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/PlatformUserInfoDTO.java index d85ffd4..4f37a1c 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/PlatformUserInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/PlatformUserInfoDTO.java @@ -1,8 +1,7 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; -import com.newyetai.usercenter.user.constant.UserStatusEnum; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.usercenter.user.constant.UserStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/PlatformUserInfoReqDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/PlatformUserInfoReqDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/dto/PlatformUserInfoReqDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/PlatformUserInfoReqDTO.java index 61fe4ba..ad0ab02 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/PlatformUserInfoReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/PlatformUserInfoReqDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.PageQueryDTO; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.PageQueryDTO; +import com.senmesh.common.util.UserContextHolder; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/PlatformUserListQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/PlatformUserListQueryDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/dto/PlatformUserListQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/PlatformUserListQueryDTO.java index aba51f0..505e5ff 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/PlatformUserListQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/PlatformUserListQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.common.util.UserContextHolder; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/RealNameTwoResponseDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/RealNameTwoResponseDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/user/dto/RealNameTwoResponseDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/RealNameTwoResponseDTO.java index 316fd86..4a954f8 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/RealNameTwoResponseDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/RealNameTwoResponseDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/ResetPwdDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/ResetPwdDTO.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/user/dto/ResetPwdDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/ResetPwdDTO.java index c5b8225..a328b79 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/ResetPwdDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/ResetPwdDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; -import com.newyetai.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; +import com.senmesh.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/ResetSecurityCodeDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/ResetSecurityCodeDTO.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/user/dto/ResetSecurityCodeDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/ResetSecurityCodeDTO.java index cd6cf65..4bd96d1 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/ResetSecurityCodeDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/ResetSecurityCodeDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; -import com.newyetai.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; +import com.senmesh.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/SelectUserDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/SelectUserDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/dto/SelectUserDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/SelectUserDTO.java index da95548..d8b3f91 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/SelectUserDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/SelectUserDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/SuperChangePhoneDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/SuperChangePhoneDTO.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/user/dto/SuperChangePhoneDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/SuperChangePhoneDTO.java index 5e41302..bc197bb 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/SuperChangePhoneDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/SuperChangePhoneDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/SuperRealNameTwoAuthDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/SuperRealNameTwoAuthDTO.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/user/dto/SuperRealNameTwoAuthDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/SuperRealNameTwoAuthDTO.java index b8d0dbc..6602cc3 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/SuperRealNameTwoAuthDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/SuperRealNameTwoAuthDTO.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.annotation.Phone; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.annotation.Phone; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserAuthDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserAuthDTO.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/dto/UserAuthDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserAuthDTO.java index 83674f8..367246b 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserAuthDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserAuthDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserAuthOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserAuthOperateDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/user/dto/UserAuthOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserAuthOperateDTO.java index 5babaf5..b9d4e40 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserAuthOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserAuthOperateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; @@ -9,9 +9,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserAuthQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserAuthQueryDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/dto/UserAuthQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserAuthQueryDTO.java index 61a8cae..cdeafb2 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserAuthQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserAuthQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; import java.util.Set; @@ -10,7 +10,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountChangeReqDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountChangeReqDTO.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountChangeReqDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountChangeReqDTO.java index a33459b..bee4e50 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountChangeReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountChangeReqDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountCreateReqDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountCreateReqDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountCreateReqDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountCreateReqDTO.java index 8810fea..75f8823 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountCreateReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountCreateReqDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountDTO.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountDTO.java index 90f3ea9..f17c327 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountDTO.java @@ -1,7 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountInfoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountInfoDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountInfoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountInfoDTO.java index b830041..7173b25 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountModifyDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountModifyDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountModifyDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountModifyDTO.java index 657aef0..0c8ab19 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountModifyDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountModifyDTO.java @@ -1,9 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountQueryDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountQueryDTO.java index fbad0b5..3ba42ad 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankAccountQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankAccountQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationDTO.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationDTO.java index 223985e..70f1475 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationDTO.java @@ -1,11 +1,9 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.BaseDTO; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationOperateDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationOperateDTO.java index 47df59c..f3d36ed 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationOperateDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationQueryDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationQueryDTO.java index 720aaad..85edbdd 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardFourVerificationQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardFourVerificationQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationCreateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationCreateDTO.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationCreateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationCreateDTO.java index 3047597..3db8a0d 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationCreateDTO.java @@ -1,10 +1,9 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationDTO.java similarity index 61% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationDTO.java index fa93b86..279aaae 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationDTO.java @@ -1,17 +1,11 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.BaseDTO; -import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.SuperBuilder; -import javax.validation.constraints.NotBlank; - /** * @author czy * @date 2021-06-23 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationOperateDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationOperateDTO.java index 7ae9e92..2c8ad8c 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationOperateDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationQueryDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationQueryDTO.java index 27ed932..3d065cd 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserBankCardThreeVerificationQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserBankCardThreeVerificationQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserCancelApplyReqDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserCancelApplyReqDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/dto/UserCancelApplyReqDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserCancelApplyReqDTO.java index a0d378b..1a35e21 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserCancelApplyReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserCancelApplyReqDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserCancelDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserCancelDTO.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/dto/UserCancelDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserCancelDTO.java index 689e7dd..b19af5b 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserCancelDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserCancelDTO.java @@ -1,14 +1,11 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import java.io.Serializable; - -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserCancelPageQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserCancelPageQueryDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/user/dto/UserCancelPageQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserCancelPageQueryDTO.java index dc1e92b..df8457c 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserCancelPageQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserCancelPageQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import lombok.*; @NoArgsConstructor diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserCancelReqDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserCancelReqDTO.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/dto/UserCancelReqDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserCancelReqDTO.java index 3bf8a13..104c353 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserCancelReqDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserCancelReqDTO.java @@ -1,13 +1,11 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserConfigDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserConfigDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/dto/UserConfigDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserConfigDTO.java index 8a547d7..81ba40b 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserConfigDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserConfigDTO.java @@ -1,11 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserConfigOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserConfigOperateDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/user/dto/UserConfigOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserConfigOperateDTO.java index 82a5eb9..ee6724f 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserConfigOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserConfigOperateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; @@ -12,10 +12,10 @@ import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2021-08-12 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserConfigQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserConfigQueryDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/user/dto/UserConfigQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserConfigQueryDTO.java index 0d3eae8..987ec9b 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserConfigQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserConfigQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2021-08-12 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/user/dto/UserDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserDTO.java index c501916..219fa21 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.newyetai.common.dto.BaseDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserDetailQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserDetailQueryDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/dto/UserDetailQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserDetailQueryDTO.java index 60a8ebd..25c4a0e 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserDetailQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserDetailQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserExtendStatusDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserExtendStatusDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/dto/UserExtendStatusDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserExtendStatusDTO.java index 66209c6..b05f65f 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserExtendStatusDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserExtendStatusDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserExtensionDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserExtensionDTO.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/dto/UserExtensionDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserExtensionDTO.java index ca7c2b7..cee8760 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserExtensionDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserExtensionDTO.java @@ -1,11 +1,9 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserExtensionOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserExtensionOperateDTO.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/user/dto/UserExtensionOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserExtensionOperateDTO.java index ef4fc3b..5f6d9a5 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserExtensionOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserExtensionOperateDTO.java @@ -1,10 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserFactorVerifyDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserFactorVerifyDTO.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/dto/UserFactorVerifyDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserFactorVerifyDTO.java index 286b4a5..7a6cca4 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserFactorVerifyDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserFactorVerifyDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoDTO.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoDTO.java index 5b3d638..b60dc8a 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoDTO.java @@ -1,11 +1,9 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoInfoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoInfoDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoInfoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoInfoDTO.java index e8d8c8d..e694d5f 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoInfoDTO.java @@ -1,13 +1,11 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoOperateDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoOperateDTO.java index a599a27..c1232a0 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoOperateDTO.java @@ -1,8 +1,7 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.Create; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoQueryDTO.java index cc4efc8..63dd8d7 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserIdentityPhotoQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserIdentityPhotoQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserOperateDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/user/dto/UserOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserOperateDTO.java index 4298fff..c9db9b5 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserOperateDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeDTO.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeDTO.java index 5d8a625..814bed4 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeDTO; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeSmsCaptchaDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeSmsCaptchaDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeSmsCaptchaDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeSmsCaptchaDTO.java index ad2c033..6048dca 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeSmsCaptchaDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeSmsCaptchaDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.usercenter.user.phone.dto.CaptchaPhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.dto.CaptchaPhoneCodeSmsDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeSmsDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeSmsDTO.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeSmsDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeSmsDTO.java index 2d9202b..22472c1 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneCodeSmsDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneCodeSmsDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationDTO.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationDTO.java index 74e9d85..e515fc1 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationDTO.java @@ -1,10 +1,9 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.BaseDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationOperateDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationOperateDTO.java index 73ae592..3c16bdb 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationOperateDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationQueryDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationQueryDTO.java index 0922509..ecaf941 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPhoneThreeVerificationQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPhoneThreeVerificationQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoDTO.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoDTO.java index 255147e..73064d5 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoDTO.java @@ -1,22 +1,15 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; - -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.validation.constraints.NotNull; - /** * @author fzp on 2022-01-19 */ diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoOperateDTO.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoOperateDTO.java index 920049d..f4b7804 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoOperateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; -import com.newyetai.common.validation.Create; +import com.senmesh.common.validation.Create; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,9 +10,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author fzp on 2022-01-19 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoQueryDTO.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoQueryDTO.java index 6f5669e..b95b06e 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserPostalInfoQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserPostalInfoQueryDTO.java @@ -1,9 +1,7 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.Update; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -11,9 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; - -import javax.validation.constraints.NotNull; +import com.senmesh.common.dto.PageQueryDTO; /** * @author fzp on 2022-01-19 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserQueryByRoleDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserQueryByRoleDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/dto/UserQueryByRoleDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserQueryByRoleDTO.java index 5feee51..aec4b6f 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserQueryByRoleDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserQueryByRoleDTO.java @@ -1,9 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserQueryDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/dto/UserQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserQueryDTO.java index 4290455..7baa5ea 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRealNameTwoAuthCreateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRealNameTwoAuthCreateDTO.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRealNameTwoAuthCreateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRealNameTwoAuthCreateDTO.java index 97ee069..70cdbb6 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRealNameTwoAuthCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRealNameTwoAuthCreateDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; +import com.senmesh.common.annotation.trimAndUpper.TrimAndUpper; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCodeDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCodeDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCodeDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCodeDTO.java index b6656e4..591c516 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCodeDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCodeDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCodeInfoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCodeInfoDTO.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCodeInfoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCodeInfoDTO.java index 529dd86..c1c6db0 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCodeInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCodeInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCreateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCreateDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCreateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCreateDTO.java index 0fa6d1a..6ff86c2 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterCreateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterCreateDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; import javax.validation.constraints.NotNull; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRegisterDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRegisterDTO.java index eff6b2d..d2f99f8 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterDTO.java @@ -1,12 +1,10 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterInfoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterInfoDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRegisterInfoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRegisterInfoDTO.java index f95ee57..f18637c 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterInfoQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterInfoQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRegisterInfoQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRegisterInfoQueryDTO.java index cc54f78..c25e347 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterInfoQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterInfoQueryDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterOperateDTO.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRegisterOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRegisterOperateDTO.java index 675d4cf..08fbeb2 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterOperateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; @@ -9,9 +9,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; +import com.senmesh.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2021-11-16 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/UserRegisterQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserRegisterQueryDTO.java index 57f04a5..4265eb0 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserRegisterQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserRegisterQueryDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import io.swagger.annotations.ApiModel; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; /** * @author sr on 2021-11-16 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserSelfUpdateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserSelfUpdateDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/dto/UserSelfUpdateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserSelfUpdateDTO.java index ca7245d..07d19f5 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserSelfUpdateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserSelfUpdateDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserSignDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserSignDTO.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/dto/UserSignDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserSignDTO.java index 8832cb7..f73a335 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserSignDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserSignDTO.java @@ -1,8 +1,7 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserSignOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserSignOperateDTO.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/user/dto/UserSignOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserSignOperateDTO.java index 2e9d96c..986cfca 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserSignOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserSignOperateDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.Update; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/UserSignQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/UserSignQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/UserSignQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/UserSignQueryDTO.java index 2fa9388..908aea2 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/UserSignQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/UserSignQueryDTO.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.PageQueryDTO; +import com.senmesh.common.dto.PageQueryDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserBindPhoneDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserBindPhoneDTO.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/dto/WechatUserBindPhoneDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/WechatUserBindPhoneDTO.java index 56327f0..796534a 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserBindPhoneDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserBindPhoneDTO.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; import javax.validation.constraints.NotBlank; -import com.newyetai.common.dto.BaseOperateDTO; -import com.newyetai.common.validation.annotation.Phone; +import com.senmesh.common.dto.BaseOperateDTO; +import com.senmesh.common.validation.annotation.Phone; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/dto/WechatUserDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/WechatUserDTO.java index e0ec103..3154ec9 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserDTO.java @@ -1,7 +1,6 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; -import com.newyetai.common.dto.BaseDTO; -import com.newyetai.usercenter.authority.dto.RoleAllocationDTO; +import com.senmesh.common.dto.BaseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserInfoDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserInfoDTO.java similarity index 96% rename from src/main/java/com/newyetai/usercenter/user/dto/WechatUserInfoDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/WechatUserInfoDTO.java index 3a23d2f..36ae601 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserInfoDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserInfoDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserOperateDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserOperateDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/dto/WechatUserOperateDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/WechatUserOperateDTO.java index 221f5da..8b56fb0 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserOperateDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserOperateDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; @@ -11,9 +11,8 @@ import io.swagger.annotations.ApiModel; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import com.newyetai.common.validation.Update; -import com.newyetai.common.dto.BaseOperateDTO; +import com.senmesh.common.dto.BaseOperateDTO; /** * @author sr on 2021-01-12 diff --git a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserQueryDTO.java b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserQueryDTO.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/dto/WechatUserQueryDTO.java rename to src/main/java/com/senmesh/usercenter/user/dto/WechatUserQueryDTO.java index 56b65a8..7b201f0 100644 --- a/src/main/java/com/newyetai/usercenter/user/dto/WechatUserQueryDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/dto/WechatUserQueryDTO.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.dto; +package com.senmesh.usercenter.user.dto; import java.io.Serializable; -import com.newyetai.common.dto.PageQueryDTO; -import com.newyetai.tkmybatis.pojo.Page; +import com.senmesh.common.dto.PageQueryDTO; +import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/OrgUser.java b/src/main/java/com/senmesh/usercenter/user/entity/OrgUser.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/entity/OrgUser.java rename to src/main/java/com/senmesh/usercenter/user/entity/OrgUser.java index cf3ad04..b9eb5a4 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/OrgUser.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/OrgUser.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import org.apache.ibatis.type.Alias; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.OrgBaseEntity; +import com.senmesh.common.entity.OrgBaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UcUserBankAccount.java b/src/main/java/com/senmesh/usercenter/user/entity/UcUserBankAccount.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/user/entity/UcUserBankAccount.java rename to src/main/java/com/senmesh/usercenter/user/entity/UcUserBankAccount.java index b9efe89..ccd07cb 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UcUserBankAccount.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UcUserBankAccount.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/User.java b/src/main/java/com/senmesh/usercenter/user/entity/User.java similarity index 95% rename from src/main/java/com/newyetai/usercenter/user/entity/User.java rename to src/main/java/com/senmesh/usercenter/user/entity/User.java index 6543637..40bd68a 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/User.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/User.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import java.util.Date; import org.apache.ibatis.type.Alias; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserAuth.java b/src/main/java/com/senmesh/usercenter/user/entity/UserAuth.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/entity/UserAuth.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserAuth.java index 61b1d19..2e2d43b 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserAuth.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserAuth.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserBankCardFourVerification.java b/src/main/java/com/senmesh/usercenter/user/entity/UserBankCardFourVerification.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/entity/UserBankCardFourVerification.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserBankCardFourVerification.java index 78f36f5..a45e83a 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserBankCardFourVerification.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserBankCardFourVerification.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserBankCardThreeVerification.java b/src/main/java/com/senmesh/usercenter/user/entity/UserBankCardThreeVerification.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/entity/UserBankCardThreeVerification.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserBankCardThreeVerification.java index d1b535a..2c16d12 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserBankCardThreeVerification.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserBankCardThreeVerification.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserCancel.java b/src/main/java/com/senmesh/usercenter/user/entity/UserCancel.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/user/entity/UserCancel.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserCancel.java index 6176498..9721345 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserCancel.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserCancel.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserConfig.java b/src/main/java/com/senmesh/usercenter/user/entity/UserConfig.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/user/entity/UserConfig.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserConfig.java index 2dd2646..8282a2b 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserConfig.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserConfig.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserExtension.java b/src/main/java/com/senmesh/usercenter/user/entity/UserExtension.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/entity/UserExtension.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserExtension.java index 9b48654..8060f6f 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserExtension.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserExtension.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserIdentityPhoto.java b/src/main/java/com/senmesh/usercenter/user/entity/UserIdentityPhoto.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/entity/UserIdentityPhoto.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserIdentityPhoto.java index eebe529..3be66d3 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserIdentityPhoto.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserIdentityPhoto.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserPhoneThreeVerification.java b/src/main/java/com/senmesh/usercenter/user/entity/UserPhoneThreeVerification.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/entity/UserPhoneThreeVerification.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserPhoneThreeVerification.java index 906d584..59636ee 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserPhoneThreeVerification.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserPhoneThreeVerification.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserPostalInfo.java b/src/main/java/com/senmesh/usercenter/user/entity/UserPostalInfo.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/entity/UserPostalInfo.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserPostalInfo.java index 4a4cda6..da53f2d 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserPostalInfo.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserPostalInfo.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserRealNameTwoVerification.java b/src/main/java/com/senmesh/usercenter/user/entity/UserRealNameTwoVerification.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/entity/UserRealNameTwoVerification.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserRealNameTwoVerification.java index 01ae174..00b847a 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserRealNameTwoVerification.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserRealNameTwoVerification.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/entity/UserRegister.java b/src/main/java/com/senmesh/usercenter/user/entity/UserRegister.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/entity/UserRegister.java rename to src/main/java/com/senmesh/usercenter/user/entity/UserRegister.java index ed3cb1b..e67a337 100644 --- a/src/main/java/com/newyetai/usercenter/user/entity/UserRegister.java +++ b/src/main/java/com/senmesh/usercenter/user/entity/UserRegister.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.entity; +package com.senmesh.usercenter.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.newyetai.common.entity.BaseEntity; +import com.senmesh.common.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/newyetai/usercenter/user/job/UserCancelJob.java b/src/main/java/com/senmesh/usercenter/user/job/UserCancelJob.java similarity index 100% rename from src/main/java/com/newyetai/usercenter/user/job/UserCancelJob.java rename to src/main/java/com/senmesh/usercenter/user/job/UserCancelJob.java diff --git a/src/main/java/com/newyetai/usercenter/user/login/controller/UserLoginController.java b/src/main/java/com/senmesh/usercenter/user/login/controller/UserLoginController.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/login/controller/UserLoginController.java rename to src/main/java/com/senmesh/usercenter/user/login/controller/UserLoginController.java index e95941f..a75c2c7 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/controller/UserLoginController.java +++ b/src/main/java/com/senmesh/usercenter/user/login/controller/UserLoginController.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.user.login.controller; +package com.senmesh.usercenter.user.login.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.newyetai.common.AlitaResult; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; +import com.senmesh.common.AlitaResult; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginPhoneDTO.java b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginPhoneDTO.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/login/dto/LoginPhoneDTO.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/LoginPhoneDTO.java index 2290780..154eed3 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginPhoneDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginPhoneDTO.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; -import com.newyetai.usercenter.user.dto.UserPhoneCodeDTO; -import com.newyetai.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; +import com.senmesh.usercenter.user.dto.UserPhoneCodeDTO; +import com.senmesh.usercenter.user.phone.constant.UserPhoneCodeOperateEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginPhoneToken.java b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginPhoneToken.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/user/login/dto/LoginPhoneToken.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/LoginPhoneToken.java index 25e2774..4a384b1 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginPhoneToken.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginPhoneToken.java @@ -1,6 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; - -import javax.validation.constraints.NotNull; +package com.senmesh.usercenter.user.login.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginUCardDTO.java b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginUCardDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/login/dto/LoginUCardDTO.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/LoginUCardDTO.java index 0db2bfe..0531eeb 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginUCardDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginUCardDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginUserToken.java b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginUserToken.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/login/dto/LoginUserToken.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/LoginUserToken.java index 9d7d9ff..eb585e6 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginUserToken.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginUserToken.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginUsernamePasswordDTO.java b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginUsernamePasswordDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/login/dto/LoginUsernamePasswordDTO.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/LoginUsernamePasswordDTO.java index 8695575..4d6c72c 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/LoginUsernamePasswordDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/LoginUsernamePasswordDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/OrgDetailDTO.java b/src/main/java/com/senmesh/usercenter/user/login/dto/OrgDetailDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/login/dto/OrgDetailDTO.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/OrgDetailDTO.java index 10a5190..3ff0f0d 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/OrgDetailDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/OrgDetailDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/PhoneToken.java b/src/main/java/com/senmesh/usercenter/user/login/dto/PhoneToken.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/login/dto/PhoneToken.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/PhoneToken.java index 83e906c..2817621 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/PhoneToken.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/PhoneToken.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/TempTokenDTO.java b/src/main/java/com/senmesh/usercenter/user/login/dto/TempTokenDTO.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/login/dto/TempTokenDTO.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/TempTokenDTO.java index 8099393..b213d69 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/TempTokenDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/TempTokenDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/UserDetailDTO.java b/src/main/java/com/senmesh/usercenter/user/login/dto/UserDetailDTO.java similarity index 97% rename from src/main/java/com/newyetai/usercenter/user/login/dto/UserDetailDTO.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/UserDetailDTO.java index 16080a9..8fbb33a 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/UserDetailDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/UserDetailDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/UserDetailSelectDTO.java b/src/main/java/com/senmesh/usercenter/user/login/dto/UserDetailSelectDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/login/dto/UserDetailSelectDTO.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/UserDetailSelectDTO.java index 58230fe..a01a7f6 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/UserDetailSelectDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/UserDetailSelectDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/login/dto/UserToken.java b/src/main/java/com/senmesh/usercenter/user/login/dto/UserToken.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/login/dto/UserToken.java rename to src/main/java/com/senmesh/usercenter/user/login/dto/UserToken.java index fc6a78c..14ed9ef 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/dto/UserToken.java +++ b/src/main/java/com/senmesh/usercenter/user/login/dto/UserToken.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.login.dto; +package com.senmesh.usercenter.user.login.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/newyetai/usercenter/user/login/service/UserLoginService.java b/src/main/java/com/senmesh/usercenter/user/login/service/UserLoginService.java similarity index 55% rename from src/main/java/com/newyetai/usercenter/user/login/service/UserLoginService.java rename to src/main/java/com/senmesh/usercenter/user/login/service/UserLoginService.java index 7398cb3..9d3d4f0 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/service/UserLoginService.java +++ b/src/main/java/com/senmesh/usercenter/user/login/service/UserLoginService.java @@ -1,19 +1,19 @@ -package com.newyetai.usercenter.user.login.service; +package com.senmesh.usercenter.user.login.service; -import com.newyetai.usercenter.user.login.dto.LoginUCardDTO; +import com.senmesh.usercenter.user.login.dto.LoginUCardDTO; import javax.servlet.http.HttpServletRequest; -import com.newyetai.security.service.IUserSecurityService; -import com.newyetai.security.ssb.SsbLoginDTO; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; -import com.newyetai.usercenter.user.login.dto.LoginPhoneDTO; -import com.newyetai.usercenter.user.login.dto.LoginPhoneToken; -import com.newyetai.usercenter.user.login.dto.LoginUserToken; -import com.newyetai.usercenter.user.login.dto.LoginUsernamePasswordDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.security.service.IUserSecurityService; +import com.senmesh.security.ssb.SsbLoginDTO; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.usercenter.user.login.dto.LoginPhoneDTO; +import com.senmesh.usercenter.user.login.dto.LoginPhoneToken; +import com.senmesh.usercenter.user.login.dto.LoginUserToken; +import com.senmesh.usercenter.user.login.dto.LoginUsernamePasswordDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; /** * 用户登录 diff --git a/src/main/java/com/newyetai/usercenter/user/login/service/impl/UserLoginServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/login/service/impl/UserLoginServiceImpl.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/login/service/impl/UserLoginServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/login/service/impl/UserLoginServiceImpl.java index d249cc2..e9d5e91 100644 --- a/src/main/java/com/newyetai/usercenter/user/login/service/impl/UserLoginServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/login/service/impl/UserLoginServiceImpl.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.login.service.impl; +package com.senmesh.usercenter.user.login.service.impl; -import com.newyetai.usercenter.user.login.dto.LoginUCardDTO; +import com.senmesh.usercenter.user.login.dto.LoginUCardDTO; import java.util.List; import java.util.stream.Collectors; @@ -11,58 +11,58 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.ChangeTokenException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.frame.redis.util.RedisUtils; -import com.newyetai.sdk.ssb.constant.SsbConstants; -import com.newyetai.sdk.ssb.dto.SsbAppUserInfoDTO; -import com.newyetai.sdk.ssb.dto.SsbUserDTO; -import com.newyetai.sdk.ssb.dto.SsbUserDataDTO; -import com.newyetai.sdk.ssb.dto.SsbUserReq; -import com.newyetai.sdk.ssb.service.SsbInvoker; -import com.newyetai.security.expection.BadLoginException; -import com.newyetai.security.expection.DuplicateOrgException; -import com.newyetai.security.expection.DuplicateUserException; -import com.newyetai.security.ssb.SsbLoginDTO; -import com.newyetai.security.temptoken.dto.DuplMobileToken; -import com.newyetai.security.temptoken.dto.DuplUserToken; -import com.newyetai.security.temptoken.dto.PhoneTokenCreateDTO; -import com.newyetai.security.temptoken.dto.UserTokenCreateDTO; -import com.newyetai.security.util.PasswordUtils; -import com.newyetai.security.util.SecurityPropertyUtils; -import com.newyetai.usercenter.auth.dto.AuthClientDTO; -import com.newyetai.usercenter.auth.dto.AuthClientQueryDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.auth.service.AuthClientService; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.user.constant.UserStatusEnum; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dao.OrgUserMapper; -import com.newyetai.usercenter.user.dao.UserMapper; -import com.newyetai.usercenter.user.dto.AuthenticateUserDTO; -import com.newyetai.usercenter.user.dto.PersonUserPhoneCreateDTO; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCreateDTO; -import com.newyetai.usercenter.user.entity.User; -import com.newyetai.usercenter.user.login.dto.LoginPhoneDTO; -import com.newyetai.usercenter.user.login.dto.LoginPhoneToken; -import com.newyetai.usercenter.user.login.dto.LoginUserToken; -import com.newyetai.usercenter.user.login.dto.LoginUsernamePasswordDTO; -import com.newyetai.usercenter.user.login.dto.OrgDetailDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailSelectDTO; -import com.newyetai.usercenter.user.login.service.UserLoginService; -import com.newyetai.usercenter.user.mapstruct.UserMapMapper; -import com.newyetai.usercenter.user.phone.util.PhoneCodeUtils; -import com.newyetai.usercenter.user.service.UserRegisterService; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.ChangeTokenException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.frame.redis.util.RedisUtils; +import com.senmesh.sdk.ssb.constant.SsbConstants; +import com.senmesh.sdk.ssb.dto.SsbAppUserInfoDTO; +import com.senmesh.sdk.ssb.dto.SsbUserDTO; +import com.senmesh.sdk.ssb.dto.SsbUserDataDTO; +import com.senmesh.sdk.ssb.dto.SsbUserReq; +import com.senmesh.sdk.ssb.service.SsbInvoker; +import com.senmesh.security.expection.BadLoginException; +import com.senmesh.security.expection.DuplicateOrgException; +import com.senmesh.security.expection.DuplicateUserException; +import com.senmesh.security.ssb.SsbLoginDTO; +import com.senmesh.security.temptoken.dto.DuplMobileToken; +import com.senmesh.security.temptoken.dto.DuplUserToken; +import com.senmesh.security.temptoken.dto.PhoneTokenCreateDTO; +import com.senmesh.security.temptoken.dto.UserTokenCreateDTO; +import com.senmesh.security.util.PasswordUtils; +import com.senmesh.security.util.SecurityPropertyUtils; +import com.senmesh.usercenter.auth.dto.AuthClientDTO; +import com.senmesh.usercenter.auth.dto.AuthClientQueryDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.auth.service.AuthClientService; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.user.constant.UserStatusEnum; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dao.OrgUserMapper; +import com.senmesh.usercenter.user.dao.UserMapper; +import com.senmesh.usercenter.user.dto.AuthenticateUserDTO; +import com.senmesh.usercenter.user.dto.PersonUserPhoneCreateDTO; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCreateDTO; +import com.senmesh.usercenter.user.entity.User; +import com.senmesh.usercenter.user.login.dto.LoginPhoneDTO; +import com.senmesh.usercenter.user.login.dto.LoginPhoneToken; +import com.senmesh.usercenter.user.login.dto.LoginUserToken; +import com.senmesh.usercenter.user.login.dto.LoginUsernamePasswordDTO; +import com.senmesh.usercenter.user.login.dto.OrgDetailDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailSelectDTO; +import com.senmesh.usercenter.user.login.service.UserLoginService; +import com.senmesh.usercenter.user.mapstruct.UserMapMapper; +import com.senmesh.usercenter.user.phone.util.PhoneCodeUtils; +import com.senmesh.usercenter.user.service.UserRegisterService; +import com.senmesh.usercenter.user.service.UserService; /** * 用户登录 diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/OrgUserMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/OrgUserMapper.xml similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/mapper/OrgUserMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/OrgUserMapper.xml index 9828d92..4836603 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/OrgUserMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/OrgUserMapper.xml @@ -3,9 +3,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + namespace="com.senmesh.usercenter.user.dao.OrgUserMapper"> + resultType="com.senmesh.usercenter.user.login.dto.OrgDetailDTO"> SELECT distinct t1.id orgId, @@ -79,7 +79,7 @@ - SELECT ou.org_id, ou.user_id, diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserAuthMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserAuthMapper.xml similarity index 85% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserAuthMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserAuthMapper.xml index 7627df5..b7837ad 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserAuthMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserAuthMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_user_auth diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserBankAccountMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserBankAccountMapper.xml similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserBankAccountMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserBankAccountMapper.xml index 4c8c2a6..51d1072 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserBankAccountMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserBankAccountMapper.xml @@ -2,9 +2,9 @@ - + - SELECT uu.card_no, uuba.* @@ -21,7 +21,7 @@ - SELECT * FROM diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserBankCardFourVerificationMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserBankCardFourVerificationMapper.xml similarity index 87% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserBankCardFourVerificationMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserBankCardFourVerificationMapper.xml index 51ae721..ec34761 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserBankCardFourVerificationMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserBankCardFourVerificationMapper.xml @@ -2,9 +2,9 @@ - + - select * from uc_user_bank_card_four_verification diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserBankCardThreeVerificationMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserBankCardThreeVerificationMapper.xml similarity index 85% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserBankCardThreeVerificationMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserBankCardThreeVerificationMapper.xml index 74e9b88..8993da0 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserBankCardThreeVerificationMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserBankCardThreeVerificationMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_user_bank_card_three_verification diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserCancelMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserCancelMapper.xml similarity index 80% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserCancelMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserCancelMapper.xml index a1b12a5..4eb005c 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserCancelMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserCancelMapper.xml @@ -2,9 +2,9 @@ - + - SELECT ucc.status, uc.nickname, @@ -25,7 +25,7 @@ and (uc.nickname like #{nameLike} or uc.real_name like #{nameLike}) - SELECT ucc.status, uc.nickname, uc.real_name, @@ -38,7 +38,7 @@ AND TO_DAYS( NOW()) - TO_DAYS(ucc.create_time) = 1 - SELECT uc.nickname, uc.real_name, uc.phone, diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserConfigMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserConfigMapper.xml similarity index 75% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserConfigMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserConfigMapper.xml index fc38d3d..17bddcd 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserConfigMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserConfigMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_user_config diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserIdentityPhotoMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserIdentityPhotoMapper.xml similarity index 77% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserIdentityPhotoMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserIdentityPhotoMapper.xml index 0e3390a..4fc89fe 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserIdentityPhotoMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserIdentityPhotoMapper.xml @@ -2,8 +2,8 @@ - - select uip.* from uc_user_identity_photo uip diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserMapper.xml similarity index 92% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserMapper.xml index 5fe442d..0ceaafb 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserMapper.xml @@ -2,7 +2,7 @@ - + update uc_user @@ -13,7 +13,7 @@ and deleted = 0 and status != 3 - select * from ( select (select platform_code from uc_user_register ur where ur.deleted = 0 and ur.user_id = uu.id order by id limit 1) @@ -105,7 +105,7 @@ and (password is null or password = '') - SELECT u.* @@ -162,7 +162,7 @@ - select u.* from uc_user_auth ua @@ -234,7 +234,7 @@ and deleted = 0 and status != 3 - SELECT uu.id AS userId, IFNULL(authenticated,0) AS authenticatedStatus, @@ -250,7 +250,7 @@ uu.deleted = 0 and uu.id = #{userId} - SELECT u.id, case when u.password IS NOT null then u.username else null end username, @@ -334,7 +334,7 @@ ORDER BY u.id DESC - SELECT u.* FROM @@ -361,7 +361,7 @@ and u.phone_binding = 0 - SELECT u.username, u.nickname , u.type as userType, @@ -389,7 +389,7 @@ WHERE username = #{username} and id != #{userId} and deleted = 0 and status != 3 - select u.id,u.nickname,u.phone,u.avatar, ue.wechat_qr_code @@ -401,7 +401,7 @@ - + update uc_user @@ -426,7 +426,7 @@ update uc_user set password = #{password}, update_by = #{operateUserId}, update_time = now() where id = #{userId} - SELECT distinct u.id, u.nickname, u.real_name from uc_user u inner join xs_role_allocation ra on u.id = ra.allocation_id and allocation_type = 1 @@ -438,7 +438,7 @@ and r.platform_code = #{param.platformCode} and r.org_id = #{param.orgId} - SELECT u.id, case when u.password IS NOT null then u.username else null end username, @@ -515,7 +515,7 @@ ORDER BY u.id DESC - select u.id,u.real_name,u.phone from uc_user u left join uc_org_user ou on u.id = ou.user_id and ou.deleted = 0 diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserPhoneThreeVerificationMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserPhoneThreeVerificationMapper.xml similarity index 85% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserPhoneThreeVerificationMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserPhoneThreeVerificationMapper.xml index 49d328d..f940539 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserPhoneThreeVerificationMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserPhoneThreeVerificationMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_user_phone_three_verification diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserPostalInfoMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserPostalInfoMapper.xml similarity index 83% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserPostalInfoMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserPostalInfoMapper.xml index 76d1563..c57cb18 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserPostalInfoMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserPostalInfoMapper.xml @@ -2,11 +2,11 @@ - + update uc_user_postal_info set defaulted = 0 where create_by = #{userId} and id != #{id} and deleted = 0 - select * from uc_user_postal_info diff --git a/src/main/java/com/newyetai/usercenter/user/mapper/UserRegisterMapper.xml b/src/main/java/com/senmesh/usercenter/user/mapper/UserRegisterMapper.xml similarity index 78% rename from src/main/java/com/newyetai/usercenter/user/mapper/UserRegisterMapper.xml rename to src/main/java/com/senmesh/usercenter/user/mapper/UserRegisterMapper.xml index 7ecdbad..106cd82 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapper/UserRegisterMapper.xml +++ b/src/main/java/com/senmesh/usercenter/user/mapper/UserRegisterMapper.xml @@ -2,8 +2,8 @@ - - select * from uc_user_register @@ -20,7 +20,7 @@ - select ur.*, ru.nickname userNickname, diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/OrgUserMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/OrgUserMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/OrgUserMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/OrgUserMapMapper.java index 6b6e006..243b28e 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/OrgUserMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/OrgUserMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.user.dto.OrgUserDTO; -import com.newyetai.usercenter.user.dto.OrgUserOperateDTO; -import com.newyetai.usercenter.user.entity.OrgUser; +import com.senmesh.usercenter.user.dto.OrgUserDTO; +import com.senmesh.usercenter.user.dto.OrgUserOperateDTO; +import com.senmesh.usercenter.user.entity.OrgUser; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserAuthMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserAuthMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/UserAuthMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/UserAuthMapMapper.java index c56ea6a..938a962 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserAuthMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserAuthMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.user.dto.UserAuthDTO; -import com.newyetai.usercenter.user.entity.UserAuth; -import com.newyetai.usercenter.user.dto.UserAuthOperateDTO; +import com.senmesh.usercenter.user.dto.UserAuthDTO; +import com.senmesh.usercenter.user.entity.UserAuth; +import com.senmesh.usercenter.user.dto.UserAuthOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserBankAccountMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserBankAccountMapMapper.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/UserBankAccountMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/UserBankAccountMapMapper.java index 98f6bd1..d8a9050 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserBankAccountMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserBankAccountMapMapper.java @@ -1,12 +1,11 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; -import com.newyetai.usercenter.user.dto.UserBankAccountChangeReqDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountCreateReqDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountInfoDTO; -import com.newyetai.usercenter.user.dto.UserBankCardThreeVerificationCreateDTO; -import com.newyetai.usercenter.user.dto.UserBankCardThreeVerificationDTO; -import com.newyetai.usercenter.user.entity.UcUserBankAccount; +import com.senmesh.usercenter.user.dto.UserBankAccountChangeReqDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountCreateReqDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountInfoDTO; +import com.senmesh.usercenter.user.dto.UserBankCardThreeVerificationCreateDTO; +import com.senmesh.usercenter.user.entity.UcUserBankAccount; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserConfigMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserConfigMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/UserConfigMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/UserConfigMapMapper.java index 87b4d3e..869830d 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserConfigMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserConfigMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.user.dto.UserConfigDTO; -import com.newyetai.usercenter.user.entity.UserConfig; -import com.newyetai.usercenter.user.dto.UserConfigOperateDTO; +import com.senmesh.usercenter.user.dto.UserConfigDTO; +import com.senmesh.usercenter.user.entity.UserConfig; +import com.senmesh.usercenter.user.dto.UserConfigOperateDTO; /** * @author sr on 2021-08-12 diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserExtensionMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserExtensionMapMapper.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/UserExtensionMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/UserExtensionMapMapper.java index c29165d..ea62c86 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserExtensionMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserExtensionMapMapper.java @@ -1,9 +1,8 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; -import com.newyetai.usercenter.user.dao.UserExtensionMapper; -import com.newyetai.usercenter.user.dto.UserExtensionDTO; -import com.newyetai.usercenter.user.dto.UserExtensionOperateDTO; -import com.newyetai.usercenter.user.entity.UserExtension; +import com.senmesh.usercenter.user.dto.UserExtensionDTO; +import com.senmesh.usercenter.user.dto.UserExtensionOperateDTO; +import com.senmesh.usercenter.user.entity.UserExtension; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserIdentityPhotoMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserIdentityPhotoMapMapper.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/UserIdentityPhotoMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/UserIdentityPhotoMapMapper.java index c0f68f2..7ffe2d5 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserIdentityPhotoMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserIdentityPhotoMapMapper.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoInfoDTO; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoDTO; -import com.newyetai.usercenter.user.entity.UserIdentityPhoto; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoOperateDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoInfoDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoDTO; +import com.senmesh.usercenter.user.entity.UserIdentityPhoto; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoOperateDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserMapMapper.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/UserMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/UserMapMapper.java index 5e67293..0d49455 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserMapMapper.java @@ -1,21 +1,21 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.user.dto.AuthenticateUserDTO; -import com.newyetai.usercenter.user.dto.OrgUserCreateDTO; -import com.newyetai.usercenter.user.dto.PersonUserCardCreateDTO; -import com.newyetai.usercenter.user.dto.PersonUserCardCreateResultDTO; -import com.newyetai.usercenter.user.dto.SuperRealNameTwoAuthDTO; -import com.newyetai.usercenter.user.dto.UserDTO; -import com.newyetai.usercenter.user.dto.UserOperateDTO; -import com.newyetai.usercenter.user.entity.User; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.login.dto.UserDetailSelectDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.user.dto.AuthenticateUserDTO; +import com.senmesh.usercenter.user.dto.OrgUserCreateDTO; +import com.senmesh.usercenter.user.dto.PersonUserCardCreateDTO; +import com.senmesh.usercenter.user.dto.PersonUserCardCreateResultDTO; +import com.senmesh.usercenter.user.dto.SuperRealNameTwoAuthDTO; +import com.senmesh.usercenter.user.dto.UserDTO; +import com.senmesh.usercenter.user.dto.UserOperateDTO; +import com.senmesh.usercenter.user.entity.User; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.login.dto.UserDetailSelectDTO; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserPostalInfoMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserPostalInfoMapMapper.java similarity index 72% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/UserPostalInfoMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/UserPostalInfoMapMapper.java index 3133d80..a47660e 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserPostalInfoMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserPostalInfoMapMapper.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.user.dto.UserPostalInfoDTO; -import com.newyetai.usercenter.user.entity.UserPostalInfo; -import com.newyetai.usercenter.user.dto.UserPostalInfoOperateDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoDTO; +import com.senmesh.usercenter.user.entity.UserPostalInfo; +import com.senmesh.usercenter.user.dto.UserPostalInfoOperateDTO; /** * @author fzp on 2022-01-19 diff --git a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserRegisterMapMapper.java b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserRegisterMapMapper.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/user/mapstruct/UserRegisterMapMapper.java rename to src/main/java/com/senmesh/usercenter/user/mapstruct/UserRegisterMapMapper.java index b425853..f25d542 100644 --- a/src/main/java/com/newyetai/usercenter/user/mapstruct/UserRegisterMapMapper.java +++ b/src/main/java/com/senmesh/usercenter/user/mapstruct/UserRegisterMapMapper.java @@ -1,17 +1,16 @@ -package com.newyetai.usercenter.user.mapstruct; +package com.senmesh.usercenter.user.mapstruct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.newyetai.usercenter.user.dto.UserRegisterCodeInfoDTO; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCodeDTO; -import com.newyetai.usercenter.user.dto.UserRegisterDTO; -import com.newyetai.usercenter.user.entity.UserRegister; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.dto.UserRegisterOperateDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCodeInfoDTO; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCodeDTO; +import com.senmesh.usercenter.user.dto.UserRegisterDTO; +import com.senmesh.usercenter.user.entity.UserRegister; +import com.senmesh.usercenter.user.dto.UserRegisterOperateDTO; /** * @author sr on 2021-11-16 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/check/AbstractRedisPhoneCodeChecker.java b/src/main/java/com/senmesh/usercenter/user/phone/check/AbstractRedisPhoneCodeChecker.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/user/phone/check/AbstractRedisPhoneCodeChecker.java rename to src/main/java/com/senmesh/usercenter/user/phone/check/AbstractRedisPhoneCodeChecker.java index 74e848d..d68ad14 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/check/AbstractRedisPhoneCodeChecker.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/check/AbstractRedisPhoneCodeChecker.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.phone.check; +package com.senmesh.usercenter.user.phone.check; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; /** * 借用redis校验手机号验证码校验结果的校验器 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/check/CaptchaPhoneCodeChecker.java b/src/main/java/com/senmesh/usercenter/user/phone/check/CaptchaPhoneCodeChecker.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/user/phone/check/CaptchaPhoneCodeChecker.java rename to src/main/java/com/senmesh/usercenter/user/phone/check/CaptchaPhoneCodeChecker.java index 79f3955..778f705 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/check/CaptchaPhoneCodeChecker.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/check/CaptchaPhoneCodeChecker.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.user.phone.check; +package com.senmesh.usercenter.user.phone.check; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.sdk.captcha.service.impl.LoginCaptchaAppProvider; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeCheckerEnum; -import com.newyetai.usercenter.user.phone.dto.CaptchaPhoneCodeSmsDTO; -import com.newyetai.usercenter.user.phone.dto.IPhoneCodeSmsDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.sdk.captcha.service.impl.LoginCaptchaAppProvider; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeCheckerEnum; +import com.senmesh.usercenter.user.phone.dto.CaptchaPhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.dto.IPhoneCodeSmsDTO; /** * 防水墙校验器(注意最先添加进提供者) diff --git a/src/main/java/com/newyetai/usercenter/user/phone/check/ChangePhoneChecker.java b/src/main/java/com/senmesh/usercenter/user/phone/check/ChangePhoneChecker.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/user/phone/check/ChangePhoneChecker.java rename to src/main/java/com/senmesh/usercenter/user/phone/check/ChangePhoneChecker.java index cd8faf3..273e6ff 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/check/ChangePhoneChecker.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/check/ChangePhoneChecker.java @@ -1,18 +1,18 @@ -package com.newyetai.usercenter.user.phone.check; +package com.senmesh.usercenter.user.phone.check; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dto.IUserPhoneCodeSms; -import com.newyetai.usercenter.user.dto.UserDTO; -import com.newyetai.usercenter.user.dto.UserQueryDTO; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeCheckerEnum; -import com.newyetai.usercenter.user.phone.dto.IPhoneCodeSmsDTO; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dto.IUserPhoneCodeSms; +import com.senmesh.usercenter.user.dto.UserDTO; +import com.senmesh.usercenter.user.dto.UserQueryDTO; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeCheckerEnum; +import com.senmesh.usercenter.user.phone.dto.IPhoneCodeSmsDTO; +import com.senmesh.usercenter.user.service.UserService; /** diff --git a/src/main/java/com/newyetai/usercenter/user/phone/check/CountRedisPhoneCodeChecker.java b/src/main/java/com/senmesh/usercenter/user/phone/check/CountRedisPhoneCodeChecker.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/phone/check/CountRedisPhoneCodeChecker.java rename to src/main/java/com/senmesh/usercenter/user/phone/check/CountRedisPhoneCodeChecker.java index dc39f9f..1c14177 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/check/CountRedisPhoneCodeChecker.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/check/CountRedisPhoneCodeChecker.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.user.phone.check; +package com.senmesh.usercenter.user.phone.check; import java.time.LocalDate; import org.springframework.stereotype.Component; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.frame.redis.util.RedisUtils; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeCheckerEnum; -import com.newyetai.usercenter.user.phone.dto.IPhoneCodeSmsDTO; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.frame.redis.util.RedisUtils; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeCheckerEnum; +import com.senmesh.usercenter.user.phone.dto.IPhoneCodeSmsDTO; /** * 一天内获取验证码次数 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/check/HasLoginChecker.java b/src/main/java/com/senmesh/usercenter/user/phone/check/HasLoginChecker.java similarity index 62% rename from src/main/java/com/newyetai/usercenter/user/phone/check/HasLoginChecker.java rename to src/main/java/com/senmesh/usercenter/user/phone/check/HasLoginChecker.java index 4883231..c91a090 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/check/HasLoginChecker.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/check/HasLoginChecker.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.phone.check; +package com.senmesh.usercenter.user.phone.check; import org.springframework.stereotype.Component; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeCheckerEnum; -import com.newyetai.usercenter.user.phone.dto.IPhoneCodeSmsDTO; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeCheckerEnum; +import com.senmesh.usercenter.user.phone.dto.IPhoneCodeSmsDTO; /** diff --git a/src/main/java/com/newyetai/usercenter/user/phone/check/IPhoneCodeChecker.java b/src/main/java/com/senmesh/usercenter/user/phone/check/IPhoneCodeChecker.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/user/phone/check/IPhoneCodeChecker.java rename to src/main/java/com/senmesh/usercenter/user/phone/check/IPhoneCodeChecker.java index ad19213..098793d 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/check/IPhoneCodeChecker.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/check/IPhoneCodeChecker.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.phone.check; +package com.senmesh.usercenter.user.phone.check; -import com.newyetai.usercenter.user.phone.dto.IPhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.dto.IPhoneCodeSmsDTO; /** * 手机号验证码校验器 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/check/LastRedisPhoneCodeChecker.java b/src/main/java/com/senmesh/usercenter/user/phone/check/LastRedisPhoneCodeChecker.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/user/phone/check/LastRedisPhoneCodeChecker.java rename to src/main/java/com/senmesh/usercenter/user/phone/check/LastRedisPhoneCodeChecker.java index d798af2..9d8c785 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/check/LastRedisPhoneCodeChecker.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/check/LastRedisPhoneCodeChecker.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.phone.check; +package com.senmesh.usercenter.user.phone.check; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.frame.redis.util.RedisUtils; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeCheckerEnum; -import com.newyetai.usercenter.user.phone.dto.IPhoneCodeSmsDTO; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.frame.redis.util.RedisUtils; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeCheckerEnum; +import com.senmesh.usercenter.user.phone.dto.IPhoneCodeSmsDTO; /** * 校验上一次获取验证码时间间隔是否超过一分钟 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/check/ResetPwdChecker.java b/src/main/java/com/senmesh/usercenter/user/phone/check/ResetPwdChecker.java similarity index 71% rename from src/main/java/com/newyetai/usercenter/user/phone/check/ResetPwdChecker.java rename to src/main/java/com/senmesh/usercenter/user/phone/check/ResetPwdChecker.java index caa9410..5d145df 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/check/ResetPwdChecker.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/check/ResetPwdChecker.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.user.phone.check; +package com.senmesh.usercenter.user.phone.check; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.dto.IUserPhoneCodeSms; -import com.newyetai.usercenter.user.dto.UserDTO; -import com.newyetai.usercenter.user.dto.UserQueryDTO; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeCheckerEnum; -import com.newyetai.usercenter.user.phone.dto.IPhoneCodeSmsDTO; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.dto.IUserPhoneCodeSms; +import com.senmesh.usercenter.user.dto.UserDTO; +import com.senmesh.usercenter.user.dto.UserQueryDTO; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeCheckerEnum; +import com.senmesh.usercenter.user.phone.dto.IPhoneCodeSmsDTO; +import com.senmesh.usercenter.user.service.UserService; /** diff --git a/src/main/java/com/newyetai/usercenter/user/phone/constant/PhoneCodeCheckerEnum.java b/src/main/java/com/senmesh/usercenter/user/phone/constant/PhoneCodeCheckerEnum.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/phone/constant/PhoneCodeCheckerEnum.java rename to src/main/java/com/senmesh/usercenter/user/phone/constant/PhoneCodeCheckerEnum.java index f9cf720..e574218 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/constant/PhoneCodeCheckerEnum.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/constant/PhoneCodeCheckerEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.constant; +package com.senmesh.usercenter.user.phone.constant; /** * 校验器枚举 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/constant/PhoneCodeProviderEnum.java b/src/main/java/com/senmesh/usercenter/user/phone/constant/PhoneCodeProviderEnum.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/phone/constant/PhoneCodeProviderEnum.java rename to src/main/java/com/senmesh/usercenter/user/phone/constant/PhoneCodeProviderEnum.java index 64c69b1..3b3df44 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/constant/PhoneCodeProviderEnum.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/constant/PhoneCodeProviderEnum.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.phone.constant; +package com.senmesh.usercenter.user.phone.constant; import java.util.Locale; import java.util.Map; import com.google.common.collect.Maps; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.user.constant.UserTypeEnum; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.user.constant.UserTypeEnum; /** * 手机验证码提供者枚举 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/constant/UserPhoneCodeOperateEnum.java b/src/main/java/com/senmesh/usercenter/user/phone/constant/UserPhoneCodeOperateEnum.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/phone/constant/UserPhoneCodeOperateEnum.java rename to src/main/java/com/senmesh/usercenter/user/phone/constant/UserPhoneCodeOperateEnum.java index 10e8dd4..3450151 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/constant/UserPhoneCodeOperateEnum.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/constant/UserPhoneCodeOperateEnum.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.constant; +package com.senmesh.usercenter.user.phone.constant; /** * 手机验证码提供者枚举 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/CaptchaPhoneCodeSmsDTO.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/CaptchaPhoneCodeSmsDTO.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/CaptchaPhoneCodeSmsDTO.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/CaptchaPhoneCodeSmsDTO.java index e950c13..840a5d1 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/CaptchaPhoneCodeSmsDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/CaptchaPhoneCodeSmsDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/ICode.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/ICode.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/ICode.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/ICode.java index fbd9d3d..609f404 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/ICode.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/ICode.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; /** * 验证码属性 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/IPhoneCodeDTO.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/IPhoneCodeDTO.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/IPhoneCodeDTO.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/IPhoneCodeDTO.java index 745ed52..8b58a11 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/IPhoneCodeDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/IPhoneCodeDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; /** * 手机号验证码-验证 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/IPhoneCodeSmsDTO.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/IPhoneCodeSmsDTO.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/IPhoneCodeSmsDTO.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/IPhoneCodeSmsDTO.java index 2461de7..8ad6a47 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/IPhoneCodeSmsDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/IPhoneCodeSmsDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; import java.io.Serializable; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; /** * 手机号验证码-发送 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeDTO.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeDTO.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeDTO.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeDTO.java index ad5e187..747b57b 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeDTO.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; import javax.validation.constraints.NotBlank; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeMessage.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeMessage.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeMessage.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeMessage.java index 6fb7a4d..d72fe8a 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeMessage.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeMessage.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; import java.io.Serializable; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeSmsDTO.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeSmsDTO.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeSmsDTO.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeSmsDTO.java index 10f3bb2..e6bcf0c 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/PhoneCodeSmsDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/PhoneCodeSmsDTO.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; -import com.newyetai.common.validation.annotation.Expression; -import com.newyetai.common.validation.constants.ValidProviderEnum; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.validation.annotation.Expression; +import com.senmesh.common.validation.constants.ValidProviderEnum; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/SmsSimpleSendDTO.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/SmsSimpleSendDTO.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/SmsSimpleSendDTO.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/SmsSimpleSendDTO.java index 1207ca3..c5fdb72 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/SmsSimpleSendDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/SmsSimpleSendDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/dto/SmsSimpleSendDetailDTO.java b/src/main/java/com/senmesh/usercenter/user/phone/dto/SmsSimpleSendDetailDTO.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/phone/dto/SmsSimpleSendDetailDTO.java rename to src/main/java/com/senmesh/usercenter/user/phone/dto/SmsSimpleSendDetailDTO.java index f5a81d8..1ee3f6e 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/dto/SmsSimpleSendDetailDTO.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/dto/SmsSimpleSendDetailDTO.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.dto; +package com.senmesh.usercenter.user.phone.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/AbstractAsyncPhoneCodeProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/AbstractAsyncPhoneCodeProvider.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/AbstractAsyncPhoneCodeProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/AbstractAsyncPhoneCodeProvider.java index b21f708..b8d46c7 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/AbstractAsyncPhoneCodeProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/AbstractAsyncPhoneCodeProvider.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.mq.consumer.handler.ITopicMqHandler; -import com.newyetai.mq.dto.TopicMqMessage; -import com.newyetai.mq.util.MqSendUtils; -import com.newyetai.security.util.HostContextHolder; -import com.newyetai.usercenter.userprod.constant.UcMqSelfConstants; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeMessage; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.mq.consumer.handler.ITopicMqHandler; +import com.senmesh.mq.dto.TopicMqMessage; +import com.senmesh.mq.util.MqSendUtils; +import com.senmesh.security.util.HostContextHolder; +import com.senmesh.usercenter.userprod.constant.UcMqSelfConstants; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeMessage; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/AbstractPhoneCodeProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/AbstractPhoneCodeProvider.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/AbstractPhoneCodeProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/AbstractPhoneCodeProvider.java index 879ca04..8478794 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/AbstractPhoneCodeProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/AbstractPhoneCodeProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import java.util.List; import java.util.Map; @@ -8,22 +8,22 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import com.google.common.collect.Lists; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.sdk.sms.dto.VerificationCodeSendDTO; -import com.newyetai.sdk.sms.util.SmsUtils; -import com.newyetai.security.util.HostContextHolder; -import com.newyetai.usercenter.dto.DomainSettingReqDTO; -import com.newyetai.usercenter.constants.DomainSettingTypeEnum; -import com.newyetai.usercenter.sys.service.DomainSettingService; -import com.newyetai.usercenter.user.phone.check.IPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeMessage; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.sdk.sms.dto.VerificationCodeSendDTO; +import com.senmesh.sdk.sms.util.SmsUtils; +import com.senmesh.security.util.HostContextHolder; +import com.senmesh.usercenter.dto.DomainSettingReqDTO; +import com.senmesh.usercenter.constants.DomainSettingTypeEnum; +import com.senmesh.usercenter.sys.service.DomainSettingService; +import com.senmesh.usercenter.user.phone.check.IPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeMessage; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/GetOrgApplyProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/GetOrgApplyProvider.java similarity index 66% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/GetOrgApplyProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/GetOrgApplyProvider.java index 33b41c4..7982168 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/GetOrgApplyProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/GetOrgApplyProvider.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/IPhoneCodeProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/IPhoneCodeProvider.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/IPhoneCodeProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/IPhoneCodeProvider.java index 3a59c9c..33e6b53 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/IPhoneCodeProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/IPhoneCodeProvider.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; /** * 手机号验证码提供者 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgApplyProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgApplyProvider.java similarity index 57% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/OrgApplyProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/OrgApplyProvider.java index 34731c5..2c53964 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgApplyProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgApplyProvider.java @@ -1,11 +1,9 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.ResetPwdChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgChangePhoneProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgChangePhoneProvider.java similarity index 65% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/OrgChangePhoneProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/OrgChangePhoneProvider.java index efe5a7d..ad5e4ea 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgChangePhoneProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgChangePhoneProvider.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.ChangePhoneChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.ChangePhoneChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; /** * 机构用户换绑手机号 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgLoginProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgLoginProvider.java similarity index 67% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/OrgLoginProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/OrgLoginProvider.java index 0bb2ecb..e85aa58 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgLoginProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgLoginProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; @@ -6,14 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.dao.OrgUserMapper; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.dao.OrgUserMapper; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; /** * 机构用户手机号登录验证码提供者 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgResetPwdProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgResetPwdProvider.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/OrgResetPwdProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/OrgResetPwdProvider.java index ae321ff..0503ff8 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgResetPwdProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgResetPwdProvider.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.ResetPwdChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.ResetPwdChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; /** * 重置密码 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgResetSecurityCodeProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgResetSecurityCodeProvider.java similarity index 65% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/OrgResetSecurityCodeProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/OrgResetSecurityCodeProvider.java index 7c2cad2..9a8acc7 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/OrgResetSecurityCodeProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/OrgResetSecurityCodeProvider.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.HasLoginChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.HasLoginChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; /** * 机构重置安全码 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonBindPhoneProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonBindPhoneProvider.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/PersonBindPhoneProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/PersonBindPhoneProvider.java index 2692770..2f29ef4 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonBindPhoneProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonBindPhoneProvider.java @@ -1,19 +1,19 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; /** * 个人绑定手机号 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonChangePhoneProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonChangePhoneProvider.java similarity index 65% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/PersonChangePhoneProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/PersonChangePhoneProvider.java index ab3bdf3..09f4714 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonChangePhoneProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonChangePhoneProvider.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.ChangePhoneChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.ChangePhoneChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; /** * 个人换绑手机号 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonLoginProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonLoginProvider.java similarity index 66% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/PersonLoginProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/PersonLoginProvider.java index 3236509..c28c5c4 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonLoginProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonLoginProvider.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; /** * 个人用户手机号登录验证码提供者 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonResetPwdProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonResetPwdProvider.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/PersonResetPwdProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/PersonResetPwdProvider.java index 2f91862..176cc0a 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonResetPwdProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonResetPwdProvider.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.ResetPwdChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.ResetPwdChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; /** * 重置密码 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonResetSecurityCodeProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonResetSecurityCodeProvider.java similarity index 65% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/PersonResetSecurityCodeProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/PersonResetSecurityCodeProvider.java index 4f3f758..eb3bbbf 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/PersonResetSecurityCodeProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/PersonResetSecurityCodeProvider.java @@ -1,16 +1,16 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CaptchaPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.HasLoginChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CaptchaPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.HasLoginChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; /** * 个人重置安全码 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/PhoneCodeRepository.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/PhoneCodeRepository.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/PhoneCodeRepository.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/PhoneCodeRepository.java index f5a58a4..8441987 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/PhoneCodeRepository.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/PhoneCodeRepository.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.frame.redis.util.RedisUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.frame.redis.util.RedisUtils; /** * 短信验证码存储器 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/ResetPayPwdProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/ResetPayPwdProvider.java similarity index 64% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/ResetPayPwdProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/ResetPayPwdProvider.java index af7d4ec..3dbd682 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/ResetPayPwdProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/ResetPayPwdProvider.java @@ -1,15 +1,15 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; import javax.annotation.PostConstruct; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.HasLoginChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.HasLoginChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; @Component @DependsOn("springContextHolder") diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/UserCancelProvider.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/UserCancelProvider.java similarity index 68% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/UserCancelProvider.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/UserCancelProvider.java index 72a8100..d813a26 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/UserCancelProvider.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/UserCancelProvider.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.phone.provider; +package com.senmesh.usercenter.user.phone.provider; -import com.newyetai.common.util.SpringContextHolder; -import com.newyetai.usercenter.user.phone.check.CountRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.check.LastRedisPhoneCodeChecker; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.common.util.SpringContextHolder; +import com.senmesh.usercenter.user.phone.check.CountRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.check.LastRedisPhoneCodeChecker; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/simple/AbstractSimpleSms.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/simple/AbstractSimpleSms.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/simple/AbstractSimpleSms.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/simple/AbstractSimpleSms.java index 6dfddb0..2a7ad06 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/simple/AbstractSimpleSms.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/simple/AbstractSimpleSms.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.phone.provider.simple; +package com.senmesh.usercenter.user.phone.provider.simple; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.sdk.sms.util.SmsUtils; -import com.newyetai.usercenter.user.phone.dto.SmsSimpleSendDTO; -import com.newyetai.usercenter.user.phone.dto.SmsSimpleSendDetailDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.sdk.sms.util.SmsUtils; +import com.senmesh.usercenter.user.phone.dto.SmsSimpleSendDTO; +import com.senmesh.usercenter.user.phone.dto.SmsSimpleSendDetailDTO; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/simple/ISimpleSms.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/simple/ISimpleSms.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/simple/ISimpleSms.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/simple/ISimpleSms.java index e42045d..54ed2d2 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/simple/ISimpleSms.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/simple/ISimpleSms.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.phone.provider.simple; +package com.senmesh.usercenter.user.phone.provider.simple; -import com.newyetai.usercenter.user.phone.dto.SmsSimpleSendDTO; +import com.senmesh.usercenter.user.phone.dto.SmsSimpleSendDTO; /** * isimple短信提供者 diff --git a/src/main/java/com/newyetai/usercenter/user/phone/provider/simple/StandardSimpleSms.java b/src/main/java/com/senmesh/usercenter/user/phone/provider/simple/StandardSimpleSms.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/user/phone/provider/simple/StandardSimpleSms.java rename to src/main/java/com/senmesh/usercenter/user/phone/provider/simple/StandardSimpleSms.java index 6bf03ea..4b31aeb 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/provider/simple/StandardSimpleSms.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/provider/simple/StandardSimpleSms.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.phone.provider.simple; +package com.senmesh.usercenter.user.phone.provider.simple; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.frame.redis.util.RedisUtils; -import com.newyetai.mq.consumer.handler.ITopicMqHandler; -import com.newyetai.mq.dto.TopicMqMessage; -import com.newyetai.mq.util.MqSendUtils; -import com.newyetai.usercenter.user.phone.dto.SmsSimpleSendDTO; -import com.newyetai.usercenter.userprod.constant.UcMqSelfConstants; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.frame.redis.util.RedisUtils; +import com.senmesh.mq.consumer.handler.ITopicMqHandler; +import com.senmesh.mq.dto.TopicMqMessage; +import com.senmesh.mq.util.MqSendUtils; +import com.senmesh.usercenter.user.phone.dto.SmsSimpleSendDTO; +import com.senmesh.usercenter.userprod.constant.UcMqSelfConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/newyetai/usercenter/user/phone/util/PhoneCodeUtils.java b/src/main/java/com/senmesh/usercenter/user/phone/util/PhoneCodeUtils.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/phone/util/PhoneCodeUtils.java rename to src/main/java/com/senmesh/usercenter/user/phone/util/PhoneCodeUtils.java index 740cd87..b89b5c8 100644 --- a/src/main/java/com/newyetai/usercenter/user/phone/util/PhoneCodeUtils.java +++ b/src/main/java/com/senmesh/usercenter/user/phone/util/PhoneCodeUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.phone.util; +package com.senmesh.usercenter.user.phone.util; import java.util.List; import java.util.Map; @@ -6,14 +6,14 @@ import java.util.Map; import org.springframework.stereotype.Component; import com.google.common.collect.Maps; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dto.IUserPhoneCodeSms; -import com.newyetai.usercenter.user.phone.constant.PhoneCodeProviderEnum; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeDTO; -import com.newyetai.usercenter.user.phone.dto.PhoneCodeSmsDTO; -import com.newyetai.usercenter.user.phone.provider.IPhoneCodeProvider; -import com.newyetai.usercenter.user.util.UserUtils; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dto.IUserPhoneCodeSms; +import com.senmesh.usercenter.user.phone.constant.PhoneCodeProviderEnum; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeDTO; +import com.senmesh.usercenter.user.phone.dto.PhoneCodeSmsDTO; +import com.senmesh.usercenter.user.phone.provider.IPhoneCodeProvider; +import com.senmesh.usercenter.user.util.UserUtils; /** * @author sr on 2021-06-28 diff --git a/src/main/java/com/newyetai/usercenter/user/service/OrgUserService.java b/src/main/java/com/senmesh/usercenter/user/service/OrgUserService.java similarity index 76% rename from src/main/java/com/newyetai/usercenter/user/service/OrgUserService.java rename to src/main/java/com/senmesh/usercenter/user/service/OrgUserService.java index 4f965a4..a63707b 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/OrgUserService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/OrgUserService.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; -import com.newyetai.usercenter.user.dto.OrgUserInfoDTO; -import com.newyetai.usercenter.user.dto.OrgUserInfoQueryDTO; -import com.newyetai.usercenter.user.dto.OrgUserOperateDTO; -import com.newyetai.usercenter.user.login.dto.OrgDetailDTO; +import com.senmesh.usercenter.user.dto.OrgUserInfoDTO; +import com.senmesh.usercenter.user.dto.OrgUserInfoQueryDTO; +import com.senmesh.usercenter.user.dto.OrgUserOperateDTO; +import com.senmesh.usercenter.user.login.dto.OrgDetailDTO; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserAuthService.java b/src/main/java/com/senmesh/usercenter/user/service/UserAuthService.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/user/service/UserAuthService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserAuthService.java index 1d1f71e..6f8c636 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserAuthService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserAuthService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; import java.util.List; -import com.newyetai.usercenter.user.dto.UserAuthQueryDTO; -import com.newyetai.usercenter.user.dto.UserAuthOperateDTO; -import com.newyetai.usercenter.user.dto.UserAuthDTO; +import com.senmesh.usercenter.user.dto.UserAuthQueryDTO; +import com.senmesh.usercenter.user.dto.UserAuthOperateDTO; +import com.senmesh.usercenter.user.dto.UserAuthDTO; /** * 用户授权中间表 diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserBankAccountService.java b/src/main/java/com/senmesh/usercenter/user/service/UserBankAccountService.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/user/service/UserBankAccountService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserBankAccountService.java index ca9820d..4a54e25 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserBankAccountService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserBankAccountService.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; -import com.newyetai.usercenter.user.dto.*; +import com.senmesh.usercenter.user.dto.*; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserCancelService.java b/src/main/java/com/senmesh/usercenter/user/service/UserCancelService.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/user/service/UserCancelService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserCancelService.java index d7e7cb6..967a165 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserCancelService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserCancelService.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; -import com.newyetai.usercenter.user.dto.UserCancelApplyReqDTO; -import com.newyetai.usercenter.user.dto.UserCancelDTO; -import com.newyetai.usercenter.user.dto.UserCancelPageQueryDTO; +import com.senmesh.usercenter.user.dto.UserCancelApplyReqDTO; +import com.senmesh.usercenter.user.dto.UserCancelDTO; +import com.senmesh.usercenter.user.dto.UserCancelPageQueryDTO; import java.util.List; diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserConfigService.java b/src/main/java/com/senmesh/usercenter/user/service/UserConfigService.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/user/service/UserConfigService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserConfigService.java index fc2a64f..b7c33b2 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserConfigService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserConfigService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; import java.util.List; -import com.newyetai.usercenter.user.dto.UserConfigQueryDTO; -import com.newyetai.usercenter.user.dto.UserConfigOperateDTO; -import com.newyetai.usercenter.user.dto.UserConfigDTO; +import com.senmesh.usercenter.user.dto.UserConfigQueryDTO; +import com.senmesh.usercenter.user.dto.UserConfigOperateDTO; +import com.senmesh.usercenter.user.dto.UserConfigDTO; /** * 用户配置 diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserExtensionService.java b/src/main/java/com/senmesh/usercenter/user/service/UserExtensionService.java similarity index 79% rename from src/main/java/com/newyetai/usercenter/user/service/UserExtensionService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserExtensionService.java index 0c64908..73c3de7 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserExtensionService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserExtensionService.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; -import com.newyetai.usercenter.user.dto.UserExtensionDTO; -import com.newyetai.usercenter.user.dto.UserExtensionOperateDTO; +import com.senmesh.usercenter.user.dto.UserExtensionDTO; +import com.senmesh.usercenter.user.dto.UserExtensionOperateDTO; /** * @author czy diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserIdentityPhotoService.java b/src/main/java/com/senmesh/usercenter/user/service/UserIdentityPhotoService.java similarity index 75% rename from src/main/java/com/newyetai/usercenter/user/service/UserIdentityPhotoService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserIdentityPhotoService.java index 02885a7..bca8186 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserIdentityPhotoService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserIdentityPhotoService.java @@ -1,11 +1,11 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; import java.util.List; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoQueryDTO; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoOperateDTO; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoDTO; -import com.newyetai.usercenter.user.dto.UserIdentityPhotoInfoDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoQueryDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoOperateDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoDTO; +import com.senmesh.usercenter.user.dto.UserIdentityPhotoInfoDTO; /** * 用户证件正反面 diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserPostalInfoService.java b/src/main/java/com/senmesh/usercenter/user/service/UserPostalInfoService.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/user/service/UserPostalInfoService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserPostalInfoService.java index 82e8a8e..57d9edb 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserPostalInfoService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserPostalInfoService.java @@ -1,10 +1,10 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; import java.util.List; -import com.newyetai.usercenter.user.dto.UserPostalInfoQueryDTO; -import com.newyetai.usercenter.user.dto.UserPostalInfoOperateDTO; -import com.newyetai.usercenter.user.dto.UserPostalInfoDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoQueryDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoOperateDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoDTO; /** * 用户邮寄信息 diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserRegisterService.java b/src/main/java/com/senmesh/usercenter/user/service/UserRegisterService.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/user/service/UserRegisterService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserRegisterService.java index b36fe93..5d42fd2 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserRegisterService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserRegisterService.java @@ -1,14 +1,13 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; import java.util.List; -import com.newyetai.usercenter.user.dto.UserRegisterQueryDTO; -import com.newyetai.usercenter.user.dto.UserRegisterOperateDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCodeInfoDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCreateDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCodeDTO; -import com.newyetai.usercenter.user.dto.UserRegisterDTO; -import com.newyetai.usercenter.user.dto.UserRegisterInfoQueryDTO; +import com.senmesh.usercenter.user.dto.UserRegisterQueryDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCodeInfoDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCreateDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCodeDTO; +import com.senmesh.usercenter.user.dto.UserRegisterDTO; +import com.senmesh.usercenter.user.dto.UserRegisterInfoQueryDTO; /** * 用户注册表 diff --git a/src/main/java/com/newyetai/usercenter/user/service/UserService.java b/src/main/java/com/senmesh/usercenter/user/service/UserService.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/user/service/UserService.java rename to src/main/java/com/senmesh/usercenter/user/service/UserService.java index 85f3bc0..197ac72 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/UserService.java +++ b/src/main/java/com/senmesh/usercenter/user/service/UserService.java @@ -1,12 +1,12 @@ -package com.newyetai.usercenter.user.service; +package com.senmesh.usercenter.user.service; -import com.newyetai.security.dto.UserInfoDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailBindDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.dto.OrgUserEditDTO; -import com.newyetai.usercenter.dto.SuperResetPasswordDTO; -import com.newyetai.usercenter.user.dto.*; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.security.dto.UserInfoDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailBindDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.dto.OrgUserEditDTO; +import com.senmesh.usercenter.dto.SuperResetPasswordDTO; +import com.senmesh.usercenter.user.dto.*; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; import org.apache.ibatis.annotations.Param; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/OrgUserServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/OrgUserServiceImpl.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/service/impl/OrgUserServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/OrgUserServiceImpl.java index 81e4389..8be1732 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/OrgUserServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/OrgUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.List; @@ -7,18 +7,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.usercenter.user.dao.OrgUserMapper; -import com.newyetai.usercenter.user.dto.OrgUserDTO; -import com.newyetai.usercenter.user.dto.OrgUserInfoDTO; -import com.newyetai.usercenter.user.dto.OrgUserInfoQueryDTO; -import com.newyetai.usercenter.user.dto.OrgUserOperateDTO; -import com.newyetai.usercenter.user.dto.OrgUserQueryDTO; -import com.newyetai.usercenter.user.entity.OrgUser; -import com.newyetai.usercenter.user.login.dto.OrgDetailDTO; -import com.newyetai.usercenter.user.service.OrgUserService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.usercenter.user.dao.OrgUserMapper; +import com.senmesh.usercenter.user.dto.OrgUserDTO; +import com.senmesh.usercenter.user.dto.OrgUserInfoDTO; +import com.senmesh.usercenter.user.dto.OrgUserInfoQueryDTO; +import com.senmesh.usercenter.user.dto.OrgUserOperateDTO; +import com.senmesh.usercenter.user.dto.OrgUserQueryDTO; +import com.senmesh.usercenter.user.entity.OrgUser; +import com.senmesh.usercenter.user.login.dto.OrgDetailDTO; +import com.senmesh.usercenter.user.service.OrgUserService; /** @author sr on 2021-05-24 */ @Service diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserAuthServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserAuthServiceImpl.java similarity index 70% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserAuthServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserAuthServiceImpl.java index 9d6d6f7..4ad3bbd 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserAuthServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserAuthServiceImpl.java @@ -1,18 +1,18 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.usercenter.user.dao.UserAuthMapper; -import com.newyetai.usercenter.user.service.UserAuthService; -import com.newyetai.usercenter.user.dto.UserAuthQueryDTO; -import com.newyetai.usercenter.user.dto.UserAuthDTO; -import com.newyetai.usercenter.user.dto.UserAuthOperateDTO; -import com.newyetai.usercenter.user.entity.UserAuth; -import com.newyetai.usercenter.user.mapstruct.UserAuthMapMapper; -import com.newyetai.common.util.UserContextHolder; +import com.senmesh.usercenter.user.dao.UserAuthMapper; +import com.senmesh.usercenter.user.service.UserAuthService; +import com.senmesh.usercenter.user.dto.UserAuthQueryDTO; +import com.senmesh.usercenter.user.dto.UserAuthDTO; +import com.senmesh.usercenter.user.dto.UserAuthOperateDTO; +import com.senmesh.usercenter.user.entity.UserAuth; +import com.senmesh.usercenter.user.mapstruct.UserAuthMapMapper; +import com.senmesh.common.util.UserContextHolder; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserBankAccountServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserBankAccountServiceImpl.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserBankAccountServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserBankAccountServiceImpl.java index c7d5aaf..a2457ef 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserBankAccountServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserBankAccountServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.List; import java.util.Map; @@ -15,24 +15,24 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Maps; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.frame.redis.aop.annotation.AutoUnLock; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.usercenter.user.dao.UserBankAccountMapper; -import com.newyetai.usercenter.user.dao.UserBankCardThreeVerificationMapper; -import com.newyetai.usercenter.user.dto.UserBankAccountCreateReqDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountInfoDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountModifyDTO; -import com.newyetai.usercenter.user.dto.UserBankAccountQueryDTO; -import com.newyetai.usercenter.user.dto.UserDTO; -import com.newyetai.usercenter.user.dto.UserQueryDTO; -import com.newyetai.usercenter.user.entity.UcUserBankAccount; -import com.newyetai.usercenter.user.mapstruct.UserBankAccountMapMapper; -import com.newyetai.usercenter.user.service.UserBankAccountService; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.frame.redis.aop.annotation.AutoUnLock; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.usercenter.user.dao.UserBankAccountMapper; +import com.senmesh.usercenter.user.dao.UserBankCardThreeVerificationMapper; +import com.senmesh.usercenter.user.dto.UserBankAccountCreateReqDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountInfoDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountModifyDTO; +import com.senmesh.usercenter.user.dto.UserBankAccountQueryDTO; +import com.senmesh.usercenter.user.dto.UserDTO; +import com.senmesh.usercenter.user.dto.UserQueryDTO; +import com.senmesh.usercenter.user.entity.UcUserBankAccount; +import com.senmesh.usercenter.user.mapstruct.UserBankAccountMapMapper; +import com.senmesh.usercenter.user.service.UserBankAccountService; +import com.senmesh.usercenter.user.service.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserCancelServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserCancelServiceImpl.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserCancelServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserCancelServiceImpl.java index b9f92d7..2a0f468 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserCancelServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserCancelServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.ArrayList; import java.util.List; @@ -6,31 +6,30 @@ import java.util.Objects; import javax.annotation.Resource; -import org.apache.commons.lang3.StringUtils; import org.springframework.aop.framework.AopContext; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.config.constant.ConfigConstants; -import com.newyetai.config.dto.ConfigDTO; -import com.newyetai.config.service.ConfigService; -import com.newyetai.frame.redis.aop.annotation.AutoUnLock; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.sdk.robot.util.RobotUtils; -import com.newyetai.usercenter.user.constant.UserCancelConstants; -import com.newyetai.usercenter.user.dao.UserCancelMapper; -import com.newyetai.usercenter.user.dao.UserMapper; -import com.newyetai.usercenter.user.dto.UserCancelApplyReqDTO; -import com.newyetai.usercenter.user.dto.UserCancelDTO; -import com.newyetai.usercenter.user.dto.UserCancelPageQueryDTO; -import com.newyetai.usercenter.user.entity.UserCancel; -import com.newyetai.usercenter.user.service.UserCancelService; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.config.constant.ConfigConstants; +import com.senmesh.config.dto.ConfigDTO; +import com.senmesh.config.service.ConfigService; +import com.senmesh.frame.redis.aop.annotation.AutoUnLock; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.sdk.robot.util.RobotUtils; +import com.senmesh.usercenter.user.constant.UserCancelConstants; +import com.senmesh.usercenter.user.dao.UserCancelMapper; +import com.senmesh.usercenter.user.dao.UserMapper; +import com.senmesh.usercenter.user.dto.UserCancelApplyReqDTO; +import com.senmesh.usercenter.user.dto.UserCancelDTO; +import com.senmesh.usercenter.user.dto.UserCancelPageQueryDTO; +import com.senmesh.usercenter.user.entity.UserCancel; +import com.senmesh.usercenter.user.service.UserCancelService; import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserConfigServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserConfigServiceImpl.java similarity index 69% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserConfigServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserConfigServiceImpl.java index 2530721..c54069d 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserConfigServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserConfigServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.List; @@ -7,24 +7,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.usercenter.user.dao.UserConfigMapper; -import com.newyetai.usercenter.user.service.UserConfigService; -import com.newyetai.usercenter.user.util.UserUtils; -import com.newyetai.usercenter.user.dto.UserConfigQueryDTO; -import com.newyetai.usercenter.user.dto.UserDTO; -import com.newyetai.usercenter.user.dto.UserConfigDTO; -import com.newyetai.usercenter.user.dto.UserConfigOperateDTO; -import com.newyetai.usercenter.user.entity.User; -import com.newyetai.usercenter.user.entity.UserConfig; -import com.newyetai.usercenter.user.mapstruct.UserConfigMapMapper; -import com.newyetai.usercenter.user.mapstruct.UserMapMapper; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.Create; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; +import com.senmesh.usercenter.user.dao.UserConfigMapper; +import com.senmesh.usercenter.user.service.UserConfigService; +import com.senmesh.usercenter.user.dto.UserConfigQueryDTO; +import com.senmesh.usercenter.user.dto.UserConfigDTO; +import com.senmesh.usercenter.user.dto.UserConfigOperateDTO; +import com.senmesh.usercenter.user.entity.UserConfig; +import com.senmesh.usercenter.user.mapstruct.UserConfigMapMapper; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.Create; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; /** * @author sr on 2021-08-12 diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserExtensionServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserExtensionServiceImpl.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserExtensionServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserExtensionServiceImpl.java index a7a0b18..c1bd558 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserExtensionServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserExtensionServiceImpl.java @@ -1,14 +1,14 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.dao.UserExtensionMapper; -import com.newyetai.usercenter.user.dto.UserExtensionDTO; -import com.newyetai.usercenter.user.dto.UserExtensionOperateDTO; -import com.newyetai.usercenter.user.entity.UserExtension; -import com.newyetai.usercenter.user.mapstruct.UserExtensionMapMapper; -import com.newyetai.usercenter.user.service.UserExtensionService; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.dao.UserExtensionMapper; +import com.senmesh.usercenter.user.dto.UserExtensionDTO; +import com.senmesh.usercenter.user.dto.UserExtensionOperateDTO; +import com.senmesh.usercenter.user.entity.UserExtension; +import com.senmesh.usercenter.user.mapstruct.UserExtensionMapMapper; +import com.senmesh.usercenter.user.service.UserExtensionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserIdentityPhotoServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserIdentityPhotoServiceImpl.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserIdentityPhotoServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserIdentityPhotoServiceImpl.java index 9cb51a8..dd3c8bc 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserIdentityPhotoServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserIdentityPhotoServiceImpl.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.user.constant.UserIdentityPhotoConstants; -import com.newyetai.usercenter.user.dao.UserIdentityPhotoMapper; -import com.newyetai.usercenter.user.dto.*; -import com.newyetai.usercenter.user.entity.UserIdentityPhoto; -import com.newyetai.usercenter.user.mapstruct.UserIdentityPhotoMapMapper; -import com.newyetai.usercenter.user.service.UserIdentityPhotoService; -import com.newyetai.usercenter.user.service.UserService; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.user.constant.UserIdentityPhotoConstants; +import com.senmesh.usercenter.user.dao.UserIdentityPhotoMapper; +import com.senmesh.usercenter.user.dto.*; +import com.senmesh.usercenter.user.entity.UserIdentityPhoto; +import com.senmesh.usercenter.user.mapstruct.UserIdentityPhotoMapMapper; +import com.senmesh.usercenter.user.service.UserIdentityPhotoService; +import com.senmesh.usercenter.user.service.UserService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserMergeImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserMergeImpl.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserMergeImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserMergeImpl.java index 4cd4b5e..ef4b965 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserMergeImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserMergeImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.List; import java.util.Map; @@ -11,20 +11,20 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Sets; -import com.newyetai.common.exception.ChangeTokenException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.sensitive.SensitiveInfoUtils; -import com.newyetai.mq.util.MqSendUtils; -import com.newyetai.security.jwt.JwtTokenUtils; -import com.newyetai.usercenter.common.mq.constant.UcMqConstants; -import com.newyetai.usercenter.user.dao.UserAuthMapper; -import com.newyetai.usercenter.user.dao.UserMapper; -import com.newyetai.usercenter.user.dto.ChangePhoneMqDTO; -import com.newyetai.usercenter.user.dto.UserAuthDTO; -import com.newyetai.usercenter.user.dto.UserAuthQueryDTO; -import com.newyetai.usercenter.user.dto.UserDTO; -import com.newyetai.usercenter.user.dto.UserQueryDTO; -import com.newyetai.usercenter.user.entity.User; +import com.senmesh.common.exception.ChangeTokenException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.sensitive.SensitiveInfoUtils; +import com.senmesh.mq.util.MqSendUtils; +import com.senmesh.security.jwt.JwtTokenUtils; +import com.senmesh.usercenter.common.mq.constant.UcMqConstants; +import com.senmesh.usercenter.user.dao.UserAuthMapper; +import com.senmesh.usercenter.user.dao.UserMapper; +import com.senmesh.usercenter.user.dto.ChangePhoneMqDTO; +import com.senmesh.usercenter.user.dto.UserAuthDTO; +import com.senmesh.usercenter.user.dto.UserAuthQueryDTO; +import com.senmesh.usercenter.user.dto.UserDTO; +import com.senmesh.usercenter.user.dto.UserQueryDTO; +import com.senmesh.usercenter.user.entity.User; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserPostalInfoServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserPostalInfoServiceImpl.java similarity index 80% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserPostalInfoServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserPostalInfoServiceImpl.java index c0ebe48..d9eab97 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserPostalInfoServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserPostalInfoServiceImpl.java @@ -1,21 +1,21 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.List; -import com.newyetai.usercenter.user.mapstruct.UserPostalInfoMapMapper; +import com.senmesh.usercenter.user.mapstruct.UserPostalInfoMapMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.usercenter.user.dao.UserPostalInfoMapper; -import com.newyetai.usercenter.user.service.UserPostalInfoService; -import com.newyetai.usercenter.user.dto.UserPostalInfoQueryDTO; -import com.newyetai.usercenter.user.dto.UserPostalInfoDTO; -import com.newyetai.usercenter.user.dto.UserPostalInfoOperateDTO; -import com.newyetai.usercenter.user.entity.UserPostalInfo; +import com.senmesh.usercenter.user.dao.UserPostalInfoMapper; +import com.senmesh.usercenter.user.service.UserPostalInfoService; +import com.senmesh.usercenter.user.dto.UserPostalInfoQueryDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoDTO; +import com.senmesh.usercenter.user.dto.UserPostalInfoOperateDTO; +import com.senmesh.usercenter.user.entity.UserPostalInfo; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.util.ListUtil; /** * @author fzp on 2022-01-19 diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserRegisterServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserRegisterServiceImpl.java similarity index 78% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserRegisterServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserRegisterServiceImpl.java index 61b037c..4de900b 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserRegisterServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserRegisterServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.List; import java.util.Optional; @@ -8,32 +8,32 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.frame.redis.aop.annotation.AutoUnLock; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.mq.util.MqSendUtils; -import com.newyetai.security.util.UserLoginUtils; -import com.newyetai.usercenter.common.dto.SlickParamCreateDTO; -import com.newyetai.usercenter.common.service.SlickParamService; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.sys.service.DomainService; -import com.newyetai.usercenter.user.dao.UserRegisterMapper; -import com.newyetai.usercenter.user.dto.UserRegisterCodeDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCodeInfoDTO; -import com.newyetai.usercenter.user.dto.UserRegisterCreateDTO; -import com.newyetai.usercenter.user.dto.UserRegisterDTO; -import com.newyetai.usercenter.user.dto.UserRegisterInfoQueryDTO; -import com.newyetai.usercenter.user.dto.UserRegisterQueryDTO; -import com.newyetai.usercenter.user.entity.UserRegister; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.mapstruct.UserRegisterMapMapper; -import com.newyetai.usercenter.user.service.UserRegisterService; -import com.newyetai.usercenter.user.util.UserRegisterUtils; -import com.newyetai.usercenter.userprod.constant.UcMqSelfConstants; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.frame.redis.aop.annotation.AutoUnLock; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.mq.util.MqSendUtils; +import com.senmesh.security.util.UserLoginUtils; +import com.senmesh.usercenter.common.dto.SlickParamCreateDTO; +import com.senmesh.usercenter.common.service.SlickParamService; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.sys.service.DomainService; +import com.senmesh.usercenter.user.dao.UserRegisterMapper; +import com.senmesh.usercenter.user.dto.UserRegisterCodeDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCodeInfoDTO; +import com.senmesh.usercenter.user.dto.UserRegisterCreateDTO; +import com.senmesh.usercenter.user.dto.UserRegisterDTO; +import com.senmesh.usercenter.user.dto.UserRegisterInfoQueryDTO; +import com.senmesh.usercenter.user.dto.UserRegisterQueryDTO; +import com.senmesh.usercenter.user.entity.UserRegister; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.mapstruct.UserRegisterMapMapper; +import com.senmesh.usercenter.user.service.UserRegisterService; +import com.senmesh.usercenter.user.util.UserRegisterUtils; +import com.senmesh.usercenter.userprod.constant.UcMqSelfConstants; /** * @author sr on 2021-11-16 diff --git a/src/main/java/com/newyetai/usercenter/user/service/impl/UserServiceImpl.java b/src/main/java/com/senmesh/usercenter/user/service/impl/UserServiceImpl.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/user/service/impl/UserServiceImpl.java rename to src/main/java/com/senmesh/usercenter/user/service/impl/UserServiceImpl.java index 1e7278f..4baf377 100644 --- a/src/main/java/com/newyetai/usercenter/user/service/impl/UserServiceImpl.java +++ b/src/main/java/com/senmesh/usercenter/user/service/impl/UserServiceImpl.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.user.service.impl; +package com.senmesh.usercenter.user.service.impl; import java.util.ArrayList; import java.util.Date; @@ -20,76 +20,74 @@ import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Lists; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.ChangeTokenException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.common.util.ListUtil; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.common.validation.util.ValidateUtils; -import com.newyetai.frame.redis.aop.annotation.AutoUnLock; -import com.newyetai.frame.redis.dto.LockDTO; -import com.newyetai.frame.redis.redisson.RedissonUtils; -import com.newyetai.mq.util.MqSendUtils; -import com.newyetai.security.dto.UserInfoDTO; -import com.newyetai.security.jwt.JwtTokenUtils; -import com.newyetai.security.util.PasswordUtils; -import com.newyetai.usercenter.auth.constant.AuthTypeEnum; -import com.newyetai.usercenter.auth.dto.AuthDetailBindDTO; -import com.newyetai.usercenter.auth.dto.AuthDetailLoginDTO; -import com.newyetai.usercenter.auth.service.AuthDetailService; -import com.newyetai.usercenter.common.mq.constant.UcMqConstants; -import com.newyetai.usercenter.constants.OrgConstants; -import com.newyetai.usercenter.dto.OrgUserEditDTO; -import com.newyetai.usercenter.dto.SuperResetPasswordDTO; -import com.newyetai.usercenter.user.constant.UserConfigConstants; -import com.newyetai.usercenter.user.constant.UserStatusEnum; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dao.UserMapper; -import com.newyetai.usercenter.user.dto.AuthenticateUserDTO; -import com.newyetai.usercenter.user.dto.BindPhoneDTO; -import com.newyetai.usercenter.user.dto.ChangePhoneDTO; -import com.newyetai.usercenter.user.dto.ChangePhoneMqDTO; -import com.newyetai.usercenter.user.dto.CheckSecurityCodeReqDTO; -import com.newyetai.usercenter.user.dto.InitUserPasswordDTO; -import com.newyetai.usercenter.user.dto.ModifyPasswordDTO; -import com.newyetai.usercenter.user.dto.OrgUserCreateDTO; -import com.newyetai.usercenter.user.dto.OrgUserModifyDTO; -import com.newyetai.usercenter.user.dto.OrgUserOperateDTO; -import com.newyetai.usercenter.user.dto.PersonUserCardCreateDTO; -import com.newyetai.usercenter.user.dto.PersonUserCardCreateResultDTO; -import com.newyetai.usercenter.user.dto.PersonUserPhoneCreateDTO; -import com.newyetai.usercenter.user.dto.PlatformUserInfoDTO; -import com.newyetai.usercenter.user.dto.PlatformUserInfoReqDTO; -import com.newyetai.usercenter.user.dto.PlatformUserListQueryDTO; -import com.newyetai.usercenter.user.dto.ResetPwdDTO; -import com.newyetai.usercenter.user.dto.ResetSecurityCodeDTO; -import com.newyetai.usercenter.user.dto.SelectUserDTO; -import com.newyetai.usercenter.user.dto.SuperChangePhoneDTO; -import com.newyetai.usercenter.user.dto.UserAuthOperateDTO; -import com.newyetai.usercenter.user.dto.UserAuthQueryDTO; -import com.newyetai.usercenter.user.dto.UserCancelReqDTO; -import com.newyetai.usercenter.user.dto.UserConfigDTO; -import com.newyetai.usercenter.user.dto.UserConfigQueryDTO; -import com.newyetai.usercenter.user.dto.UserDTO; -import com.newyetai.usercenter.user.dto.UserDetailQueryDTO; -import com.newyetai.usercenter.user.dto.UserExtendStatusDTO; -import com.newyetai.usercenter.user.dto.UserExtensionOperateDTO; -import com.newyetai.usercenter.user.dto.UserOperateDTO; -import com.newyetai.usercenter.user.dto.UserQueryByRoleDTO; -import com.newyetai.usercenter.user.dto.UserQueryDTO; -import com.newyetai.usercenter.user.entity.User; -import com.newyetai.usercenter.user.login.dto.UserDetailDTO; -import com.newyetai.usercenter.user.mapstruct.UserMapMapper; -import com.newyetai.usercenter.user.phone.util.PhoneCodeUtils; -import com.newyetai.usercenter.user.service.OrgUserService; -import com.newyetai.usercenter.user.service.UserAuthService; -import com.newyetai.usercenter.user.service.UserConfigService; -import com.newyetai.usercenter.user.service.UserExtensionService; -import com.newyetai.usercenter.user.service.UserService; -import com.newyetai.usercenter.user.util.UserUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.ChangeTokenException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.common.util.ListUtil; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.common.validation.util.ValidateUtils; +import com.senmesh.frame.redis.aop.annotation.AutoUnLock; +import com.senmesh.frame.redis.dto.LockDTO; +import com.senmesh.frame.redis.redisson.RedissonUtils; +import com.senmesh.mq.util.MqSendUtils; +import com.senmesh.security.dto.UserInfoDTO; +import com.senmesh.security.jwt.JwtTokenUtils; +import com.senmesh.security.util.PasswordUtils; +import com.senmesh.usercenter.auth.constant.AuthTypeEnum; +import com.senmesh.usercenter.auth.dto.AuthDetailBindDTO; +import com.senmesh.usercenter.auth.dto.AuthDetailLoginDTO; +import com.senmesh.usercenter.auth.service.AuthDetailService; +import com.senmesh.usercenter.common.mq.constant.UcMqConstants; +import com.senmesh.usercenter.dto.OrgUserEditDTO; +import com.senmesh.usercenter.dto.SuperResetPasswordDTO; +import com.senmesh.usercenter.user.constant.UserConfigConstants; +import com.senmesh.usercenter.user.constant.UserStatusEnum; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dao.UserMapper; +import com.senmesh.usercenter.user.dto.AuthenticateUserDTO; +import com.senmesh.usercenter.user.dto.BindPhoneDTO; +import com.senmesh.usercenter.user.dto.ChangePhoneDTO; +import com.senmesh.usercenter.user.dto.ChangePhoneMqDTO; +import com.senmesh.usercenter.user.dto.CheckSecurityCodeReqDTO; +import com.senmesh.usercenter.user.dto.InitUserPasswordDTO; +import com.senmesh.usercenter.user.dto.ModifyPasswordDTO; +import com.senmesh.usercenter.user.dto.OrgUserCreateDTO; +import com.senmesh.usercenter.user.dto.OrgUserModifyDTO; +import com.senmesh.usercenter.user.dto.OrgUserOperateDTO; +import com.senmesh.usercenter.user.dto.PersonUserCardCreateDTO; +import com.senmesh.usercenter.user.dto.PersonUserCardCreateResultDTO; +import com.senmesh.usercenter.user.dto.PersonUserPhoneCreateDTO; +import com.senmesh.usercenter.user.dto.PlatformUserInfoDTO; +import com.senmesh.usercenter.user.dto.PlatformUserInfoReqDTO; +import com.senmesh.usercenter.user.dto.PlatformUserListQueryDTO; +import com.senmesh.usercenter.user.dto.ResetPwdDTO; +import com.senmesh.usercenter.user.dto.ResetSecurityCodeDTO; +import com.senmesh.usercenter.user.dto.SelectUserDTO; +import com.senmesh.usercenter.user.dto.SuperChangePhoneDTO; +import com.senmesh.usercenter.user.dto.UserAuthOperateDTO; +import com.senmesh.usercenter.user.dto.UserAuthQueryDTO; +import com.senmesh.usercenter.user.dto.UserCancelReqDTO; +import com.senmesh.usercenter.user.dto.UserConfigDTO; +import com.senmesh.usercenter.user.dto.UserConfigQueryDTO; +import com.senmesh.usercenter.user.dto.UserDTO; +import com.senmesh.usercenter.user.dto.UserDetailQueryDTO; +import com.senmesh.usercenter.user.dto.UserExtendStatusDTO; +import com.senmesh.usercenter.user.dto.UserExtensionOperateDTO; +import com.senmesh.usercenter.user.dto.UserOperateDTO; +import com.senmesh.usercenter.user.dto.UserQueryByRoleDTO; +import com.senmesh.usercenter.user.dto.UserQueryDTO; +import com.senmesh.usercenter.user.entity.User; +import com.senmesh.usercenter.user.login.dto.UserDetailDTO; +import com.senmesh.usercenter.user.mapstruct.UserMapMapper; +import com.senmesh.usercenter.user.phone.util.PhoneCodeUtils; +import com.senmesh.usercenter.user.service.OrgUserService; +import com.senmesh.usercenter.user.service.UserAuthService; +import com.senmesh.usercenter.user.service.UserConfigService; +import com.senmesh.usercenter.user.service.UserExtensionService; +import com.senmesh.usercenter.user.service.UserService; +import com.senmesh.usercenter.user.util.UserUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/user/util/UserRegisterUtils.java b/src/main/java/com/senmesh/usercenter/user/util/UserRegisterUtils.java similarity index 83% rename from src/main/java/com/newyetai/usercenter/user/util/UserRegisterUtils.java rename to src/main/java/com/senmesh/usercenter/user/util/UserRegisterUtils.java index 2fa1bac..4e55eeb 100644 --- a/src/main/java/com/newyetai/usercenter/user/util/UserRegisterUtils.java +++ b/src/main/java/com/senmesh/usercenter/user/util/UserRegisterUtils.java @@ -1,13 +1,13 @@ -package com.newyetai.usercenter.user.util; +package com.senmesh.usercenter.user.util; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JasyptUtils; -import com.newyetai.security.util.SecurityUtils; -import com.newyetai.usercenter.user.dto.UserRegisterCodeInfoDTO; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JasyptUtils; +import com.senmesh.security.util.SecurityUtils; +import com.senmesh.usercenter.user.dto.UserRegisterCodeInfoDTO; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/user/util/UserUtils.java b/src/main/java/com/senmesh/usercenter/user/util/UserUtils.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/user/util/UserUtils.java rename to src/main/java/com/senmesh/usercenter/user/util/UserUtils.java index 02512d2..a292452 100644 --- a/src/main/java/com/newyetai/usercenter/user/util/UserUtils.java +++ b/src/main/java/com/senmesh/usercenter/user/util/UserUtils.java @@ -1,17 +1,17 @@ -package com.newyetai.usercenter.user.util; +package com.senmesh.usercenter.user.util; import org.apache.commons.lang3.StringUtils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.RandomUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.security.util.PasswordUtils; -import com.newyetai.usercenter.user.constant.UserStatusEnum; -import com.newyetai.usercenter.user.constant.UserTypeEnum; -import com.newyetai.usercenter.user.dto.IUserPhoneCodeSms; -import com.newyetai.usercenter.user.entity.User; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.RandomUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.security.util.PasswordUtils; +import com.senmesh.usercenter.user.constant.UserStatusEnum; +import com.senmesh.usercenter.user.constant.UserTypeEnum; +import com.senmesh.usercenter.user.dto.IUserPhoneCodeSms; +import com.senmesh.usercenter.user.entity.User; /** * @author sr on 2021-05-24 diff --git a/src/main/java/com/newyetai/usercenter/userprod/constant/UcMqSelfConstants.java b/src/main/java/com/senmesh/usercenter/userprod/constant/UcMqSelfConstants.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/userprod/constant/UcMqSelfConstants.java rename to src/main/java/com/senmesh/usercenter/userprod/constant/UcMqSelfConstants.java index 29d8449..ffaa561 100644 --- a/src/main/java/com/newyetai/usercenter/userprod/constant/UcMqSelfConstants.java +++ b/src/main/java/com/senmesh/usercenter/userprod/constant/UcMqSelfConstants.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.userprod.constant; +package com.senmesh.usercenter.userprod.constant; -import com.newyetai.usercenter.common.mq.constant.UcMqConstants; +import com.senmesh.usercenter.common.mq.constant.UcMqConstants; /** * 用户中心内部使用 diff --git a/src/main/java/com/newyetai/usercenter/utils/CheckUtil.java b/src/main/java/com/senmesh/usercenter/utils/CheckUtil.java similarity index 85% rename from src/main/java/com/newyetai/usercenter/utils/CheckUtil.java rename to src/main/java/com/senmesh/usercenter/utils/CheckUtil.java index 84ca240..d385021 100644 --- a/src/main/java/com/newyetai/usercenter/utils/CheckUtil.java +++ b/src/main/java/com/senmesh/usercenter/utils/CheckUtil.java @@ -1,8 +1,6 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; import cn.hutool.core.util.ReUtil; -import com.google.common.base.Strings; -import com.newyetai.common.exception.util.Assert; /** * @description: 校验工具类 diff --git a/src/main/java/com/newyetai/usercenter/utils/ComponentUtils.java b/src/main/java/com/senmesh/usercenter/utils/ComponentUtils.java similarity index 86% rename from src/main/java/com/newyetai/usercenter/utils/ComponentUtils.java rename to src/main/java/com/senmesh/usercenter/utils/ComponentUtils.java index d8c6732..5583672 100644 --- a/src/main/java/com/newyetai/usercenter/utils/ComponentUtils.java +++ b/src/main/java/com/senmesh/usercenter/utils/ComponentUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; -import com.newyetai.usercenter.resource.dto.ComponentDTO; -import com.newyetai.usercenter.resource.entity.Component; +import com.senmesh.usercenter.resource.dto.ComponentDTO; +import com.senmesh.usercenter.resource.entity.Component; /** * 组件工具类 diff --git a/src/main/java/com/newyetai/usercenter/utils/FindPwdUtils.java b/src/main/java/com/senmesh/usercenter/utils/FindPwdUtils.java similarity index 93% rename from src/main/java/com/newyetai/usercenter/utils/FindPwdUtils.java rename to src/main/java/com/senmesh/usercenter/utils/FindPwdUtils.java index f4b9cc7..d18af95 100644 --- a/src/main/java/com/newyetai/usercenter/utils/FindPwdUtils.java +++ b/src/main/java/com/senmesh/usercenter/utils/FindPwdUtils.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.exception.util.ExceptionUtils; -import com.newyetai.frame.redis.util.RedisUtils; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.exception.util.ExceptionUtils; +import com.senmesh.frame.redis.util.RedisUtils; import java.time.LocalDate; /** diff --git a/src/main/java/com/newyetai/usercenter/utils/PermissionPackageUtils.java b/src/main/java/com/senmesh/usercenter/utils/PermissionPackageUtils.java similarity index 65% rename from src/main/java/com/newyetai/usercenter/utils/PermissionPackageUtils.java rename to src/main/java/com/senmesh/usercenter/utils/PermissionPackageUtils.java index 22f934f..7ac0462 100644 --- a/src/main/java/com/newyetai/usercenter/utils/PermissionPackageUtils.java +++ b/src/main/java/com/senmesh/usercenter/utils/PermissionPackageUtils.java @@ -1,8 +1,7 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; -import com.newyetai.usercenter.permissionpackage.constants.PermissionPackageConstants; -import com.newyetai.usercenter.permissionpackage.dto.PermissionPackageDTO; -import com.newyetai.usercenter.permissionpackage.entity.PermissionPackage; +import com.senmesh.usercenter.permissionpackage.dto.PermissionPackageDTO; +import com.senmesh.usercenter.permissionpackage.entity.PermissionPackage; /** * 权限包工具类 diff --git a/src/main/java/com/newyetai/usercenter/utils/PermissionUtils.java b/src/main/java/com/senmesh/usercenter/utils/PermissionUtils.java similarity index 73% rename from src/main/java/com/newyetai/usercenter/utils/PermissionUtils.java rename to src/main/java/com/senmesh/usercenter/utils/PermissionUtils.java index cad2945..19aa90f 100644 --- a/src/main/java/com/newyetai/usercenter/utils/PermissionUtils.java +++ b/src/main/java/com/senmesh/usercenter/utils/PermissionUtils.java @@ -1,9 +1,9 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; -import com.newyetai.common.util.EnvironmentUtils; -import com.newyetai.common.util.UserContextHolder; -import com.newyetai.usercenter.authority.entity.Permission; -import com.newyetai.usercenter.constants.SecurityConstants; +import com.senmesh.common.util.EnvironmentUtils; +import com.senmesh.common.util.UserContextHolder; +import com.senmesh.usercenter.authority.entity.Permission; +import com.senmesh.usercenter.constants.SecurityConstants; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/com/newyetai/usercenter/utils/RoleAllocationUtils.java b/src/main/java/com/senmesh/usercenter/utils/RoleAllocationUtils.java similarity index 82% rename from src/main/java/com/newyetai/usercenter/utils/RoleAllocationUtils.java rename to src/main/java/com/senmesh/usercenter/utils/RoleAllocationUtils.java index 0313679..6d3f725 100644 --- a/src/main/java/com/newyetai/usercenter/utils/RoleAllocationUtils.java +++ b/src/main/java/com/senmesh/usercenter/utils/RoleAllocationUtils.java @@ -1,6 +1,6 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; -import com.newyetai.usercenter.authority.entity.RoleAllocation; +import com.senmesh.usercenter.authority.entity.RoleAllocation; /** * 角色分配常量类 diff --git a/src/main/java/com/newyetai/usercenter/utils/RoleUtils.java b/src/main/java/com/senmesh/usercenter/utils/RoleUtils.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/utils/RoleUtils.java rename to src/main/java/com/senmesh/usercenter/utils/RoleUtils.java index 9a5ffc4..bfe02f9 100644 --- a/src/main/java/com/newyetai/usercenter/utils/RoleUtils.java +++ b/src/main/java/com/senmesh/usercenter/utils/RoleUtils.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; -import com.newyetai.usercenter.authority.entity.Role; -import com.newyetai.usercenter.constants.RoleConstants; -import com.newyetai.usercenter.dto.RoleDTO; +import com.senmesh.usercenter.authority.entity.Role; +import com.senmesh.usercenter.constants.RoleConstants; +import com.senmesh.usercenter.dto.RoleDTO; /** * 角色工具类 diff --git a/src/main/java/com/newyetai/usercenter/utils/StringUtils.java b/src/main/java/com/senmesh/usercenter/utils/StringUtils.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/utils/StringUtils.java rename to src/main/java/com/senmesh/usercenter/utils/StringUtils.java index 3962ef9..c9fc982 100644 --- a/src/main/java/com/newyetai/usercenter/utils/StringUtils.java +++ b/src/main/java/com/senmesh/usercenter/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; import org.apache.commons.lang3.RandomStringUtils; diff --git a/src/main/java/com/newyetai/usercenter/utils/UrlUtils.java b/src/main/java/com/senmesh/usercenter/utils/UrlUtils.java similarity index 94% rename from src/main/java/com/newyetai/usercenter/utils/UrlUtils.java rename to src/main/java/com/senmesh/usercenter/utils/UrlUtils.java index 8162210..1466420 100644 --- a/src/main/java/com/newyetai/usercenter/utils/UrlUtils.java +++ b/src/main/java/com/senmesh/usercenter/utils/UrlUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.utils; +package com.senmesh.usercenter.utils; -import com.newyetai.usercenter.resource.dto.UrlDTO; -import com.newyetai.usercenter.resource.entity.Url; +import com.senmesh.usercenter.resource.dto.UrlDTO; +import com.senmesh.usercenter.resource.entity.Url; import java.util.Objects; diff --git a/src/main/java/com/newyetai/usercenter/websocket/config/DefaultHttpSessionHandshakeInterceptor.java b/src/main/java/com/senmesh/usercenter/websocket/config/DefaultHttpSessionHandshakeInterceptor.java similarity index 91% rename from src/main/java/com/newyetai/usercenter/websocket/config/DefaultHttpSessionHandshakeInterceptor.java rename to src/main/java/com/senmesh/usercenter/websocket/config/DefaultHttpSessionHandshakeInterceptor.java index 1433f4c..b77b84f 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/config/DefaultHttpSessionHandshakeInterceptor.java +++ b/src/main/java/com/senmesh/usercenter/websocket/config/DefaultHttpSessionHandshakeInterceptor.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.websocket.config; +package com.senmesh.usercenter.websocket.config; import java.util.Collection; diff --git a/src/main/java/com/newyetai/usercenter/websocket/config/DefaultTextWebSocketHandler.java b/src/main/java/com/senmesh/usercenter/websocket/config/DefaultTextWebSocketHandler.java similarity index 90% rename from src/main/java/com/newyetai/usercenter/websocket/config/DefaultTextWebSocketHandler.java rename to src/main/java/com/senmesh/usercenter/websocket/config/DefaultTextWebSocketHandler.java index 6366454..358a0bd 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/config/DefaultTextWebSocketHandler.java +++ b/src/main/java/com/senmesh/usercenter/websocket/config/DefaultTextWebSocketHandler.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.websocket.config; +package com.senmesh.usercenter.websocket.config; import java.util.Collection; import java.util.List; @@ -13,14 +13,14 @@ import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.handler.TextWebSocketHandler; -import com.newyetai.common.constant.CommonConstants; -import com.newyetai.common.util.CookieUtils; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.security.jwt.JwtTokenUtils; -import com.newyetai.security.util.SecurityPropertyUtils; -import com.newyetai.usercenter.dto.IUserDetail; -import com.newyetai.usercenter.websocket.service.IWebSocketProvider; -import com.newyetai.usercenter.websocket.service.SocketMessage; +import com.senmesh.common.constant.CommonConstants; +import com.senmesh.common.util.CookieUtils; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.security.jwt.JwtTokenUtils; +import com.senmesh.security.util.SecurityPropertyUtils; +import com.senmesh.usercenter.dto.IUserDetail; +import com.senmesh.usercenter.websocket.service.IWebSocketProvider; +import com.senmesh.usercenter.websocket.service.SocketMessage; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/newyetai/usercenter/websocket/config/WebSocketConfiguration.java b/src/main/java/com/senmesh/usercenter/websocket/config/WebSocketConfiguration.java similarity index 87% rename from src/main/java/com/newyetai/usercenter/websocket/config/WebSocketConfiguration.java rename to src/main/java/com/senmesh/usercenter/websocket/config/WebSocketConfiguration.java index 78667c5..a6c8851 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/config/WebSocketConfiguration.java +++ b/src/main/java/com/senmesh/usercenter/websocket/config/WebSocketConfiguration.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.websocket.config; +package com.senmesh.usercenter.websocket.config; import java.util.List; @@ -14,10 +14,10 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer; import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; import com.google.common.collect.Lists; -import com.newyetai.security.util.SecurityPropertyUtils; -import com.newyetai.usercenter.websocket.service.IWebSocketProvider; -import com.newyetai.usercenter.websocket.service.impl.DefaultWebSocketProvider; -import com.newyetai.usercenter.websocket.util.WebSocketUtils; +import com.senmesh.security.util.SecurityPropertyUtils; +import com.senmesh.usercenter.websocket.service.IWebSocketProvider; +import com.senmesh.usercenter.websocket.service.impl.DefaultWebSocketProvider; +import com.senmesh.usercenter.websocket.util.WebSocketUtils; /** * websocket配置类 diff --git a/src/main/java/com/newyetai/usercenter/websocket/config/WebSocketProperties.java b/src/main/java/com/senmesh/usercenter/websocket/config/WebSocketProperties.java similarity index 88% rename from src/main/java/com/newyetai/usercenter/websocket/config/WebSocketProperties.java rename to src/main/java/com/senmesh/usercenter/websocket/config/WebSocketProperties.java index a3f26a4..521fff5 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/config/WebSocketProperties.java +++ b/src/main/java/com/senmesh/usercenter/websocket/config/WebSocketProperties.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.websocket.config; +package com.senmesh.usercenter.websocket.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/newyetai/usercenter/websocket/service/ISocketMessageSender.java b/src/main/java/com/senmesh/usercenter/websocket/service/ISocketMessageSender.java similarity index 92% rename from src/main/java/com/newyetai/usercenter/websocket/service/ISocketMessageSender.java rename to src/main/java/com/senmesh/usercenter/websocket/service/ISocketMessageSender.java index 0afa87e..d79cfe0 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/service/ISocketMessageSender.java +++ b/src/main/java/com/senmesh/usercenter/websocket/service/ISocketMessageSender.java @@ -1,8 +1,8 @@ -package com.newyetai.usercenter.websocket.service; +package com.senmesh.usercenter.websocket.service; import org.springframework.web.socket.WebSocketSession; -import com.newyetai.usercenter.websocket.util.WebSocketUtils; +import com.senmesh.usercenter.websocket.util.WebSocketUtils; /** * @param diff --git a/src/main/java/com/newyetai/usercenter/websocket/service/IWebSocketProvider.java b/src/main/java/com/senmesh/usercenter/websocket/service/IWebSocketProvider.java similarity index 84% rename from src/main/java/com/newyetai/usercenter/websocket/service/IWebSocketProvider.java rename to src/main/java/com/senmesh/usercenter/websocket/service/IWebSocketProvider.java index 5bcaf73..70f218a 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/service/IWebSocketProvider.java +++ b/src/main/java/com/senmesh/usercenter/websocket/service/IWebSocketProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.websocket.service; +package com.senmesh.usercenter.websocket.service; import org.springframework.web.socket.WebSocketSession; diff --git a/src/main/java/com/newyetai/usercenter/websocket/service/SocketMessage.java b/src/main/java/com/senmesh/usercenter/websocket/service/SocketMessage.java similarity index 89% rename from src/main/java/com/newyetai/usercenter/websocket/service/SocketMessage.java rename to src/main/java/com/senmesh/usercenter/websocket/service/SocketMessage.java index 0211644..cb7b599 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/service/SocketMessage.java +++ b/src/main/java/com/senmesh/usercenter/websocket/service/SocketMessage.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.websocket.service; +package com.senmesh.usercenter.websocket.service; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/newyetai/usercenter/websocket/service/impl/DefaultWebSocketProvider.java b/src/main/java/com/senmesh/usercenter/websocket/service/impl/DefaultWebSocketProvider.java similarity index 77% rename from src/main/java/com/newyetai/usercenter/websocket/service/impl/DefaultWebSocketProvider.java rename to src/main/java/com/senmesh/usercenter/websocket/service/impl/DefaultWebSocketProvider.java index c23a518..617899e 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/service/impl/DefaultWebSocketProvider.java +++ b/src/main/java/com/senmesh/usercenter/websocket/service/impl/DefaultWebSocketProvider.java @@ -1,4 +1,4 @@ -package com.newyetai.usercenter.websocket.service.impl; +package com.senmesh.usercenter.websocket.service.impl; import java.util.Collections; import java.util.List; @@ -6,8 +6,8 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.socket.WebSocketSession; -import com.newyetai.usercenter.websocket.service.ISocketMessageSender; -import com.newyetai.usercenter.websocket.service.IWebSocketProvider; +import com.senmesh.usercenter.websocket.service.ISocketMessageSender; +import com.senmesh.usercenter.websocket.service.IWebSocketProvider; /** * @author sr on 2021-01-04 diff --git a/src/main/java/com/senmesh/usercenter/websocket/service/impl/WebsocketNoticeSendProvider.java b/src/main/java/com/senmesh/usercenter/websocket/service/impl/WebsocketNoticeSendProvider.java new file mode 100644 index 0000000..a99d13c --- /dev/null +++ b/src/main/java/com/senmesh/usercenter/websocket/service/impl/WebsocketNoticeSendProvider.java @@ -0,0 +1,18 @@ +package com.senmesh.usercenter.websocket.service.impl; + +import com.senmesh.component.notice.dto.NoticeMsgDTO; +import org.springframework.stereotype.Service; + +import com.senmesh.component.notice.service.INoticeSendProvider; +import com.senmesh.usercenter.websocket.util.WebSocketUtils; + +@Service +public class WebsocketNoticeSendProvider implements INoticeSendProvider { + + @Override + public void send(NoticeMsgDTO msg) { + WebSocketUtils.send(msg.getReceiverId(), msg.getType(), msg); + } + + +} diff --git a/src/main/java/com/newyetai/usercenter/websocket/util/WebSocketUtils.java b/src/main/java/com/senmesh/usercenter/websocket/util/WebSocketUtils.java similarity index 81% rename from src/main/java/com/newyetai/usercenter/websocket/util/WebSocketUtils.java rename to src/main/java/com/senmesh/usercenter/websocket/util/WebSocketUtils.java index 976d757..6dc7dc5 100644 --- a/src/main/java/com/newyetai/usercenter/websocket/util/WebSocketUtils.java +++ b/src/main/java/com/senmesh/usercenter/websocket/util/WebSocketUtils.java @@ -1,7 +1,7 @@ -package com.newyetai.usercenter.websocket.util; +package com.senmesh.usercenter.websocket.util; -import com.newyetai.usercenter.websocket.config.DefaultTextWebSocketHandler; -import com.newyetai.usercenter.websocket.service.SocketMessage; +import com.senmesh.usercenter.websocket.config.DefaultTextWebSocketHandler; +import com.senmesh.usercenter.websocket.service.SocketMessage; /** * 工具类 diff --git a/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java b/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java index d7bd93d..c9cbcd6 100644 --- a/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java +++ b/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java @@ -15,7 +15,7 @@ import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; import org.springframework.util.StringUtils; -import com.newyetai.security.social.service.CommonOAuth2Provider; +import com.senmesh.security.social.service.CommonOAuth2Provider; /** * Adapter class to convert {@link OAuth2ClientProperties} to a diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories index e757a32..94166f6 100644 --- a/src/main/resources/META-INF/spring.factories +++ b/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.newyetai.common.CommonConfiguration,\ -com.newyetai.codegenerator.config.CodeConfiguration,\ -com.newyetai.frame.redis.config.RedisCacheConfig,\ -com.newyetai.mq.config.RabbitMqConfiguration \ No newline at end of file +com.senmesh.common.CommonConfiguration,\ +com.senmesh.codegenerator.config.CodeConfiguration,\ +com.senmesh.frame.redis.config.RedisCacheConfig,\ +com.senmesh.mq.config.RabbitMqConfiguration \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 74203df..802fb3b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -49,7 +49,7 @@ file.storage.type=local #发号器 #机器id：根据ip自己定义 code.snowflake.workid.192.168.31.135=23 -code.snowflake.workid.192.168.1.63=24 +code.snowflake.workid.192.168.1.66=24 code.snowflake.workid.121.37.2.171=1 code.snowflake.workid.139.159.237.199=2 diff --git a/src/test/java/com/newyetai/AliVerifyTest.java b/src/test/java/com/senmesh/AliVerifyTest.java similarity index 65% rename from src/test/java/com/newyetai/AliVerifyTest.java rename to src/test/java/com/senmesh/AliVerifyTest.java index 23392e1..306032f 100644 --- a/src/test/java/com/newyetai/AliVerifyTest.java +++ b/src/test/java/com/senmesh/AliVerifyTest.java @@ -1,11 +1,11 @@ -package com.newyetai; +package com.senmesh; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.sdk.ali.config.AliProperties.IdcardProperties; -import com.newyetai.sdk.ali.dto.IdCardReq; -import com.newyetai.sdk.ali.dto.IdCardRes; -import com.newyetai.sdk.ali.service.impl.AliVerifyServiceImpl; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.ali.config.AliProperties.IdcardProperties; +import com.senmesh.sdk.ali.dto.IdCardReq; +import com.senmesh.sdk.ali.dto.IdCardRes; +import com.senmesh.sdk.ali.service.impl.AliVerifyServiceImpl; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/newyetai/DeepSeekTest.java b/src/test/java/com/senmesh/DeepSeekTest.java similarity index 58% rename from src/test/java/com/newyetai/DeepSeekTest.java rename to src/test/java/com/senmesh/DeepSeekTest.java index 0beae52..0e3dbab 100644 --- a/src/test/java/com/newyetai/DeepSeekTest.java +++ b/src/test/java/com/senmesh/DeepSeekTest.java @@ -1,10 +1,9 @@ -package com.newyetai; +package com.senmesh; -import com.newyetai.common.AlitaResult; -import com.newyetai.sdk.common.util.HttpUtils; -import com.newyetai.sdk.deepseek.service.DeepSeekProvider; -import com.newyetai.sdk.xf.model.ChatReq; -import com.newyetai.sdk.xf.model.MessageDTO; +import com.senmesh.common.AlitaResult; +import com.senmesh.sdk.deepseek.service.DeepSeekProvider; +import com.senmesh.sdk.xf.model.ChatReq; +import com.senmesh.sdk.xf.model.MessageDTO; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/newyetai/SensitiveWordTest.java b/src/test/java/com/senmesh/SensitiveWordTest.java similarity index 95% rename from src/test/java/com/newyetai/SensitiveWordTest.java rename to src/test/java/com/senmesh/SensitiveWordTest.java index ba39522..187b299 100644 --- a/src/test/java/com/newyetai/SensitiveWordTest.java +++ b/src/test/java/com/senmesh/SensitiveWordTest.java @@ -1,8 +1,7 @@ -package com.newyetai; +package com.senmesh; import java.io.BufferedReader; import java.io.File; -import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; @@ -11,7 +10,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; -import com.newyetai.common.util.SensitiveWordUtils; +import com.senmesh.common.util.SensitiveWordUtils; import toolgood.words.IllegalWordsSearch; diff --git a/src/test/java/com/newyetai/SparkTest.java b/src/test/java/com/senmesh/SparkTest.java similarity index 89% rename from src/test/java/com/newyetai/SparkTest.java rename to src/test/java/com/senmesh/SparkTest.java index bcd57d2..822c0e6 100644 --- a/src/test/java/com/newyetai/SparkTest.java +++ b/src/test/java/com/senmesh/SparkTest.java @@ -1,255 +1,245 @@ -package com.newyetai; - -import com.newyetai.sdk.xf.config.XfProperties.XfAppProperties; -import com.newyetai.sdk.xf.model.TranslateReq; -import com.newyetai.sdk.xf.service.RtasrClientApp; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.HashMap; -import java.util.Map; - -import javax.sound.sampled.AudioFileFormat; -import javax.sound.sampled.AudioFormat; -import javax.sound.sampled.AudioInputStream; -import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.UnsupportedAudioFileException; - -import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream; -import org.junit.jupiter.api.Test; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; - -import com.google.common.collect.Lists; -import com.newyetai.common.AlitaResult; -import com.newyetai.common.exception.BusinessException; -import com.newyetai.common.exception.util.Assert; -import com.newyetai.common.util.JsonUtils; -import com.newyetai.component.file.entity.FileRecord; -import com.newyetai.component.file.util.FileUtils; -import com.newyetai.sdk.common.util.HttpUtils; -import com.newyetai.sdk.xf.config.XfProperties; -import com.newyetai.sdk.xf.model.ChatReq; -import com.newyetai.sdk.xf.model.MessageDTO; -import com.newyetai.sdk.xf.service.XfSparkProvider; -import com.newyetai.sdk.xf.util.WebIATWS; -import com.newyetai.sdk.xf.util.WebTtsWS; - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class SparkTest { - static String httpAPIPassword = ""; - - static XfProperties xfProperties = XfProperties.builder() - .iatHostUrl("https://iat-api.xfyun.cn/v2/iat") - .ttsHostUrl("https://tts-api.xfyun.cn/v2/tts") - .otsHostUrl("https://ntrans.xfyun.cn/v2/ots") - .httpAPIPassword("EfqszvaEEoTnUfQRRcvr:ohEYAwzpIiUeWFvZAqEk") - .appId("83b8ddca") - .apiSecret("ZWE2MjkzY2VmZDkwM2EwZGJhNGRhOWJm") - .apiKey("e092f93e28ebe6d27f756bb2d884dcff") - .rtasr(XfAppProperties.builder().apiKey("2e33d9128a73be21b294594e5377ca53").build()) - .build(); - - @Test - public void test() { - HttpHeaders header = new HttpHeaders(); - header.add("Authorization", "Bearer " + httpAPIPassword); - header.add("Content-Type", "application/json"); - // 发送请求 - Map data = new HashMap(); - data.put("model","4.0Ultra"); - Map r1 = new HashMap(); - r1.put("role","system"); - r1.put("content","你是一位专业的HR。目标任务：请根据我给出的position_name生成5个相关的面试中可能会问到的问题,并为每个问题都生成一个参考答案，并从1开始生成问题序号"); - Map r2 = new HashMap(); - r2.put("role","system"); - r2.put("content","全部数据以JSON模版的形式返回，格式为:{position_name:岗位信息, [{qno:问题序号,q:问题,a:参考答案}]}"); - Map r3 = new HashMap(); - r3.put("role","user"); - r3.put("content","{\"positionName\":\"java开发\"}"); - data.put("messages",Lists.newArrayList(r1, r2, r3)); - HttpEntity requestEntity = new HttpEntity(data, header); - ResponseEntity response = HttpUtils.restTemplate.exchange("https://spark-api-open.xf-yun.com/v1/chat/completions", HttpMethod.POST, requestEntity, String.class); - System.out.println(JsonUtils.toDefaultJsonString(response)); - } - - @Test - public void testAlita() { - ChatReq req = ChatReq.builder() - .message(MessageDTO.builder().role("system") - .content("你是一位专业的HR。目标任务：请根据我给出的信息生成5个相关的面试中可能会问到的问题,并为每个问题都生成一个参考答案，并从1开始生成问题序号") - .build()) - .message(MessageDTO.builder().role("system") - .content("全部数据以JSON模版的形式返回，格式为:[{qno:问题序号,q:问题,a:参考答案}]").build()) - .message(MessageDTO.builder().role("user").content("jobName").build()).build(); - AlitaResult res = XfSparkProvider.httpChat(req, httpAPIPassword); - log.info("{}", res); - } - - - @Test - public void testEvaluate() { - ChatReq req = ChatReq.builder() - .message(MessageDTO.builder().role("system") - .content("你是一位专业的简历撰写专家。目标任务：请根据我给出的信息，生成指定的内容。需求说明：要求在与原文语意一致的基础上扩写内容,风格设定,简明扼要。") - .build()) - .message(MessageDTO.builder().role("system") - .content("根据我输入的信息，输出1段自我评价，包含学习能力、工作态度、团队协作等方面，字数在300字左右") - .build()) - .message(MessageDTO.builder().role("system") - .content("全部数据以JSON模版的形式返回, 格式为：{'selfEva'：xxx}") - .build()) - .message(MessageDTO.builder().role("user").content("环卫工").build()).build(); - AlitaResult res = XfSparkProvider.httpChat(req, httpAPIPassword); - log.info("{}", res); - } - - @Test - public void testWorkExperience() { - ChatReq req = ChatReq.builder() - .message(MessageDTO.builder().role("system") - .content("你是一位专业的简历撰写专家。目标任务：请根据我给出的信息，生成一份履历丰富的简历。") - .build()) - .message(MessageDTO.builder().role("system") - .content("简历内容包含个人信息简介、工作经历、教育背景、掌握技能、自我评价。以JSON格式返回，每个点作为一个对象。") - .build()) - .message(MessageDTO.builder().role("system") - .content("个人信息输出格式为：{姓名：xxx, 年龄：xxx，联系电话：xxx，联系邮箱：xxx}") - .build()) - .message(MessageDTO.builder().role("system") - .content("工作经历以数组的形式返回。输出格式为：[{企业名称：xxx, 岗位：xxx，工作职责：[xxx,xxx,xxx]，工作时间:xxx-xxx}]") - .build()) - .message(MessageDTO.builder().role("system") - .content("掌握技能必须作为数组输出") - .build()) - .message(MessageDTO.builder().role("system") - .content("自我评价必须作为数组输出") - .build()) - .message(MessageDTO.builder().role("user") -// .content("{\"name\":\"小明\",\"gender\":1,\"contactWay\":\"0717-123123\",\"birthDay\":\"1980-07\",\"work\":\"在一家科技公司干了4年\"}") - .content("我是小明，在一家科技公司干了4年") - .build()).build(); - AlitaResult result = XfSparkProvider.httpChat(req, httpAPIPassword); - log.info("{}", result); - - } - - - @Test - public void testAnalyseResume() { - ChatReq req = ChatReq.builder() - .message(MessageDTO.builder().role("system") - .content("你是一位专业的简历分析专家。目标任务：请根据我给出的信息，分析得出简历信息。不要自己填充json信息") - .build()) - .message(MessageDTO.builder().role("system") - .content("请生成一个包含以下信息的 JSON 数据，根据用户给出的实际信息解析，值都可为空：\n" - + "- name（字符串类型）：表示用户的姓名。\n" - + "- sex（字符串类型）：表示用户的性别，值为 \"1\"（男）或 \"2\"（女），身份证号倒数第二位，奇数是男，偶数是女。\n" - + "- phone（字符串类型）：表示用户的联系电话，可为空，不为空的格式为 以 1 开头，共 11 位数字。\n" - + "- email（字符串类型）：表示用户的联系电子邮箱地址，可为空，不为空的格式为 包含 @ 符号，且 @ 前后至少有一个字符 及 域名部分至少包含一个 . 符号。\n" - + "- intentionPosition（字符串类型）：表示用户的意向职位。\n" - + "- major（字符串类型）：表示用户的专业。\n" - + "- birthday（日期类型）：表示用户的出生日期，格式为 YYYY-MM。\n" - + "- jobTime（日期类型）：表示用户的参加工作时间，格式为 YYYY-MM。\n" - + "- school（字符串类型）：表示用户的毕业院校。\n" - + "- education（字符串类型）：表示用户的学历，值为：\n" - + " - \"1\"：\"博士\"\n" - + " - \"2\"：\"硕士\"\n" - + " - \"3\"：\"本科\"\n" - + " - \"4\"：\"大专\"\n" - + " - \"5\"：\"中专\"\n" - + " - \"6\"：\"技校\"\n" - + " - \"7\"：\"职高\"\n" - + " - \"9\"：\"高中\"\n" - + " - \"10\"：\"初中\"\n" - + " - \"11\"：\"小学\"\n" - + "- workExperience（字符串类型）：表示用户的工作经历，格式为多行文本，包含以下信息：\n" - + " - 企业名称\n" - + " - 岗位\n" - + " - 工作时间\n" - + " - 工作职责\n" - + "- selfEvaluation（字符串类型）：表示用户的自我评价，格式为多行文本。") - .build()) - .message(MessageDTO.builder().role("user").content("我是小明，身份证号是110105199003071234，小学毕业，前年在一家科技公司干了1年，现在想找个环卫工的活，请用abc@33.com联系我").build()).build(); - AlitaResult result = XfSparkProvider.httpChat(req, httpAPIPassword); - log.info("{}", result); - - } - - @Test - public void iat() throws IOException { - String file = "src/main/resources/iat/cn.pcm"; - try(InputStream is = new FileInputStream(file)){ - AlitaResult result = WebIATWS.execute(is, xfProperties); - log.info("{}", result); - } -// // 示例的WebM文件路径（请替换为实际的有效路径） - String webmFilePath = "src/main/resources/iat/audio.webm"; -// // 示例的输出MP3文件路径（请替换为实际的有效路径） -// String mp3FilePath = "src/main/resources/iat/file.mp3"; - -// try(InputStream is = FileUtils.convertWebmToMp3(new File(webmFilePath))){ -// AlitaResult result = WebIATWS.execute(is, xfProperties); -// log.info("{}", result); -// } - - } - - @Test - public void tts() throws Exception { -// try(OutputStream outputStream = new FileOutputStream("src/main/resources/iat/223.mp3");){ -// WebTtsWS.execute("欢迎来到讯飞开放平台", xfProperties, outputStream); -// } -// try(ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); -// OutputStream fs = new FileOutputStream("src/main/resources/iat/323.mp3");){ -// WebTtsWS.execute("欢迎来到讯飞开放平台", xfProperties, outputStream); -// fs.write(outputStream.toByteArray()); -// } - - try(ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - OutputStream fs = new FileOutputStream("src/main/resources/iat/323.mp3");){ - AlitaResult result = WebTtsWS.execute("欢迎来到讯飞开放平台", xfProperties, outputStream); - Assert.isTrue(result.getSuccess(), result.getMsg()); - fs.write(outputStream.toByteArray()); - } catch (IOException e) { - throw new BusinessException("语音合成异常:" + e.getMessage()); - } - } - - @Test - public void ots(){ -// AlitaResult result = XfSparkProvider.translate(TranslateReq.builder().text("欢迎#你啊,.;@#$你好").build(), xfProperties); - AlitaResult result = XfSparkProvider.translate(TranslateReq.builder().text("تىيانەي ئەقىللىق خىزمەت مۇلازىمىتى بىرلەشمە سۇپىسىغا خوش ھەمرىيىڭىز.").from("uy").to("cn").build(), xfProperties); - log.info("{}", result); - } - - @Test - public void rtasr() throws IOException { - String file = "src/main/resources/iat/ug.pcm"; - try (InputStream is = new FileInputStream(file)) { - AlitaResult result = RtasrClientApp.execute(is, "cn_uyghur", xfProperties); - log.info("{}", result); - } - } - - @Test - public void chat(){ - ChatReq req = ChatReq.builder().message(MessageDTO.builder().role("system").content( - "你是一位专业的简历分析专家。目标任务：请根据我给出的信息，分析得出简历信息。不要自己填充json信息") - .role("user").content("我是大学生") - .build()).build(); - - AlitaResult result = XfSparkProvider.httpChat(req, xfProperties.getHttpAPIPassword()); - Assert.isTrue(result.getSuccess(), result.getMsg()); - log.info("{}", result); - } - -} +package com.senmesh; + +import com.senmesh.sdk.xf.config.XfProperties.XfAppProperties; +import com.senmesh.sdk.xf.model.TranslateReq; +import com.senmesh.sdk.xf.service.RtasrClientApp; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream; +import org.junit.jupiter.api.Test; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; + +import com.google.common.collect.Lists; +import com.senmesh.common.AlitaResult; +import com.senmesh.common.exception.BusinessException; +import com.senmesh.common.exception.util.Assert; +import com.senmesh.common.util.JsonUtils; +import com.senmesh.sdk.common.util.HttpUtils; +import com.senmesh.sdk.xf.config.XfProperties; +import com.senmesh.sdk.xf.model.ChatReq; +import com.senmesh.sdk.xf.model.MessageDTO; +import com.senmesh.sdk.xf.service.XfSparkProvider; +import com.senmesh.sdk.xf.util.WebIATWS; +import com.senmesh.sdk.xf.util.WebTtsWS; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class SparkTest { + static String httpAPIPassword = ""; + + static XfProperties xfProperties = XfProperties.builder() + .iatHostUrl("https://iat-api.xfyun.cn/v2/iat") + .ttsHostUrl("https://tts-api.xfyun.cn/v2/tts") + .otsHostUrl("https://ntrans.xfyun.cn/v2/ots") + .httpAPIPassword("EfqszvaEEoTnUfQRRcvr:ohEYAwzpIiUeWFvZAqEk") + .appId("83b8ddca") + .apiSecret("ZWE2MjkzY2VmZDkwM2EwZGJhNGRhOWJm") + .apiKey("e092f93e28ebe6d27f756bb2d884dcff") + .rtasr(XfAppProperties.builder().apiKey("2e33d9128a73be21b294594e5377ca53").build()) + .build(); + + @Test + public void test() { + HttpHeaders header = new HttpHeaders(); + header.add("Authorization", "Bearer " + httpAPIPassword); + header.add("Content-Type", "application/json"); + // 发送请求 + Map data = new HashMap(); + data.put("model","4.0Ultra"); + Map r1 = new HashMap(); + r1.put("role","system"); + r1.put("content","你是一位专业的HR。目标任务：请根据我给出的position_name生成5个相关的面试中可能会问到的问题,并为每个问题都生成一个参考答案，并从1开始生成问题序号"); + Map r2 = new HashMap(); + r2.put("role","system"); + r2.put("content","全部数据以JSON模版的形式返回，格式为:{position_name:岗位信息, [{qno:问题序号,q:问题,a:参考答案}]}"); + Map r3 = new HashMap(); + r3.put("role","user"); + r3.put("content","{\"positionName\":\"java开发\"}"); + data.put("messages",Lists.newArrayList(r1, r2, r3)); + HttpEntity requestEntity = new HttpEntity(data, header); + ResponseEntity response = HttpUtils.restTemplate.exchange("https://spark-api-open.xf-yun.com/v1/chat/completions", HttpMethod.POST, requestEntity, String.class); + System.out.println(JsonUtils.toDefaultJsonString(response)); + } + + @Test + public void testAlita() { + ChatReq req = ChatReq.builder() + .message(MessageDTO.builder().role("system") + .content("你是一位专业的HR。目标任务：请根据我给出的信息生成5个相关的面试中可能会问到的问题,并为每个问题都生成一个参考答案，并从1开始生成问题序号") + .build()) + .message(MessageDTO.builder().role("system") + .content("全部数据以JSON模版的形式返回，格式为:[{qno:问题序号,q:问题,a:参考答案}]").build()) + .message(MessageDTO.builder().role("user").content("jobName").build()).build(); + AlitaResult res = XfSparkProvider.httpChat(req, httpAPIPassword); + log.info("{}", res); + } + + + @Test + public void testEvaluate() { + ChatReq req = ChatReq.builder() + .message(MessageDTO.builder().role("system") + .content("你是一位专业的简历撰写专家。目标任务：请根据我给出的信息，生成指定的内容。需求说明：要求在与原文语意一致的基础上扩写内容,风格设定,简明扼要。") + .build()) + .message(MessageDTO.builder().role("system") + .content("根据我输入的信息，输出1段自我评价，包含学习能力、工作态度、团队协作等方面，字数在300字左右") + .build()) + .message(MessageDTO.builder().role("system") + .content("全部数据以JSON模版的形式返回, 格式为：{'selfEva'：xxx}") + .build()) + .message(MessageDTO.builder().role("user").content("环卫工").build()).build(); + AlitaResult res = XfSparkProvider.httpChat(req, httpAPIPassword); + log.info("{}", res); + } + + @Test + public void testWorkExperience() { + ChatReq req = ChatReq.builder() + .message(MessageDTO.builder().role("system") + .content("你是一位专业的简历撰写专家。目标任务：请根据我给出的信息，生成一份履历丰富的简历。") + .build()) + .message(MessageDTO.builder().role("system") + .content("简历内容包含个人信息简介、工作经历、教育背景、掌握技能、自我评价。以JSON格式返回，每个点作为一个对象。") + .build()) + .message(MessageDTO.builder().role("system") + .content("个人信息输出格式为：{姓名：xxx, 年龄：xxx，联系电话：xxx，联系邮箱：xxx}") + .build()) + .message(MessageDTO.builder().role("system") + .content("工作经历以数组的形式返回。输出格式为：[{企业名称：xxx, 岗位：xxx，工作职责：[xxx,xxx,xxx]，工作时间:xxx-xxx}]") + .build()) + .message(MessageDTO.builder().role("system") + .content("掌握技能必须作为数组输出") + .build()) + .message(MessageDTO.builder().role("system") + .content("自我评价必须作为数组输出") + .build()) + .message(MessageDTO.builder().role("user") +// .content("{\"name\":\"小明\",\"gender\":1,\"contactWay\":\"0717-123123\",\"birthDay\":\"1980-07\",\"work\":\"在一家科技公司干了4年\"}") + .content("我是小明，在一家科技公司干了4年") + .build()).build(); + AlitaResult result = XfSparkProvider.httpChat(req, httpAPIPassword); + log.info("{}", result); + + } + + + @Test + public void testAnalyseResume() { + ChatReq req = ChatReq.builder() + .message(MessageDTO.builder().role("system") + .content("你是一位专业的简历分析专家。目标任务：请根据我给出的信息，分析得出简历信息。不要自己填充json信息") + .build()) + .message(MessageDTO.builder().role("system") + .content("请生成一个包含以下信息的 JSON 数据，根据用户给出的实际信息解析，值都可为空：\n" + + "- name（字符串类型）：表示用户的姓名。\n" + + "- sex（字符串类型）：表示用户的性别，值为 \"1\"（男）或 \"2\"（女），身份证号倒数第二位，奇数是男，偶数是女。\n" + + "- phone（字符串类型）：表示用户的联系电话，可为空，不为空的格式为 以 1 开头，共 11 位数字。\n" + + "- email（字符串类型）：表示用户的联系电子邮箱地址，可为空，不为空的格式为 包含 @ 符号，且 @ 前后至少有一个字符 及 域名部分至少包含一个 . 符号。\n" + + "- intentionPosition（字符串类型）：表示用户的意向职位。\n" + + "- major（字符串类型）：表示用户的专业。\n" + + "- birthday（日期类型）：表示用户的出生日期，格式为 YYYY-MM。\n" + + "- jobTime（日期类型）：表示用户的参加工作时间，格式为 YYYY-MM。\n" + + "- school（字符串类型）：表示用户的毕业院校。\n" + + "- education（字符串类型）：表示用户的学历，值为：\n" + + " - \"1\"：\"博士\"\n" + + " - \"2\"：\"硕士\"\n" + + " - \"3\"：\"本科\"\n" + + " - \"4\"：\"大专\"\n" + + " - \"5\"：\"中专\"\n" + + " - \"6\"：\"技校\"\n" + + " - \"7\"：\"职高\"\n" + + " - \"9\"：\"高中\"\n" + + " - \"10\"：\"初中\"\n" + + " - \"11\"：\"小学\"\n" + + "- workExperience（字符串类型）：表示用户的工作经历，格式为多行文本，包含以下信息：\n" + + " - 企业名称\n" + + " - 岗位\n" + + " - 工作时间\n" + + " - 工作职责\n" + + "- selfEvaluation（字符串类型）：表示用户的自我评价，格式为多行文本。") + .build()) + .message(MessageDTO.builder().role("user").content("我是小明，身份证号是110105199003071234，小学毕业，前年在一家科技公司干了1年，现在想找个环卫工的活，请用abc@33.com联系我").build()).build(); + AlitaResult result = XfSparkProvider.httpChat(req, httpAPIPassword); + log.info("{}", result); + + } + + @Test + public void iat() throws IOException { + String file = "src/main/resources/iat/cn.pcm"; + try(InputStream is = new FileInputStream(file)){ + AlitaResult result = WebIATWS.execute(is, xfProperties); + log.info("{}", result); + } +// // 示例的WebM文件路径（请替换为实际的有效路径） + String webmFilePath = "src/main/resources/iat/audio.webm"; +// // 示例的输出MP3文件路径（请替换为实际的有效路径） +// String mp3FilePath = "src/main/resources/iat/file.mp3"; + +// try(InputStream is = FileUtils.convertWebmToMp3(new File(webmFilePath))){ +// AlitaResult result = WebIATWS.execute(is, xfProperties); +// log.info("{}", result); +// } + + } + + @Test + public void tts() throws Exception { +// try(OutputStream outputStream = new FileOutputStream("src/main/resources/iat/223.mp3");){ +// WebTtsWS.execute("欢迎来到讯飞开放平台", xfProperties, outputStream); +// } +// try(ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); +// OutputStream fs = new FileOutputStream("src/main/resources/iat/323.mp3");){ +// WebTtsWS.execute("欢迎来到讯飞开放平台", xfProperties, outputStream); +// fs.write(outputStream.toByteArray()); +// } + + try(ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + OutputStream fs = new FileOutputStream("src/main/resources/iat/323.mp3");){ + AlitaResult result = WebTtsWS.execute("欢迎来到讯飞开放平台", xfProperties, outputStream); + Assert.isTrue(result.getSuccess(), result.getMsg()); + fs.write(outputStream.toByteArray()); + } catch (IOException e) { + throw new BusinessException("语音合成异常:" + e.getMessage()); + } + } + + @Test + public void ots(){ +// AlitaResult result = XfSparkProvider.translate(TranslateReq.builder().text("欢迎#你啊,.;@#$你好").build(), xfProperties); + AlitaResult result = XfSparkProvider.translate(TranslateReq.builder().text("تىيانەي ئەقىللىق خىزمەت مۇلازىمىتى بىرلەشمە سۇپىسىغا خوش ھەمرىيىڭىز.").from("uy").to("cn").build(), xfProperties); + log.info("{}", result); + } + + @Test + public void rtasr() throws IOException { + String file = "src/main/resources/iat/ug.pcm"; + try (InputStream is = new FileInputStream(file)) { + AlitaResult result = RtasrClientApp.execute(is, "cn_uyghur", xfProperties); + log.info("{}", result); + } + } + + @Test + public void chat(){ + ChatReq req = ChatReq.builder().message(MessageDTO.builder().role("system").content( + "你是一位专业的简历分析专家。目标任务：请根据我给出的信息，分析得出简历信息。不要自己填充json信息") + .role("user").content("我是大学生") + .build()).build(); + + AlitaResult result = XfSparkProvider.httpChat(req, xfProperties.getHttpAPIPassword()); + Assert.isTrue(result.getSuccess(), result.getMsg()); + log.info("{}", result); + } + +}