diff --git a/src/main/java/com/senmesh/common/entity/BaseEntity.java b/src/main/java/com/senmesh/common/entity/BaseEntity.java index de5cc2b..514aacf 100644 --- a/src/main/java/com/senmesh/common/entity/BaseEntity.java +++ b/src/main/java/com/senmesh/common/entity/BaseEntity.java @@ -16,9 +16,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @author Rey(leijiaping @ newyetai.com) - */ @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/senmesh/common/freemarker/dto/BusinessModelCreateDTO.java b/src/main/java/com/senmesh/common/freemarker/dto/BusinessModelCreateDTO.java index 745d5e2..dd2ba37 100644 --- a/src/main/java/com/senmesh/common/freemarker/dto/BusinessModelCreateDTO.java +++ b/src/main/java/com/senmesh/common/freemarker/dto/BusinessModelCreateDTO.java @@ -20,10 +20,10 @@ public class BusinessModelCreateDTO implements Serializable { private static final long serialVersionUID = 3962743989033667188L; /** - * 文件输出路径-绝对路径,如/work/eclipse/workspace/alita-base/common/src/main/java/com/newyetai/common/freemarker/ + * 文件输出路径-绝对路径,如/work/eclipse/workspace/alita-base/common/src/main/java/com/xxx/common/freemarker/ **/ private String exportDir; - /** 包路径，如com.newyetai.dict **/ + /** 包路径，如com.xxx.dict **/ private String packageName; /** 是否创建业务路径，默认创建 **/ private Boolean createBusinessPath; diff --git a/src/main/java/com/senmesh/component/dict/controller/DictController.java b/src/main/java/com/senmesh/component/dict/controller/DictController.java index 9455f71..d540d91 100644 --- a/src/main/java/com/senmesh/component/dict/controller/DictController.java +++ b/src/main/java/com/senmesh/component/dict/controller/DictController.java @@ -19,7 +19,6 @@ import java.util.Collection; /** * - * @author Rey(leijiaping@newyetai.com) * */ @Api(tags = "字典表") diff --git a/src/main/java/com/senmesh/component/dict/dao/DictDetailMapper.java b/src/main/java/com/senmesh/component/dict/dao/DictDetailMapper.java index ebcace3..eedbe2f 100644 --- a/src/main/java/com/senmesh/component/dict/dao/DictDetailMapper.java +++ b/src/main/java/com/senmesh/component/dict/dao/DictDetailMapper.java @@ -11,9 +11,6 @@ import com.senmesh.component.dict.entity.DictDetail; import com.senmesh.tkmybatis.mybatis.MyMapper; import com.senmesh.tkmybatis.pojo.Page; -/** - * @author Rey(leijiaping@newyetai.com) - */ public interface DictDetailMapper extends MyMapper { /** diff --git a/src/main/java/com/senmesh/component/dict/dao/DictMapper.java b/src/main/java/com/senmesh/component/dict/dao/DictMapper.java index 0e4f9ff..44cd901 100644 --- a/src/main/java/com/senmesh/component/dict/dao/DictMapper.java +++ b/src/main/java/com/senmesh/component/dict/dao/DictMapper.java @@ -8,9 +8,6 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -/** - * @author Rey(leijiaping@newyetai.com) - */ public interface DictMapper extends MyMapper { /** diff --git a/src/main/java/com/senmesh/component/dict/dto/DictDetailQueryDTO.java b/src/main/java/com/senmesh/component/dict/dto/DictDetailQueryDTO.java index 2923236..6cd7425 100644 --- a/src/main/java/com/senmesh/component/dict/dto/DictDetailQueryDTO.java +++ b/src/main/java/com/senmesh/component/dict/dto/DictDetailQueryDTO.java @@ -9,8 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * - * @author Rey(leijiaping@newyetai.com) + * * */ @NoArgsConstructor diff --git a/src/main/java/com/senmesh/component/dict/entity/Dict.java b/src/main/java/com/senmesh/component/dict/entity/Dict.java index 8f14220..a7ff3c6 100644 --- a/src/main/java/com/senmesh/component/dict/entity/Dict.java +++ b/src/main/java/com/senmesh/component/dict/entity/Dict.java @@ -11,9 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -/** - * @author Rey(leijiaping @ newyetai.com) - */ @TableName("xs_dict") @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/senmesh/component/dict/entity/DictDetail.java b/src/main/java/com/senmesh/component/dict/entity/DictDetail.java index 6e0c772..2c20fb8 100644 --- a/src/main/java/com/senmesh/component/dict/entity/DictDetail.java +++ b/src/main/java/com/senmesh/component/dict/entity/DictDetail.java @@ -11,9 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -/** - * @author Rey(leijiaping @ newyetai.com) - */ @TableName("xs_dict_detail") @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/senmesh/component/dict/service/DictDetailService.java b/src/main/java/com/senmesh/component/dict/service/DictDetailService.java index a82511f..5e010e7 100644 --- a/src/main/java/com/senmesh/component/dict/service/DictDetailService.java +++ b/src/main/java/com/senmesh/component/dict/service/DictDetailService.java @@ -11,7 +11,6 @@ import java.util.Map; /** * - * @author Rey(leijiaping@newyetai.com) * */ public interface DictDetailService { diff --git a/src/main/java/com/senmesh/component/dict/service/DictService.java b/src/main/java/com/senmesh/component/dict/service/DictService.java index 137fd24..21d5293 100644 --- a/src/main/java/com/senmesh/component/dict/service/DictService.java +++ b/src/main/java/com/senmesh/component/dict/service/DictService.java @@ -5,7 +5,6 @@ import com.senmesh.component.dict.dto.DictQueryDTO; /** * - * @author Rey(leijiaping@newyetai.com) * */ public interface DictService{ diff --git a/src/main/java/com/senmesh/component/dict/service/impl/DictDetailServiceImpl.java b/src/main/java/com/senmesh/component/dict/service/impl/DictDetailServiceImpl.java index 2a56053..77828b3 100644 --- a/src/main/java/com/senmesh/component/dict/service/impl/DictDetailServiceImpl.java +++ b/src/main/java/com/senmesh/component/dict/service/impl/DictDetailServiceImpl.java @@ -23,8 +23,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * - * @author Rey(leijiaping@newyetai.com) + * * */ @Service diff --git a/src/main/java/com/senmesh/component/dict/service/impl/DictServiceImpl.java b/src/main/java/com/senmesh/component/dict/service/impl/DictServiceImpl.java index 7b25117..9e8e469 100644 --- a/src/main/java/com/senmesh/component/dict/service/impl/DictServiceImpl.java +++ b/src/main/java/com/senmesh/component/dict/service/impl/DictServiceImpl.java @@ -14,9 +14,6 @@ import org.springframework.stereotype.Service; import java.util.List; -/** - * @author Rey(leijiaping @ newyetai.com) - */ @Service public class DictServiceImpl implements DictService { diff --git a/src/main/java/com/senmesh/component/dropdown/controller/DropdownController.java b/src/main/java/com/senmesh/component/dropdown/controller/DropdownController.java index b2a1a2a..26760f8 100644 --- a/src/main/java/com/senmesh/component/dropdown/controller/DropdownController.java +++ b/src/main/java/com/senmesh/component/dropdown/controller/DropdownController.java @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; * @author sr on 2019-10-22 */ @Api(tags = "下拉框") -@RestController +//@RestController @RequestMapping("/anon/dropdown") @ConditionalOnProperty(name = CommonConstants.USELOCAL_KEY, havingValue = "true", matchIfMissing = true) public class DropdownController { diff --git a/src/main/java/com/senmesh/component/file/constant/FileConstants.java b/src/main/java/com/senmesh/component/file/constant/FileConstants.java index c4272bc..43d02d1 100644 --- a/src/main/java/com/senmesh/component/file/constant/FileConstants.java +++ b/src/main/java/com/senmesh/component/file/constant/FileConstants.java @@ -3,8 +3,7 @@ package com.senmesh.component.file.constant; import java.math.BigDecimal; /** - * - * @author Rey(leijiaping@newyetai.com) + * * */ public class FileConstants { diff --git a/src/main/java/com/senmesh/component/file/controller/AnonFileController.java b/src/main/java/com/senmesh/component/file/controller/AnonFileController.java index 666112b..d79e533 100644 --- a/src/main/java/com/senmesh/component/file/controller/AnonFileController.java +++ b/src/main/java/com/senmesh/component/file/controller/AnonFileController.java @@ -19,7 +19,6 @@ import java.io.IOException; * @author sr on 2019-12-11 */ @RestController -@RequestMapping("/anon") @Api(tags = "匿名文件操作") public class AnonFileController { @@ -27,14 +26,14 @@ public class AnonFileController { private FileService fileService; @ApiOperation("根据code下载文件") - @GetMapping("/file/download/{fileCode}") + @GetMapping("/anon/file/download/{fileCode}") public void download(@PathVariable String fileCode, HttpServletRequest request, HttpServletResponse response) throws IOException { fileService.download(fileCode, request, response, Boolean.FALSE); } @ApiOperation("根据code预览文件") - @GetMapping("/file/display/{fileCode}") + @GetMapping("/anon/file/display/{fileCode}") public void display(@PathVariable String fileCode, HttpServletRequest request, HttpServletResponse response) throws IOException { fileService.download(fileCode, request, response, Boolean.TRUE); diff --git a/src/main/java/com/senmesh/component/file/controller/FileClassController.java b/src/main/java/com/senmesh/component/file/controller/FileClassController.java index 6689990..8b3be44 100644 --- a/src/main/java/com/senmesh/component/file/controller/FileClassController.java +++ b/src/main/java/com/senmesh/component/file/controller/FileClassController.java @@ -19,9 +19,6 @@ import com.senmesh.tkmybatis.pojo.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -/** - * @author Rey(leijiaping @ newyetai.com) - */ @Api(tags = "文件配置操作") @RestController @RequestMapping({"/file_class"}) diff --git a/src/main/java/com/senmesh/component/file/controller/FileRecordController.java b/src/main/java/com/senmesh/component/file/controller/FileRecordController.java index 23d8b91..315d84b 100644 --- a/src/main/java/com/senmesh/component/file/controller/FileRecordController.java +++ b/src/main/java/com/senmesh/component/file/controller/FileRecordController.java @@ -15,9 +15,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -/** - * @author Rey(leijiaping @ newyetai.com) - */ @Api(tags = "文件记录操作") @RestController @RequestMapping({"/file"}) diff --git a/src/main/java/com/senmesh/component/file/dao/FileRecordMapper.java b/src/main/java/com/senmesh/component/file/dao/FileRecordMapper.java index b40533f..e057521 100644 --- a/src/main/java/com/senmesh/component/file/dao/FileRecordMapper.java +++ b/src/main/java/com/senmesh/component/file/dao/FileRecordMapper.java @@ -8,9 +8,6 @@ import com.senmesh.component.file.entity.FileRecord; import com.senmesh.tkmybatis.mybatis.MyMapper; import com.senmesh.tkmybatis.pojo.Page; -/** - * @author Rey(leijiaping @ newyetai.com) - */ public interface FileRecordMapper extends MyMapper { /** diff --git a/src/main/java/com/senmesh/component/file/entity/FileClass.java b/src/main/java/com/senmesh/component/file/entity/FileClass.java index 293a6e5..0afcbeb 100644 --- a/src/main/java/com/senmesh/component/file/entity/FileClass.java +++ b/src/main/java/com/senmesh/component/file/entity/FileClass.java @@ -9,9 +9,6 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @author Rey(leijiaping @ newyetai.com) - */ @TableName("xs_file_class") @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/senmesh/component/file/entity/FileRecord.java b/src/main/java/com/senmesh/component/file/entity/FileRecord.java index e06d5a5..777bc17 100644 --- a/src/main/java/com/senmesh/component/file/entity/FileRecord.java +++ b/src/main/java/com/senmesh/component/file/entity/FileRecord.java @@ -11,9 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -/** - * @author Rey(leijiaping @ newyetai.com) - */ @TableName("xs_file_record") @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/senmesh/component/file/service/FileRecordService.java b/src/main/java/com/senmesh/component/file/service/FileRecordService.java index e393d8a..a5d879c 100644 --- a/src/main/java/com/senmesh/component/file/service/FileRecordService.java +++ b/src/main/java/com/senmesh/component/file/service/FileRecordService.java @@ -5,9 +5,6 @@ import java.io.InputStream; import com.senmesh.component.file.entity.FileRecord; import com.senmesh.tkmybatis.pojo.Page; -/** - * @author Rey(leijiaping @ newyetai.com) - */ public interface FileRecordService { /** diff --git a/src/main/java/com/senmesh/component/file/service/impl/FileRecordServiceImpl.java b/src/main/java/com/senmesh/component/file/service/impl/FileRecordServiceImpl.java index c8d2009..e5615e4 100644 --- a/src/main/java/com/senmesh/component/file/service/impl/FileRecordServiceImpl.java +++ b/src/main/java/com/senmesh/component/file/service/impl/FileRecordServiceImpl.java @@ -12,9 +12,6 @@ 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) - */ @Service public class FileRecordServiceImpl implements FileRecordService { diff --git a/src/main/java/com/senmesh/mq/config/RabbitMqConfiguration.java b/src/main/java/com/senmesh/mq/config/RabbitMqConfiguration.java index 6d06b77..222a09a 100644 --- a/src/main/java/com/senmesh/mq/config/RabbitMqConfiguration.java +++ b/src/main/java/com/senmesh/mq/config/RabbitMqConfiguration.java @@ -136,7 +136,7 @@ public class RabbitMqConfiguration { */ @Bean Jackson2JsonMessageConverter jackson2JsonMessageConverter() { - return new Jackson2JsonMessageConverter("com.newyetai"); + return new Jackson2JsonMessageConverter("com.senmesh"); } /** diff --git a/src/main/java/com/senmesh/sdk/sms/model/AddSmsSign.java b/src/main/java/com/senmesh/sdk/sms/model/AddSmsSign.java index 04f757b..d2b64c2 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/AddSmsSign.java +++ b/src/main/java/com/senmesh/sdk/sms/model/AddSmsSign.java @@ -6,8 +6,7 @@ import java.io.Serializable; /** * 短信签名 - * - * @author Rey(leijiaping@newyetai.com) {@link undefined} + * */ public class AddSmsSign implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/AddSmsSignResponse.java b/src/main/java/com/senmesh/sdk/sms/model/AddSmsSignResponse.java index bed0459..4564b26 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/AddSmsSignResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/AddSmsSignResponse.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信签名 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class AddSmsSignResponse implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/AddSmsTemplate.java b/src/main/java/com/senmesh/sdk/sms/model/AddSmsTemplate.java index 205b759..2f0d755 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/AddSmsTemplate.java +++ b/src/main/java/com/senmesh/sdk/sms/model/AddSmsTemplate.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信模板 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class AddSmsTemplate implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSign.java b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSign.java index 0eb2e2f..2aa8284 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSign.java +++ b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSign.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信签名 - * - * @author Rey(leijiaping@newyetai.com) {@link undefined} + * */ public class DeleteSmsSign implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSignResponse.java b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSignResponse.java index 1e3d7c0..65764c1 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSignResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsSignResponse.java @@ -5,9 +5,7 @@ import java.io.Serializable; /** * 短信签名 - * - * @author Rey(leijiaping@newyetai.com) - * + * */ public class DeleteSmsSignResponse implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsTemplate.java b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsTemplate.java index 0e82162..891507e 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsTemplate.java +++ b/src/main/java/com/senmesh/sdk/sms/model/DeleteSmsTemplate.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信模板 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class DeleteSmsTemplate implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSign.java b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSign.java index ffdba23..1b423b8 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSign.java +++ b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSign.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信签名 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class ModifySmsSign implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSignResponse.java b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSignResponse.java index 1c89ee8..caeb684 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSignResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsSignResponse.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信签名 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class ModifySmsSignResponse implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/ModifySmsTemplate.java b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsTemplate.java index e4d600e..311c1c6 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/ModifySmsTemplate.java +++ b/src/main/java/com/senmesh/sdk/sms/model/ModifySmsTemplate.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信模板 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class ModifySmsTemplate implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/QuerySendDetails.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySendDetails.java index 2ba0115..441e983 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/QuerySendDetails.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySendDetails.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 查询发送记录 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class QuerySendDetails implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSign.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSign.java index 2356c42..a638960 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSign.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSign.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信签名 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class QuerySmsSign implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSignResponse.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSignResponse.java index 8687da1..6595c48 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSignResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsSignResponse.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信签名 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class QuerySmsSignResponse implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplate.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplate.java index cbe4a11..9176c71 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplate.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplate.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信模板 - * - * @author Rey(leijiaping@newyetai.com) + * */ public class QuerySmsTemplate implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplateResponse.java b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplateResponse.java index 438d470..fbeb5c1 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplateResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/QuerySmsTemplateResponse.java @@ -4,8 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * 查询查询短信模板的审核状态响应体 - * - * @author Rey(leijiaping@newyetai.com) {@link undefined} + * */ public class QuerySmsTemplateResponse extends SmsResponse { diff --git a/src/main/java/com/senmesh/sdk/sms/model/SendBatchSms.java b/src/main/java/com/senmesh/sdk/sms/model/SendBatchSms.java index 0442858..36e6342 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/SendBatchSms.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SendBatchSms.java @@ -10,8 +10,7 @@ import java.io.Serializable; /** * 发送短信 - * - * @author Rey(leijiaping@newyetai.com) + * */ @Data @Builder diff --git a/src/main/java/com/senmesh/sdk/sms/model/SendSms.java b/src/main/java/com/senmesh/sdk/sms/model/SendSms.java index 921447d..42ae712 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/SendSms.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SendSms.java @@ -10,8 +10,7 @@ import java.io.Serializable; /** * 发送短信 - * - * @author Rey(leijiaping@newyetai.com) + * */ @Data @Builder diff --git a/src/main/java/com/senmesh/sdk/sms/model/SendSmsResponse.java b/src/main/java/com/senmesh/sdk/sms/model/SendSmsResponse.java index 390f1b8..b39a4e5 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/SendSmsResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SendSmsResponse.java @@ -4,8 +4,7 @@ import lombok.NoArgsConstructor; /** * 发送短信（单个/批量）响应体 - * - * @author Rey(leijiaping@newyetai.com) {@link undefined} + * */ @NoArgsConstructor public class SendSmsResponse extends SmsResponse { diff --git a/src/main/java/com/senmesh/sdk/sms/model/SmsResponse.java b/src/main/java/com/senmesh/sdk/sms/model/SmsResponse.java index 779adc6..ee862e2 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/SmsResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SmsResponse.java @@ -9,8 +9,7 @@ import java.io.Serializable; /** * 短信响应体 - * - * @author Rey(leijiaping@newyetai.com) {@link undefined} + * */ @SuppressWarnings("serial") @Data diff --git a/src/main/java/com/senmesh/sdk/sms/model/SmsSendDetailResponse.java b/src/main/java/com/senmesh/sdk/sms/model/SmsSendDetailResponse.java index fb26a91..570bc4a 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/SmsSendDetailResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SmsSendDetailResponse.java @@ -5,8 +5,7 @@ import java.io.Serializable; /** * 短信发送明细 - * - * @author Rey(leijiaping@newyetai.com) {@link undefined} + * */ public class SmsSendDetailResponse implements Serializable { diff --git a/src/main/java/com/senmesh/sdk/sms/model/SmsTemplateResponse.java b/src/main/java/com/senmesh/sdk/sms/model/SmsTemplateResponse.java index a94eca6..185d725 100644 --- a/src/main/java/com/senmesh/sdk/sms/model/SmsTemplateResponse.java +++ b/src/main/java/com/senmesh/sdk/sms/model/SmsTemplateResponse.java @@ -4,9 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * 短信模板响应体 - * @author Rey(leijiaping@newyetai.com) - *{@link undefined} - */ + * + */ public class SmsTemplateResponse extends SmsResponse{ /** **/ diff --git a/src/main/java/com/senmesh/security/config/WebSecurityConfigurer.java b/src/main/java/com/senmesh/security/config/WebSecurityConfigurer.java index 4559e66..659409c 100644 --- a/src/main/java/com/senmesh/security/config/WebSecurityConfigurer.java +++ b/src/main/java/com/senmesh/security/config/WebSecurityConfigurer.java @@ -84,7 +84,7 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { @Autowired(required = false) private UcardAuthenticationProvider ucardAuthenticationProvider; - @Autowired + @Autowired(required = false) private SwaggerConfig swaggerConfig; @Autowired(required = false) @@ -108,7 +108,7 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { public void configure(WebSecurity web) throws Exception { String[] ignoringArray = securityProperties.getIgnoringArray(); // swagger 接口文档，不设置访问权限 - if (swaggerConfig.isSwaggerEnable() && StringUtils.isNotBlank(SwaggerConfig.ACCESS_PREFIX)) { + if (swaggerConfig != null && swaggerConfig.isSwaggerEnable() && StringUtils.isNotBlank(SwaggerConfig.ACCESS_PREFIX)) { ignoringArray = ArrayUtils.addAll(ignoringArray, SwaggerConfig.ACCESS_PREFIX.split(",")); } // websocket diff --git a/src/main/java/com/senmesh/swagger/config/SwaggerConfig.java b/src/main/java/com/senmesh/swagger/config/SwaggerConfig.java index a78d19e..ca97a37 100644 --- a/src/main/java/com/senmesh/swagger/config/SwaggerConfig.java +++ b/src/main/java/com/senmesh/swagger/config/SwaggerConfig.java @@ -13,8 +13,8 @@ import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; -@Configuration -@EnableSwagger2 +//@Configuration +//@EnableSwagger2 public class SwaggerConfig { @Value("${swagger.enable:false}") diff --git a/src/main/java/com/senmesh/usercenter/auth/controller/AuthClientController.java b/src/main/java/com/senmesh/usercenter/auth/controller/AuthClientController.java index 459f381..d0da237 100644 --- a/src/main/java/com/senmesh/usercenter/auth/controller/AuthClientController.java +++ b/src/main/java/com/senmesh/usercenter/auth/controller/AuthClientController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; /** * @author sr on 2021-05-24 */ -@RestController +//@RestController @Api(tags = "授权客户端") public class AuthClientController { diff --git a/src/main/java/com/senmesh/usercenter/auth/job/AuthJob.java b/src/main/java/com/senmesh/usercenter/auth/job/AuthJob.java deleted file mode 100644 index 43a6512..0000000 --- a/src/main/java/com/senmesh/usercenter/auth/job/AuthJob.java +++ /dev/null @@ -1,36 +0,0 @@ -//package com.newyetai.usercenter.auth.job; -// -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; -// -//import com.newyetai.common.annotation.AlitaStopWatch; -//import com.newyetai.job.util.ReturnTUtils; -//import com.newyetai.security.util.MockUtils; -//import com.newyetai.usercenter.auth.service.AuthSubscribeDetailService; -//import com.newyetai.usercenter.common.constant.XxlJobHandlerConstants; -//import com.xxl.job.core.biz.model.ReturnT; -//import com.xxl.job.core.handler.annotation.XxlJob; -// -//import lombok.extern.slf4j.Slf4j; -// -//@Component -//@Slf4j -//public class AuthJob { -// -// @Autowired -// private AuthSubscribeDetailService authSubscribeDetailService; -// -// @XxlJob(XxlJobHandlerConstants.AUTH_SUBSCRIBE_USER_LIST) -// @AlitaStopWatch -// public ReturnT execute(String param) { -// try { -// MockUtils.mockPlatUser(); -// authSubscribeDetailService.loadAllClient(); -// return ReturnT.SUCCESS; -// }catch (Exception e) { -// return ReturnTUtils.error(e.getMessage()); -// } -// } -// -//} -// diff --git a/src/main/java/com/senmesh/usercenter/district/controller/DistrictController.java b/src/main/java/com/senmesh/usercenter/district/controller/DistrictController.java index b813391..d5f4c26 100644 --- a/src/main/java/com/senmesh/usercenter/district/controller/DistrictController.java +++ b/src/main/java/com/senmesh/usercenter/district/controller/DistrictController.java @@ -27,7 +27,7 @@ import java.util.List; * @author Carlye * @since 2021-01-25 */ -@RestController +//@RestController @RequestMapping("/anon/district") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistrictController { diff --git a/src/main/java/com/senmesh/usercenter/org/controller/OrgController.java b/src/main/java/com/senmesh/usercenter/org/controller/OrgController.java index d41459c..648a173 100644 --- a/src/main/java/com/senmesh/usercenter/org/controller/OrgController.java +++ b/src/main/java/com/senmesh/usercenter/org/controller/OrgController.java @@ -71,17 +71,6 @@ public class OrgController { return AlitaResult.success(orgService.find(OrgQueryDTO.builder().id(UserContextHolder.getExistLoginOrgId()).build())); } - @GetMapping("/anon/uc/org/user/page") - @ApiOperation("分页查询机构-小程序用查询指定类型机构") - public AlitaResult> userPage(@RequestParam(value = "orgNameLike",required = false) String orgNameLike, @RequestParam(value = "pageNo",defaultValue = "1",required = false) Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "20",required = false) Integer pageSize) { - OrgQueryDTO orgQueryDTO = new OrgQueryDTO(); - orgQueryDTO.setType(OrgTypeEnum.ORG_TYPE_GOV.getType()); - orgQueryDTO.setPageNo(pageNo); - orgQueryDTO.setPageSize(pageSize); - orgQueryDTO.setOrgNameLike(orgNameLike); - orgService.page(orgQueryDTO); - return AlitaResult.success(orgQueryDTO.getPageResult()); - } //***********************************分隔符*********************************************** diff --git a/src/main/java/com/senmesh/usercenter/query/UserQuery.java b/src/main/java/com/senmesh/usercenter/query/UserQuery.java deleted file mode 100644 index 3333136..0000000 --- a/src/main/java/com/senmesh/usercenter/query/UserQuery.java +++ /dev/null @@ -1,211 +0,0 @@ -//package com.newyetai.usercenter.query; -// -//import com.newyetai.common.annotation.trimAndUpper.TrimAndUpper; -//import com.newyetai.tkmybatis.pojo.Page; -//import com.newyetai.usercenter.enums.AuthStatu; -//import com.newyetai.usercenter.enums.UserType; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.*; -//import org.springframework.format.annotation.DateTimeFormat; -// -//import java.util.Date; -//import java.util.List; -// -///** -// * @author Jerry.li -// * @description 用户查询实体 -// * @date 2020/3/26 -// */ -//@EqualsAndHashCode(callSuper = true) -//@Data -//@AllArgsConstructor -//@NoArgsConstructor -//public class UserQuery extends BaseQuery { -// -// private static final long serialVersionUID = 8645219985888896094L; -// -// /** -// * 用户ID -// */ -// private Long userId; -// /** -// * 用户姓名 -// */ -// @TrimAndUpper(TrimAndUpper.ExecuteType.TRIM) -// private String username; -// /** -// * 机构类型 -// */ -// private UserType userType; -// -// /** -// * 用户正式姓名姓名 -// */ -// @TrimAndUpper(TrimAndUpper.ExecuteType.TRIM) -// private String realName; -// -// /** -// * 身份证 -// */ -// @TrimAndUpper(TrimAndUpper.ExecuteType.TRIM) -// private String cardNo; -// -// /** -// * 身份证集合 -// */ -// private List cardNos; -// -// /** -// * 手机号 -// */ -// @TrimAndUpper(TrimAndUpper.ExecuteType.TRIM) -// private String phone; -// -// /** -// * 角色类型 2:销售 -// */ -// private String standardType; -// -// /** -// * 机构名称 -// */ -// @TrimAndUpper(TrimAndUpper.ExecuteType.TRIM) -// private String orgName; -// -// /** -// * 角色Id -// */ -// private Long roleId; -// -// /** -// * 角色名称 -// */ -// private String roleName; -// -// /** -// * 查询来源："userInfo":用户管理页面 -// */ -// private String queryType; -// -// /** -// * 认证状态 （弃用 现在使用 authenticated） -// */ -// @Deprecated -// private AuthStatu authStatu; -// -// /** -// * 是否实名 -// */ -// private Boolean authenticated; -// -// /** -// * 身份证上传状态 cardIdStatus 1.已上传 2.未上传 -// */ -// private Integer cardInfoStatus; -// -// -// /** -// * 合同签署状态 1.已签约 2.未签约 3.已过期 -// */ -// private Integer contractStatus; -// -// /** -// * 需要忽略的机构信息 -// */ -// private List ignoreOrgIds; -// -// /** -// * 是否来自中台页面查询 -// */ -// private Boolean settlementPageQuery; -// -// /** -// * 当前登录机构Id -// */ -// private Long loginOrgId; -// -// /** -// * 是否启用 -// */ -// private Boolean enabled; -// -// /** -// * 手机号绑定状态 -// */ -// private Boolean phoneBinding; -// -// /** -// * 是否注销 -// */ -// private Boolean cancelled; -// /** -// * 中文名称 -// */ -// private String chineseName; -// /** -// * 邮箱 -// */ -// @TrimAndUpper(TrimAndUpper.ExecuteType.TRIM) -// private String email; -// -// /** -// * 用户状态 -// */ -// private Integer userStatus; -// -// @ApiModelProperty("完成时间起") -// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") -// private Date createTimeStart; -// -// @ApiModelProperty("完成时间止") -// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") -// private Date createTimeEnd; -// -// /** -// * 系统编码 用于区分来源 -// */ -// private Integer code; -// -// /** -// * 人像是否上传 (1 未上传 2 已上传) -// */ -// private Integer userFaceStatus; -// -// @Builder -// public UserQuery(Integer pageNo, Integer pageSize, Boolean needPage, -// Page pageResult, Long orgId, Long userId, String username, -// UserType userType, String realName, String cardNo, String phone, String standardType, -// String orgName, Long roleId, String roleName, String queryType, -// AuthStatu authStatu, Integer cardInfoStatus, Integer contractStatus, -// List ignoreOrgIds, Boolean settlementPageQuery, Long loginOrgId, -// Boolean enabled, Boolean cancelled, String chineseName, String email, Integer userStatus, -// Date createTimeStart, Date createTimeEnd, Integer code, Integer userFaceStatus) { -// super(pageNo, pageSize, needPage, pageResult, orgId); -// this.userId = userId; -// this.username = username; -// this.userType = userType; -// this.realName = realName; -// this.cardNo = cardNo; -// this.phone = phone; -// this.standardType = standardType; -// this.orgName = orgName; -// this.roleId = roleId; -// this.roleName = roleName; -// this.queryType = queryType; -// this.authStatu = authStatu; -// this.cardInfoStatus = cardInfoStatus; -// this.contractStatus = contractStatus; -// this.ignoreOrgIds = ignoreOrgIds; -// this.settlementPageQuery = settlementPageQuery; -// this.loginOrgId = loginOrgId; -// this.enabled = enabled; -// this.cancelled = cancelled; -// this.chineseName = chineseName; -// this.email = email; -// this.userStatus = userStatus; -// this.createTimeStart=createTimeStart; -// this.createTimeEnd=createTimeEnd; -// this.code = code; -// this.userFaceStatus = userFaceStatus; -// } -//} diff --git a/src/main/java/com/senmesh/usercenter/sys/controller/DomainAnonController.java b/src/main/java/com/senmesh/usercenter/sys/controller/DomainAnonController.java index 6b02ba0..c820b7e 100644 --- a/src/main/java/com/senmesh/usercenter/sys/controller/DomainAnonController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/DomainAnonController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author sr on 2021-05-24 */ -@RestController +//@RestController @RequestMapping("/anon") @Api(tags = "域名") public class DomainAnonController { diff --git a/src/main/java/com/senmesh/usercenter/sys/controller/DomainController.java b/src/main/java/com/senmesh/usercenter/sys/controller/DomainController.java index ebc8a12..bf6da24 100644 --- a/src/main/java/com/senmesh/usercenter/sys/controller/DomainController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/DomainController.java @@ -16,7 +16,7 @@ import java.util.Set; /** * @author sr on 2021-05-24 */ -@RestController +//@RestController @Api(tags = "域名") public class DomainController { diff --git a/src/main/java/com/senmesh/usercenter/sys/controller/FaqController.java b/src/main/java/com/senmesh/usercenter/sys/controller/FaqController.java index 3845957..97e8178 100644 --- a/src/main/java/com/senmesh/usercenter/sys/controller/FaqController.java +++ b/src/main/java/com/senmesh/usercenter/sys/controller/FaqController.java @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; /** * @author sr on 2021-05-24 */ -@RestController +//@RestController @Api(tags = "常见问题表") public class FaqController { diff --git a/src/main/java/com/senmesh/usercenter/tag/controller/TagRelationshipController.java b/src/main/java/com/senmesh/usercenter/tag/controller/TagRelationshipController.java index 469a6a2..c536ea7 100644 --- a/src/main/java/com/senmesh/usercenter/tag/controller/TagRelationshipController.java +++ b/src/main/java/com/senmesh/usercenter/tag/controller/TagRelationshipController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; * @since 2021-01-21 */ @Api(tags = "标签关系信息") -@RestController +//@RestController @RequestMapping("/tag_relationship") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class TagRelationshipController { diff --git a/src/main/java/com/senmesh/usercenter/user/controller/UserController.java b/src/main/java/com/senmesh/usercenter/user/controller/UserController.java index d4bd18d..30aac9a 100644 --- a/src/main/java/com/senmesh/usercenter/user/controller/UserController.java +++ b/src/main/java/com/senmesh/usercenter/user/controller/UserController.java @@ -80,7 +80,7 @@ public class UserController { return AlitaResult.success(userService.get(userId)); } - @GetMapping("anon/person_in_charge") +// @GetMapping("anon/person_in_charge") @ApiOperation("企业负责人查询") public AlitaResult> personInCharge(@RequestParam("userIds") Set userIds) { return AlitaResult.success(userService.personInCharge(userIds)); @@ -182,7 +182,7 @@ public class UserController { return AlitaResult.success(); } - @PostMapping("anon/user/sms") +// @PostMapping("anon/user/sms") @ApiOperation("获取验证码-不同操作") public AlitaResult sms(@Validated @RequestBody UserPhoneCodeSmsDTO userPhoneCodeSmsDTO) { PhoneCodeUtils.send(userPhoneCodeSmsDTO); @@ -190,14 +190,14 @@ public class UserController { } @ApiOperation("获取验证码-不同操作(带防水墙验证)") - @PostMapping("anon/user/sms_captcha") +// @PostMapping("anon/user/sms_captcha") public AlitaResult smsCaptcha( @Validated @RequestBody UserPhoneCodeSmsCaptchaDTO userPhoneCodeSmsCaptchaDTO) { PhoneCodeUtils.send(userPhoneCodeSmsCaptchaDTO); return AlitaResult.success(); } - @PostMapping("anon/user/reset_pwd") +// @PostMapping("anon/user/reset_pwd") @ApiOperation("重置密码") public AlitaResult resetPwd(@Validated @RequestBody ResetPwdDTO resetPwdDTO) { userService.resetPwd(resetPwdDTO); diff --git a/src/main/java/com/senmesh/usercenter/user/job/UserCancelJob.java b/src/main/java/com/senmesh/usercenter/user/job/UserCancelJob.java deleted file mode 100644 index 13cd7e7..0000000 --- a/src/main/java/com/senmesh/usercenter/user/job/UserCancelJob.java +++ /dev/null @@ -1,34 +0,0 @@ -//package com.newyetai.usercenter.user.job; -// -//import com.newyetai.common.annotation.AlitaStopWatch; -//import com.newyetai.job.util.ReturnTUtils; -//import com.newyetai.security.util.MockUtils; -//import com.newyetai.usercenter.common.constant.XxlJobHandlerConstants; -//import com.newyetai.usercenter.user.service.UserCancelService; -//import com.xxl.job.core.biz.model.ReturnT; -//import com.xxl.job.core.handler.annotation.XxlJob; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; -// -//@Component -//@Slf4j -//public class UserCancelJob { -// -// @Autowired -// private UserCancelService userCancelService; -// -// @XxlJob(XxlJobHandlerConstants.USER_CANCEL_NOTIFY_JOB) -// @AlitaStopWatch -// public ReturnT execute(String param) { -// try { -// MockUtils.mockPlatUser(); -// userCancelService.toNotify(); -// return ReturnT.SUCCESS; -// } catch (Exception e) { -// return ReturnTUtils.error(e.getMessage()); -// } -// } -// -//} -// diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fa650c3..6a9fb0f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -34,12 +34,12 @@ mybatis-plus.type-aliases-package=com.senmesh.**.entity mybatis-plus.type-enums-package=com.senmesh.**.enums ### 日志文件 -logging.file.name=D:/work/git/demo/logs/${spring.application.name}.log +logging.file.name=/Users/sr/work/git/project/x-file/logs/${spring.application.name}.log logging.pattern.console:%d{yyyy/MM/dd-HH:mm:ss} %X{traceId:-} [%thread] %-5level %logger- %msg%n logging.pattern.file:%d{yyyy/MM/dd-HH:mm:ss} %X{traceId:-} [%thread] %-5level %logger- %msg%n ### 文件路径 -file.upload-dir=D:/work/git/demo/upload +file.upload-dir=/Users/sr/work/git/project/x-file/upload java.io.tmpdir=/var/${spring.application.name}/upload/tmpdir #文件存储配置 @@ -49,16 +49,17 @@ file.storage.type=local ### 文件位置：1内网2外网 file.transfer.location=1 ### 传输发送目录 -file.transfer.send-dir=D:/work/git/demo/transfer/send +file.transfer.send-dir=${file.upload-dir}/transfer/send ### 传输接收目录 -file.transfer.receive-dir=D:/work/git/demo/transfer/receive +file.transfer.receive-dir=${file.upload-dir}/transfer/receive ### 解包风险校验 file.transfer.unpack-risk-check=false #发号器 #机器id：根据ip自己定义 -code.snowflake.workid.192.168.71.4=1 +code.snowflake.workid.192.168.1.28=1 +code.snowflake.workid.192.168.71.2=2 @@ -70,7 +71,7 @@ spring.redis.lettuce.pool.min-idle=2 spring.redis.lettuce.pool.max-idle=8 spring.redis.lettuce.pool.max-active=10 spring.redis.lettuce.pool.max-wait=-1ms -spring.redis.database=1 +spring.redis.database=2 security.useLocal=true security.ignoring=/*.html,/favicon.ico @@ -117,8 +118,8 @@ sms.phoneSms= dify.enable=true dify.host=http://114.242.42.23:8501 # 规则生成 API Key -dify.risk.rule.api-key=app-agFkKV5EsAEZfCC6wGSDraak +dify.risk.rule.api-key=app-MpPUct23vJFOGYThX5AP13MH # 文件智能风险预警 API Key -dify.risk.scan.api-key=app-K9WlRD9hEhLbesUK8HDf3ATP +dify.risk.scan.api-key=app-yssNjcvzAf5KEZY1ZIiKQU7W diff --git a/src/main/resources/static/login.html b/src/main/resources/static/login.html index a76fe0e..e74ae61 100644 --- a/src/main/resources/static/login.html +++ b/src/main/resources/static/login.html @@ -2469,7 +2469,7 @@

up login

用户名: - 密码: + 密码: 用户类型: