From 91b27e9205b06ce269e1d79f8dc8400a0ce93a00 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Thu, 20 Jun 2024 20:58:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmvn=20install=20?= =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E7=AC=A6=E5=8F=B7=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchisandraSmsConfigController.java | 2 +- .../SchisandraSysConfigController.java | 3 +- .../SchisandraSysOauthController.java | 3 +- .../SchisandraSmsConfigDTOConverter.java | 2 +- .../SchisandraSysConfigDTOConverter.java | 2 +- .../SchisandraSysOauthDTOConverter.java | 2 +- .../dto/SchisandraSmsConfigDTO.java | 233 ------------------ .../dto/SchisandraSysConfigDTO.java | 73 ------ .../dto/SchisandraSysOauthDTO.java | 98 -------- 9 files changed, 6 insertions(+), 412 deletions(-) delete mode 100644 schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSmsConfigDTO.java delete mode 100644 schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSysConfigDTO.java delete mode 100644 schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSysOauthDTO.java diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSmsConfigController.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSmsConfigController.java index 209a295..4692c2f 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSmsConfigController.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSmsConfigController.java @@ -3,10 +3,10 @@ package com.schisandra.system.application.controller; import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; import com.schisandra.system.application.convert.SchisandraSmsConfigDTOConverter; -import com.schisandra.system.application.dto.SchisandraSmsConfigDTO; import com.schisandra.system.common.entity.Result; import com.schisandra.system.domain.bo.SchisandraSmsConfigBO; import com.schisandra.system.domain.service.SchisandraSmsConfigDomainService; +import com.schisandra.system.entity.SchisandraSmsConfigDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java index 0472847..068020a 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java @@ -2,12 +2,11 @@ package com.schisandra.system.application.controller; import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; - import com.schisandra.system.application.convert.SchisandraSysConfigDTOConverter; -import com.schisandra.system.application.dto.SchisandraSysConfigDTO; import com.schisandra.system.common.entity.Result; import com.schisandra.system.domain.bo.SchisandraSysConfigBO; import com.schisandra.system.domain.service.SchisandraSysConfigDomainService; +import com.schisandra.system.entity.SchisandraSysConfigDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysOauthController.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysOauthController.java index d6ea64d..2592b8a 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysOauthController.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysOauthController.java @@ -2,12 +2,11 @@ package com.schisandra.system.application.controller; import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; - import com.schisandra.system.application.convert.SchisandraSysOauthDTOConverter; -import com.schisandra.system.application.dto.SchisandraSysOauthDTO; import com.schisandra.system.common.entity.Result; import com.schisandra.system.domain.bo.SchisandraSysOauthBO; import com.schisandra.system.domain.service.SchisandraSysOauthDomainService; +import com.schisandra.system.entity.SchisandraSysOauthDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSmsConfigDTOConverter.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSmsConfigDTOConverter.java index 5f0706d..4950334 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSmsConfigDTOConverter.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSmsConfigDTOConverter.java @@ -1,7 +1,7 @@ package com.schisandra.system.application.convert; -import com.schisandra.system.application.dto.SchisandraSmsConfigDTO; import com.schisandra.system.domain.bo.SchisandraSmsConfigBO; +import com.schisandra.system.entity.SchisandraSmsConfigDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysConfigDTOConverter.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysConfigDTOConverter.java index 7f5f8d9..dc81ae4 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysConfigDTOConverter.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysConfigDTOConverter.java @@ -1,8 +1,8 @@ package com.schisandra.system.application.convert; -import com.schisandra.system.application.dto.SchisandraSysConfigDTO; import com.schisandra.system.domain.bo.SchisandraSysConfigBO; +import com.schisandra.system.entity.SchisandraSysConfigDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysOauthDTOConverter.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysOauthDTOConverter.java index 2fe1519..d3a192e 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysOauthDTOConverter.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysOauthDTOConverter.java @@ -1,8 +1,8 @@ package com.schisandra.system.application.convert; -import com.schisandra.system.application.dto.SchisandraSysOauthDTO; import com.schisandra.system.domain.bo.SchisandraSysOauthBO; +import com.schisandra.system.entity.SchisandraSysOauthDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSmsConfigDTO.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSmsConfigDTO.java deleted file mode 100644 index 4c04f0f..0000000 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSmsConfigDTO.java +++ /dev/null @@ -1,233 +0,0 @@ -package com.schisandra.system.application.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 短信配置信息表 dto - * - * @author landaiqing - * @since 2024-06-19 22:20:47 - */ -@Data -public class SchisandraSmsConfigDTO implements Serializable { - - /** - * id - */ - private Integer id; - - /** - * 配置id - */ - private String configId; - - /** - * 请求地址 - */ - private String requestUrl; - - /** - * 模板变量名称 - */ - private String templateName; - - /** - * 接口名称 - */ - private String action; - - /** - * 地域信息 - */ - private String region; - - /** - * - */ - private String accessKeyId; - - /** - * - */ - private String accessKeySecret; - - /** - * 厂商名称标识 - */ - private String supplier; - - /** - * 短信签名 - */ - private String signature; - - /** - * - */ - private String sdkAppId; - - /** - * 模板ID - */ - private String templateId; - - /** - * 权重 - */ - private Integer weight; - - /** - * 短信重试次数，默认0次不重试 - */ - private Integer retryInterval; - - /** - * 短信重试次数，默认0次不重试 - */ - private Integer maxRetries; - - /** - * 厂商的发送数量上限，默认不设置上限 - */ - private Long maximum; - - /** - * REST API Base URL - */ - private String baseUrl; - - /** - * 请求域名 - */ - private String serverIp; - - /** - * 请求端口 - */ - private Integer serverPort; - - /** - * 国内短信签名通道号 - */ - private String sender; - - /** - * 短信状态报告接收地 - */ - private String statusCallBack; - - /** - * APP接入地址 - */ - private String url; - - /** - * 模板短信请求地址 - */ - private String templateUrl; - - /** - * 验证码短信请求地址 - */ - private String codeUrl; - - /** - * 验证码验证请求地址 - */ - private String verifyUrl; - - /** - * 是否需要支持短信上行。true:需要，false:不需要false - */ - private String needUp; - - /** - * 请求超时时间 - */ - private Integer connTimeout; - - /** - * 是否为简易模式 - */ - private String isSimple; - - /** - * 短信发送后将向这个地址推送(运营商返回的)发送报告 - */ - private String callbackUrl; - - /** - * 企业ID - */ - private Integer mchId; - - /** - * - */ - private String appKey; - - /** - * - */ - private Integer appId; - - /** - * 版本号 - */ - private String version; - - /** - * 单发链接 - */ - private String singleMsgUrl; - - /** - * 群发链接 - */ - private String massMsgUrl; - - /** - * 签名ID - */ - private String signatureId; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * 更新人 - */ - private String updateBy; - - /** - * 是否删除 0 未删除 1已删除 - */ - private Integer isDeleted; - - /** - * - */ - private String extraJson; - - /** - * 服务名 - */ - private String service; - -} - diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSysConfigDTO.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSysConfigDTO.java deleted file mode 100644 index 1e0a414..0000000 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSysConfigDTO.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.schisandra.system.application.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * dto - * - * @author landaiqing - * @since 2024-05-11 22:45:55 - */ -@Data -public class SchisandraSysConfigDTO implements Serializable { - - /** - * id - */ - private Long id; - - /** - * 名称 - */ - private String configName; - - /** - * 参数键 - */ - private String configKey; - - /** - * 参数值 - */ - private String configValue; - - /** - * 创建者 - */ - private String createBy; - - /** - * 系统内置（0是 1否） - */ - private Integer configType; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - private Date updateDate; - - /** - * 备注信息 - */ - private String remarks; - - /** - * 是否删除 0未删除 1已删除 - */ - private Integer isDeleted; - -} - diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSysOauthDTO.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSysOauthDTO.java deleted file mode 100644 index e591715..0000000 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/dto/SchisandraSysOauthDTO.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.schisandra.system.application.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * dto - * - * @author landaiqing - * @since 2024-05-25 23:08:26 - */ -@Data -public class SchisandraSysOauthDTO implements Serializable { - - /** - * - */ - private Long id; - - /** - * 类型 - */ - private String clientType; - - /** - * Client Id - */ - private String clientId; - - /** - * Client Secret - */ - private String clientSecret; - - /** - * 应用回调地址 - */ - private String redirectUri; - - /** - * Key - */ - private String stackOverflowKey; - - /** - * 团队名 - */ - private String domainPrefix; - - /** - * 目录(租户) ID - */ - private String tenantId; - - /** - * - */ - private String alipayPublicKey; - - /** - * - */ - private String agentId; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * 更新人 - */ - private String updateBy; - - /** - * 是否删除 0 未删除 1已删除 - */ - private Integer isDeleted; - - /** - * 状态 - */ - private String status; - -} -