diff --git a/cdp-common/cdp-common-core/pom.xml b/cdp-common/cdp-common-core/pom.xml
index 304c7a0..d136d41 100644
--- a/cdp-common/cdp-common-core/pom.xml
+++ b/cdp-common/cdp-common-core/pom.xml
@@ -66,5 +66,11 @@
com.alibaba
fastjson
+
+
+ org.springframework.boot
+ spring-boot-autoconfigure
+
+
diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/BaseResult.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/BaseResult.java
new file mode 100644
index 0000000..2bc1721
--- /dev/null
+++ b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/BaseResult.java
@@ -0,0 +1,35 @@
+package com.baiye.core.base.api;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Enzo
+ * @date : 2023/4/10
+ */
+@Data
+public class BaseResult implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 是否成功
+ */
+ protected boolean success;
+
+ /**
+ * 错误信息
+ */
+ protected String message;
+
+ /**
+ * 详细信息
+ */
+ protected String detailMessage;
+
+ /**
+ * 返回数据
+ */
+ protected Object data;
+}
diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java
index 967e222..2ccd3ac 100644
--- a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java
+++ b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java
@@ -86,6 +86,11 @@ public enum ResultCode {
* 用户账号过期
*/
USER_ACCOUNT_EXPIRED(11008, "用户账号已过期"),
+
+ /**
+ * 未登录,请先登录
+ */
+ NOT_LOGIN(20002, "未登录,请先登录"),
/**
* 没有该用户
*/
@@ -325,6 +330,11 @@ public enum ResultCode {
*/
SAVE_MEMBER_ERROR(1020, "保存会员失败"),
+ /**
+ * token 过期
+ */
+ TOKEN_INVALID(10103, "invalid access token"),
+
GET_CONTACT_ERROR(1013, "获取通讯录信息错误"),
diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/factory/YamlPropertySourceFactory.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/factory/YamlPropertySourceFactory.java
new file mode 100644
index 0000000..b9c5d93
--- /dev/null
+++ b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/factory/YamlPropertySourceFactory.java
@@ -0,0 +1,44 @@
+package com.baiye.core.factory;
+
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.core.io.support.PropertySourceFactory;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * 加载yml格式的自定义配置文件
+ *
+ * @author aristotle
+ * @link https://blog.csdn.net/zxl8899/article/details/106382719/
+ */
+@AllArgsConstructor
+public class YamlPropertySourceFactory implements PropertySourceFactory {
+
+ public PropertySource> createPropertySource(String name, EncodedResource resource) throws IOException {
+ Properties propertiesFromYaml = loadYamlIntoProperties(resource);
+ String sourceName = name != null ? name : resource.getResource().getFilename();
+ assert sourceName != null;
+ return new PropertiesPropertySource(sourceName, propertiesFromYaml);
+ }
+
+ private Properties loadYamlIntoProperties(EncodedResource resource) throws FileNotFoundException {
+ try {
+ YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+ factory.setResources(resource.getResource());
+ factory.afterPropertiesSet();
+ return factory.getObject();
+ } catch (IllegalStateException e) {
+ Throwable cause = e.getCause();
+ if (cause instanceof FileNotFoundException) {
+ throw (FileNotFoundException) e.getCause();
+ }
+ throw e;
+ }
+ }
+}
diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/util/IPUtil.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/util/IPUtil.java
index a1e6d29..08943a2 100644
--- a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/util/IPUtil.java
+++ b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/util/IPUtil.java
@@ -3,7 +3,13 @@ package com.baiye.core.util;
import cn.hutool.core.util.IdUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONObject;
+import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* IP工具类
@@ -38,7 +44,8 @@ public class IPUtil {
}
public static void main(String[] args) {
- String uuid = IdUtil.randomUUID();
- System.out.println(uuid);
+ ArrayList strings = Lists.newArrayList("", "1");
+ List collect = strings.stream().filter(s -> StringUtils.isNotBlank(s)).collect(Collectors.toList());
+ System.out.printf("");
}
}
diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/util/MobileUtil.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/util/MobileUtil.java
new file mode 100644
index 0000000..06e0967
--- /dev/null
+++ b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/util/MobileUtil.java
@@ -0,0 +1,92 @@
+package com.baiye.core.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Pattern;
+
+/**
+ * @author Enzo
+ * @date : 2022/4/18
+ */
+public class MobileUtil {
+
+ /**
+ * 中国电信号码格式验证 手机段: 133,149,153,173,177,180,181,189,191,199,1349,1410,1700,1701,1702,193
+ **/
+ private static final String CHINA_TELECOM_PATTERN = "(?:^(?:\\+86)?1(?:33|49|53|7[37]|8[019]|9[139])\\d{8}$)|(?:^(?:\\+86)?1349\\d{7}$)|(?:^(?:\\+86)?1410\\d{7}$)|(?:^(?:\\+86)?170[0-2]\\d{7}$)";
+
+ /**
+ * 中国联通号码格式验证 手机段:130,131,132,145,146,155,156,166,171,175,176,185,186,1704,1707,1708,1709
+ **/
+ private static final String CHINA_UNICOM_PATTERN = "(?:^(?:\\+86)?1(?:3[0-2]|4[56]|5[56]|66|7[156]|8[56])\\d{8}$)|(?:^(?:\\+86)?170[47-9]\\d{7}$)";
+
+ /**
+ * 中国移动号码格式验证
+ * 手机段:134,135,136,137,138,139,147,148,150,151,152,157,158,159,178,182,183,184,187,188,195,198,1440,1703,1705,1706
+ **/
+ private static final String CHINA_MOBILE_PATTERN = "(?:^(?:\\+86)?1(?:3[4-9]|4[78]|5[0-27-9]|6[5]|7[28]|8[2-478]|98|95)\\d{8}$)|(?:^(?:\\+86)?1440\\d{7}$)|(?:^(?:\\+86)?170[356]\\d{7}$)";
+
+ /**
+ * 中国大陆手机号码校验
+ *
+ * @param phone
+ * @return
+ */
+ public static boolean checkPhone(String phone) {
+ if (StringUtils.isNotBlank(phone)) {
+ if (checkChinaMobile(phone) || checkChinaUnicom(phone) || checkChinaTelecom(phone)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ /**
+ * 中国移动手机号码校验
+ *
+ * @param phone
+ * @return
+ */
+ public static boolean checkChinaMobile(String phone) {
+ if (StringUtils.isNotBlank(phone)) {
+ Pattern regexp = Pattern.compile(CHINA_MOBILE_PATTERN);
+ return regexp.matcher(phone).matches();
+ }
+ return false;
+ }
+
+ /**
+ * 中国联通手机号码校验
+ *
+ * @param phone
+ * @return
+ */
+ public static boolean checkChinaUnicom(String phone) {
+ if (StringUtils.isNotBlank(phone)) {
+ Pattern regexp = Pattern.compile(CHINA_UNICOM_PATTERN);
+ if (regexp.matcher(phone).matches()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 中国电信手机号码校验
+ *
+ * @param phone
+ * @return
+ */
+ public static boolean checkChinaTelecom(String phone) {
+ if (StringUtils.isNotBlank(phone)) {
+ Pattern regexp = Pattern.compile(CHINA_TELECOM_PATTERN);
+ if (regexp.matcher(phone).matches()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+}
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/BadConfigurationException.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/BadConfigurationException.java
similarity index 99%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/BadConfigurationException.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/BadConfigurationException.java
index 21225f5..337df52 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/BadConfigurationException.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/BadConfigurationException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.baiye.exception.global;
+package com.baiye;
/**
* 统一关于错误配置信息 异常
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/BadRequestException.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/BadRequestException.java
similarity index 96%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/BadRequestException.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/BadRequestException.java
index ce73cc6..3284258 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/BadRequestException.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/BadRequestException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.baiye.exception.global;
+package com.baiye;
import lombok.Getter;
import org.springframework.http.HttpStatus;
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/CreateFailException.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/CreateFailException.java
similarity index 93%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/CreateFailException.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/CreateFailException.java
index 1947781..a20e4eb 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/CreateFailException.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/CreateFailException.java
@@ -1,7 +1,7 @@
-package com.baiye.exception.global;
+package com.baiye;
/**
- *
+ *
* @description 创建失败异常
* @author Enzo
* @date 2020-08-09 13:49
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/DeleteFailException.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/DeleteFailException.java
similarity index 93%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/DeleteFailException.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/DeleteFailException.java
index 28c20af..2e03f06 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/DeleteFailException.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/DeleteFailException.java
@@ -1,7 +1,7 @@
-package com.baiye.exception.global;
+package com.baiye;
/**
- *
+ *
* @description 删除失败
* @author Enzo
* @date 2020-08-09 13:54
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/EntityExistException.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/EntityExistException.java
similarity index 96%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/EntityExistException.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/EntityExistException.java
index b879bb1..d8374e8 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/EntityExistException.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/EntityExistException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.baiye.exception.global;
+package com.baiye;
import org.springframework.util.StringUtils;
@@ -31,4 +31,4 @@ public class EntityExistException extends RuntimeException {
return StringUtils.capitalize(entity)
+ " with " + field + " "+ val + " existed";
}
-}
\ No newline at end of file
+}
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/EntityNotFoundException.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/EntityNotFoundException.java
similarity index 96%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/EntityNotFoundException.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/EntityNotFoundException.java
index 6a1d5c3..49ba110 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/EntityNotFoundException.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/EntityNotFoundException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.baiye.exception.global;
+package com.baiye;
import org.springframework.util.StringUtils;
@@ -31,4 +31,4 @@ public class EntityNotFoundException extends RuntimeException {
return StringUtils.capitalize(entity)
+ " with " + field + " "+ val + " does not exist";
}
-}
\ No newline at end of file
+}
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/SmsAuthorizationException.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/SmsAuthorizationException.java
similarity index 84%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/SmsAuthorizationException.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/SmsAuthorizationException.java
index d4b9284..2bca520 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/SmsAuthorizationException.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/SmsAuthorizationException.java
@@ -1,4 +1,4 @@
-package com.baiye.exception.global;
+package com.baiye;
/**
* @author Enzo
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/UpdateFailException.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/UpdateFailException.java
similarity index 93%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/UpdateFailException.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/UpdateFailException.java
index d96342d..86a2752 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/UpdateFailException.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/UpdateFailException.java
@@ -1,7 +1,7 @@
-package com.baiye.exception.global;
+package com.baiye;
/**
- *
+ *
* @description 更新失败异常
* @author Enzo
* @date 2020-08-09 13:53
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/config/ExceptionConfiguration.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/config/ExceptionConfiguration.java
new file mode 100644
index 0000000..cf33c2e
--- /dev/null
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/config/ExceptionConfiguration.java
@@ -0,0 +1,23 @@
+package com.baiye.config;
+
+import com.baiye.core.factory.YamlPropertySourceFactory;
+import com.baiye.handle.GlobalExceptionHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * 统一异常处理配置
+ * @author xuzhanfu
+ */
+@Configuration
+@ComponentScan(value="com.baiye.config")
+@PropertySource(factory = YamlPropertySourceFactory.class, value = "classpath:cdp-error.yml")
+public class ExceptionConfiguration {
+
+ @Bean
+ public GlobalExceptionHandler baseExceptionHandler(){
+ return new GlobalExceptionHandler();
+ }
+}
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/handle/ApiError.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/handle/ApiError.java
similarity index 97%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/handle/ApiError.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/handle/ApiError.java
index 0350d37..861d1a0 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/handle/ApiError.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/handle/ApiError.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.baiye.exception.global.handle;
+package com.baiye.handle;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/handle/GlobalExceptionHandler.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/handle/GlobalExceptionHandler.java
similarity index 86%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/handle/GlobalExceptionHandler.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/handle/GlobalExceptionHandler.java
index d0729c7..f84530d 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/handle/GlobalExceptionHandler.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/handle/GlobalExceptionHandler.java
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.baiye.exception.global.handle;
+package com.baiye.handle;
+import com.baiye.*;
import com.baiye.core.util.ThrowableUtil;
-import com.baiye.exception.global.*;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.BadCredentialsException;
@@ -36,7 +37,7 @@ import static org.springframework.http.HttpStatus.NOT_MODIFIED;
* @date 2018-11-23
*/
@Slf4j
-@RestControllerAdvice(basePackages = "com.baiye")
+@RestControllerAdvice
public class GlobalExceptionHandler {
/**
@@ -145,13 +146,36 @@ public class GlobalExceptionHandler {
public ResponseEntity smsException(SmsAuthorizationException e) {
// 打印堆栈信息
log.error(ThrowableUtil.getStackTrace(e));
- return buildResponseEntity(ApiError.error(NOT_MODIFIED.value(), e.getMessage()));
+ return buildResponseEntity(ApiError.error(e.getMessage()));
}
+
+ /**
+ * 通用Exception异常捕获
+ *
+ * @param ex 自定义Exception异常类型
+ * @return Result
+ */
+ @ExceptionHandler(Exception.class)
+ public ResponseEntity> handleException(Exception ex) {
+ log.error("程序异常:" + ex.toString());
+ String message = ex.getMessage();
+ if (StringUtils.contains(message, "Bad credentials")) {
+ message = "用户名或密码不正确!";
+ } else if (StringUtils.contains(ex.toString(), "InternalAuthenticationServiceException")) {
+ message = "您输入的用户名不存在!";
+ }
+ return buildResponseEntity(ApiError.error(message));
+ }
+
+
+
/**
* 统一返回
*/
private ResponseEntity buildResponseEntity(ApiError apiError) {
return new ResponseEntity<>(apiError, HttpStatus.valueOf(apiError.getStatus()));
}
+
+
}
diff --git a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/util/ValidationUtil.java b/cdp-common/cdp-common-exception/src/main/java/com/baiye/util/ValidationUtil.java
similarity index 81%
rename from cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/util/ValidationUtil.java
rename to cdp-common/cdp-common-exception/src/main/java/com/baiye/util/ValidationUtil.java
index b22a8c3..98813e1 100644
--- a/cdp-common/cdp-common-exception/src/main/java/com/baiye/exception/global/util/ValidationUtil.java
+++ b/cdp-common/cdp-common-exception/src/main/java/com/baiye/util/ValidationUtil.java
@@ -1,7 +1,7 @@
-package com.baiye.exception.global.util;
+package com.baiye.util;
import cn.hutool.core.util.ObjectUtil;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
/**
* @author Enzo
diff --git a/cdp-common/cdp-common-exception/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cdp-common/cdp-common-exception/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..3d27530
--- /dev/null
+++ b/cdp-common/cdp-common-exception/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.baiye.config.ExceptionConfiguration
diff --git a/cdp-common/cdp-common-exception/src/main/resources/cdp-error.yml b/cdp-common/cdp-common-exception/src/main/resources/cdp-error.yml
new file mode 100644
index 0000000..f7193eb
--- /dev/null
+++ b/cdp-common/cdp-common-exception/src/main/resources/cdp-error.yml
@@ -0,0 +1,11 @@
+#出现错误时, 直接抛出异常
+spring:
+ mvc:
+ throw-exception-if-no-handler-found: true
+ #不要为我们工程中的资源文件建立映射
+ resources:
+ add-mappings: false
+#getErrorPath()@deprecated since 2.3.0 in favor of setting the property `server.error.path`
+server:
+ error:
+ path: /error
\ No newline at end of file
diff --git a/cdp-entrance/cdp-entrance-service/src/main/java/com/baiye/service/impl/FileUploadServiceImpl.java b/cdp-entrance/cdp-entrance-service/src/main/java/com/baiye/service/impl/FileUploadServiceImpl.java
index 37d2b5d..5067c1a 100644
--- a/cdp-entrance/cdp-entrance-service/src/main/java/com/baiye/service/impl/FileUploadServiceImpl.java
+++ b/cdp-entrance/cdp-entrance-service/src/main/java/com/baiye/service/impl/FileUploadServiceImpl.java
@@ -7,14 +7,13 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baiye.core.base.api.Result;
import com.baiye.core.constant.HttpStatus;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.feign.WeChatClient;
import com.baiye.service.FileUploadService;
import com.baiye.utils.FilePathUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
diff --git a/cdp-iaas/authorization-server/pom.xml b/cdp-iaas/authorization-server/pom.xml
index 3ff3837..d2ea564 100644
--- a/cdp-iaas/authorization-server/pom.xml
+++ b/cdp-iaas/authorization-server/pom.xml
@@ -63,7 +63,6 @@
com.aliyun
dysmsapi20170525
- 2.0.23
@@ -76,7 +75,7 @@
org.springframework.boot
spring-boot-maven-plugin
- com.baiye.auth.AuthApplication
+ com.baiye.AuthApplication
ZIP
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/AuthApplication.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/AuthApplication.java
similarity index 97%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/AuthApplication.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/AuthApplication.java
index 182c12c..dace955 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/AuthApplication.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/AuthApplication.java
@@ -1,4 +1,4 @@
-package com.baiye.auth;
+package com.baiye;
import com.baiye.annotation.EnableCustomizeFeignClient;
import com.baiye.config.LoginProperties;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/AuthServerConfig.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/AuthServerConfig.java
similarity index 97%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/AuthServerConfig.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/config/AuthServerConfig.java
index 4e6185d..edb579c 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/AuthServerConfig.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/AuthServerConfig.java
@@ -1,9 +1,9 @@
-package com.baiye.auth.config;
+package com.baiye.config;
-import com.baiye.auth.feign.IRemoteMemberService;
-import com.baiye.auth.sms.granter.SmsCodeTokenGranter;
-import com.baiye.auth.service.IOnlineUserService;
-import com.baiye.auth.translator.CustomWebRespExceptionTranslator;
+import com.baiye.feign.IRemoteMemberService;
+import com.baiye.service.IOnlineUserService;
+import com.baiye.sms.granter.SmsCodeTokenGranter;
+import com.baiye.translator.CustomWebRespExceptionTranslator;
import com.baiye.core.constant.CacheKey;
import com.baiye.core.constant.SecurityConstants;
import com.baiye.core.util.RedisUtils;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/DataSourceConfig.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/DataSourceConfig.java
similarity index 94%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/DataSourceConfig.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/config/DataSourceConfig.java
index 8ba00f0..3c81829 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/DataSourceConfig.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/DataSourceConfig.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.config;
+package com.baiye.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
@@ -19,4 +19,4 @@ public class DataSourceConfig {
public DataSource dataSource(){
return DataSourceBuilder.create().build();
}
-}
\ No newline at end of file
+}
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/SingleLoginTokenServices.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/SingleLoginTokenServices.java
similarity index 98%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/SingleLoginTokenServices.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/config/SingleLoginTokenServices.java
index dcc0f99..f83777a 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/SingleLoginTokenServices.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/SingleLoginTokenServices.java
@@ -1,7 +1,6 @@
-package com.baiye.auth.config;
+package com.baiye.config;
-import cn.hutool.json.JSONUtil;
-import com.baiye.auth.service.IOnlineUserService;
+import com.baiye.service.IOnlineUserService;
import com.baiye.component.LoginUser;
import com.baiye.core.constant.SecurityConstants;
import org.springframework.security.core.AuthenticationException;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/WebSecurityConfig.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/WebSecurityConfig.java
similarity index 95%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/WebSecurityConfig.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/config/WebSecurityConfig.java
index f2d3488..014d463 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/WebSecurityConfig.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/WebSecurityConfig.java
@@ -1,7 +1,6 @@
-package com.baiye.auth.config;
+package com.baiye.config;
-import com.baiye.auth.sms.SmsCodeAuthenticationSecurityConfig;
-import com.baiye.config.IgnoreUrlPropsConfiguration;
+import com.baiye.sms.SmsCodeAuthenticationSecurityConfig;
import com.baiye.handle.CustomAuthenticationFailureHandler;
import com.baiye.service.UserDetailsServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -72,7 +71,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.apply(smsCodeAuthenticationSecurityConfig)
.and()
.authorizeRequests();
- config.antMatchers("/actuator/**", "/oauth/**", "/auth/**", "/token/**").permitAll();
+
+ config.antMatchers("/actuator/**", "/oauth/**", "/auth/**", "/token/**","/sms/getCode").permitAll();
ignoreUrlPropsConfig.getUrls().forEach(url -> config.antMatchers(url).permitAll());
ignoreUrlPropsConfig.getIgnoreSecurity().forEach(url -> config.antMatchers(url).permitAll());
config
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/properties/SmsProperties.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/properties/SmsProperties.java
similarity index 93%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/properties/SmsProperties.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/config/properties/SmsProperties.java
index 22081cb..20136a5 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/config/properties/SmsProperties.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/config/properties/SmsProperties.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.baiye.auth.config.properties;
+package com.baiye.config.properties;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
*/
@Data
@Configuration
-@ConfigurationProperties(prefix = "sms")
+@ConfigurationProperties(prefix = "sms.aliyun")
public class SmsProperties {
@ApiModelProperty(value = "accessKeyId")
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/LogoutController.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/controller/LogoutController.java
similarity index 94%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/LogoutController.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/controller/LogoutController.java
index 2091cad..406fa34 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/LogoutController.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/controller/LogoutController.java
@@ -1,7 +1,7 @@
-package com.baiye.auth.controller;
+package com.baiye.controller;
import cn.hutool.core.text.CharSequenceUtil;
-import com.baiye.auth.service.ILogoutService;
+import com.baiye.service.ILogoutService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/OauthController.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/controller/OauthController.java
similarity index 98%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/OauthController.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/controller/OauthController.java
index 2f5cce4..0d9d4ee 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/OauthController.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/controller/OauthController.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.controller;
+package com.baiye.controller;
import com.baiye.core.annotation.Log;
import com.baiye.core.base.api.Result;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/OnlineController.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/controller/OnlineController.java
similarity index 94%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/OnlineController.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/controller/OnlineController.java
index 964e8bd..2d93da1 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/OnlineController.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/controller/OnlineController.java
@@ -1,6 +1,6 @@
-package com.baiye.auth.controller;
+package com.baiye.controller;
-import com.baiye.auth.service.IOnlineUserService;
+import com.baiye.service.IOnlineUserService;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/SmsController.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/controller/SmsController.java
similarity index 77%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/SmsController.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/controller/SmsController.java
index 3e2be9e..241e13d 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/controller/SmsController.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/controller/SmsController.java
@@ -1,7 +1,8 @@
-package com.baiye.auth.controller;
+package com.baiye.controller;
-import com.baiye.auth.service.SmsService;
+import com.baiye.service.SmsService;
import com.baiye.core.base.api.Result;
+import com.baiye.core.util.MobileUtil;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
@@ -22,7 +23,8 @@ public class SmsController {
@GetMapping("/getCode")
@ResponseBody
public Result sendSMS(@RequestParam String mobile) {
- if (StringUtils.isBlank(mobile)) {
+ int i = 10 / 0;
+ if (StringUtils.isBlank(mobile) || !MobileUtil.checkPhone(mobile)) {
return Result.fail("发送短信失败");
}
return Boolean.TRUE.equals(smsService.sendSms(mobile)) ? Result.success() : Result.fail();
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/entity/OnlineUser.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/entity/OnlineUser.java
similarity index 96%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/entity/OnlineUser.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/entity/OnlineUser.java
index 30acd2c..eeac85d 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/entity/OnlineUser.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/entity/OnlineUser.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.entity;
+package com.baiye.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/feign/IRemoteMemberService.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/feign/IRemoteMemberService.java
similarity index 96%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/feign/IRemoteMemberService.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/feign/IRemoteMemberService.java
index ddf74fe..89c19fb 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/feign/IRemoteMemberService.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/feign/IRemoteMemberService.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.feign;
+package com.baiye.feign;
import com.baiye.core.constant.SecurityConstants;
import com.baiye.core.constant.ServiceNameConstants;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/ILogoutService.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/ILogoutService.java
similarity index 85%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/ILogoutService.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/service/ILogoutService.java
index c6fd12a..9501df8 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/ILogoutService.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/ILogoutService.java
@@ -1,7 +1,7 @@
-package com.baiye.auth.service;
+package com.baiye.service;
/**
- *
+ *
* @description
* @author Enzo
* @date 2020-08-03 18:10
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/IOnlineUserService.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/IOnlineUserService.java
similarity index 94%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/IOnlineUserService.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/service/IOnlineUserService.java
index 77f0526..41e1f1a 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/IOnlineUserService.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/IOnlineUserService.java
@@ -1,6 +1,6 @@
-package com.baiye.auth.service;
+package com.baiye.service;
-import com.baiye.auth.entity.OnlineUser;
+import com.baiye.entity.OnlineUser;
import com.baiye.core.page.PageResult;
import org.springframework.data.domain.Pageable;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
@@ -8,7 +8,7 @@ import org.springframework.security.oauth2.common.OAuth2AccessToken;
import java.util.List;
/**
- *
+ *
* @description
* @author Enzo
* @date 2020-09-01 18:19
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/SmsService.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/SmsService.java
similarity index 85%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/SmsService.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/service/SmsService.java
index 98e8f2d..8e125c1 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/SmsService.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/SmsService.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.service;
+package com.baiye.service;
/**
* @author Enzo
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/LogoutServiceImpl.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/LogoutServiceImpl.java
similarity index 89%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/LogoutServiceImpl.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/LogoutServiceImpl.java
index d53e31b..3c51600 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/LogoutServiceImpl.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/LogoutServiceImpl.java
@@ -1,8 +1,8 @@
-package com.baiye.auth.service.impl;
+package com.baiye.service.impl;
import cn.hutool.core.text.CharSequenceUtil;
-import com.baiye.auth.service.ILogoutService;
-import com.baiye.auth.service.IOnlineUserService;
+import com.baiye.service.ILogoutService;
+import com.baiye.service.IOnlineUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.security.oauth2.provider.token.TokenStore;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/OnlineServiceImpl.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/OnlineServiceImpl.java
similarity index 97%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/OnlineServiceImpl.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/OnlineServiceImpl.java
index 8e35268..1bea34a 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/OnlineServiceImpl.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/OnlineServiceImpl.java
@@ -1,16 +1,15 @@
-package com.baiye.auth.service.impl;
+package com.baiye.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.text.CharSequenceUtil;
-import com.baiye.auth.entity.OnlineUser;
-import com.baiye.auth.service.IOnlineUserService;
+import com.baiye.entity.OnlineUser;
+import com.baiye.service.IOnlineUserService;
import com.baiye.core.constant.CacheKey;
import com.baiye.core.constant.SecurityConstants;
import com.baiye.core.page.PageResult;
import com.baiye.core.page.PageUtil;
import com.baiye.core.util.RedisUtils;
import com.baiye.core.util.RequestUtils;
-import com.baiye.core.util.StringUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/SmsServiceImpl.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/SmsServiceImpl.java
similarity index 92%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/SmsServiceImpl.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/SmsServiceImpl.java
index 907bbf9..a7ed89a 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/service/impl/SmsServiceImpl.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/service/impl/SmsServiceImpl.java
@@ -1,15 +1,14 @@
-package com.baiye.auth.service.impl;
+package com.baiye.service.impl;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.aliyun.dysmsapi20170525.Client;
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
import com.aliyun.teaopenapi.models.Config;
import com.aliyun.teautil.models.RuntimeOptions;
-import com.baiye.auth.config.properties.SmsProperties;
-import com.baiye.auth.service.SmsService;
+import com.baiye.config.properties.SmsProperties;
+import com.baiye.service.SmsService;
import com.baiye.core.constant.DefaultNumberConstants;
import com.baiye.core.constant.Oauth2Constant;
import com.baiye.core.util.RedisUtils;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationFilter.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationFilter.java
similarity index 98%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationFilter.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationFilter.java
index a0f0584..05445a6 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationFilter.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.sms;
+package com.baiye.sms;
import com.baiye.core.constant.Oauth2Constant;
import org.springframework.security.authentication.AuthenticationServiceException;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationProvider.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationProvider.java
similarity index 98%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationProvider.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationProvider.java
index 1038bff..32e3849 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationProvider.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationProvider.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.sms;
+package com.baiye.sms;
import com.baiye.service.CdpUserDetailsService;
import lombok.AllArgsConstructor;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationSecurityConfig.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationSecurityConfig.java
similarity index 98%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationSecurityConfig.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationSecurityConfig.java
index c690ab8..351e8bc 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationSecurityConfig.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationSecurityConfig.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.sms;
+package com.baiye.sms;
import com.baiye.service.CdpUserDetailsService;
import lombok.RequiredArgsConstructor;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationToken.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationToken.java
similarity index 97%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationToken.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationToken.java
index 84f10f2..ac906ea 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/SmsCodeAuthenticationToken.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/SmsCodeAuthenticationToken.java
@@ -1,4 +1,4 @@
-package com.baiye.auth.sms;
+package com.baiye.sms;
import lombok.SneakyThrows;
import org.springframework.security.authentication.AbstractAuthenticationToken;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/granter/SmsCodeTokenGranter.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/granter/SmsCodeTokenGranter.java
similarity index 93%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/granter/SmsCodeTokenGranter.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/sms/granter/SmsCodeTokenGranter.java
index f9c349c..9fca3fe 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/sms/granter/SmsCodeTokenGranter.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/sms/granter/SmsCodeTokenGranter.java
@@ -1,19 +1,18 @@
-package com.baiye.auth.sms.granter;
+package com.baiye.sms.granter;
import cn.hutool.core.text.CharSequenceUtil;
-import com.baiye.auth.feign.IRemoteMemberService;
-import com.baiye.auth.sms.SmsCodeAuthenticationToken;
+import com.baiye.feign.IRemoteMemberService;
+import com.baiye.sms.SmsCodeAuthenticationToken;
import com.baiye.core.constant.Oauth2Constant;
import com.baiye.core.constant.SecurityConstants;
import com.baiye.core.util.RedisUtils;
-import com.baiye.exception.global.SmsAuthorizationException;
+import com.baiye.SmsAuthorizationException;
import org.springframework.security.authentication.AbstractAuthenticationToken;
import org.springframework.security.authentication.AccountStatusException;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
-import org.springframework.security.oauth2.common.exceptions.UserDeniedAuthorizationException;
import org.springframework.security.oauth2.provider.*;
import org.springframework.security.oauth2.provider.token.AbstractTokenGranter;
import org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices;
diff --git a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/translator/CustomWebRespExceptionTranslator.java b/cdp-iaas/authorization-server/src/main/java/com/baiye/translator/CustomWebRespExceptionTranslator.java
similarity index 97%
rename from cdp-iaas/authorization-server/src/main/java/com/baiye/auth/translator/CustomWebRespExceptionTranslator.java
rename to cdp-iaas/authorization-server/src/main/java/com/baiye/translator/CustomWebRespExceptionTranslator.java
index dcd21de..d446deb 100644
--- a/cdp-iaas/authorization-server/src/main/java/com/baiye/auth/translator/CustomWebRespExceptionTranslator.java
+++ b/cdp-iaas/authorization-server/src/main/java/com/baiye/translator/CustomWebRespExceptionTranslator.java
@@ -1,6 +1,6 @@
-package com.baiye.auth.translator;
+package com.baiye.translator;
-import com.baiye.exception.global.handle.ApiError;
+import com.baiye.handle.ApiError;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.HttpStatus;
diff --git a/cdp-iaas/authorization-server/src/main/resources/config/application.yml b/cdp-iaas/authorization-server/src/main/resources/config/application.yml
index 140dea1..ad5f716 100644
--- a/cdp-iaas/authorization-server/src/main/resources/config/application.yml
+++ b/cdp-iaas/authorization-server/src/main/resources/config/application.yml
@@ -4,6 +4,15 @@ spring:
application:
name: auth-server
profiles:
- active: prod
+ active: dev
ip:
local-parsing: true
+
+#配置短信参数
+sms:
+ aliyun:
+ accessKeyId: R7hb84lBwjJQasch
+ accessKeySecret: 2ngpjkzXBKHPZhVj2yDZSGVX3fXAwT
+ signName: 百业互联科技
+ templateCode: SMS_232894146
+ templateCode1: SMS_243261646
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DeptController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DeptController.java
index 9e565f3..80df75b 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DeptController.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DeptController.java
@@ -3,7 +3,7 @@ package com.baiye.controller;
import com.baiye.Dept;
import com.baiye.core.page.PageResult;
import com.baiye.dto.DeptDto;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.query.DeptQueryCriteria;
import com.baiye.service.IDeptService;
import io.swagger.annotations.Api;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictController.java
index 56e1fab..cfd0549 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictController.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictController.java
@@ -2,7 +2,7 @@ package com.baiye.controller;
import com.baiye.Dict;
import com.baiye.core.page.PageResult;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.query.DictQueryCriteria;
import com.baiye.service.IDictService;
import io.swagger.annotations.Api;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictDetailController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictDetailController.java
index e820494..6e50d67 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictDetailController.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictDetailController.java
@@ -3,7 +3,7 @@ package com.baiye.controller;
import com.baiye.DictDetail;
import com.baiye.core.page.PageResult;
import com.baiye.dto.DictDetailDto;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.query.DictDetailQueryCriteria;
import com.baiye.service.IDictDetailService;
import io.swagger.annotations.Api;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/JobController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/JobController.java
index 3fca777..4f0ccef 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/JobController.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/JobController.java
@@ -2,7 +2,7 @@ package com.baiye.controller;
import com.baiye.Job;
import com.baiye.core.page.PageResult;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.query.JobQueryCriteria;
import com.baiye.service.IJobService;
import io.swagger.annotations.Api;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MenuController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MenuController.java
index e802110..caaa861 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MenuController.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MenuController.java
@@ -1,11 +1,10 @@
package com.baiye.controller;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
import com.baiye.Menu;
import com.baiye.core.page.PageResult;
import com.baiye.dto.MenuDto;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.mapstruct.MenuMapStruct;
import com.baiye.query.MenuQueryCriteria;
import com.baiye.service.IMenuService;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/PictureController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/PictureController.java
index cb6d560..573f475 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/PictureController.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/PictureController.java
@@ -1,7 +1,7 @@
package com.baiye.controller;
import cn.hutool.core.text.CharSequenceUtil;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.properties.FileProperties;
import com.baiye.util.FileUtil;
import com.google.common.collect.ImmutableMap;
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
-import java.util.Objects;
/**
* @author Enzo
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/RoleController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/RoleController.java
index 7880093..912f56f 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/RoleController.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/RoleController.java
@@ -5,7 +5,7 @@ import com.baiye.Role;
import com.baiye.core.page.PageResult;
import com.baiye.dto.RoleDto;
import com.baiye.dto.RoleSmallDto;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.query.RoleQueryCriteria;
import com.baiye.service.IRoleService;
import com.baiye.util.SecurityUtils;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/UserController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/UserController.java
index 0c95efb..2e2c350 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/UserController.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/UserController.java
@@ -5,7 +5,7 @@ import com.baiye.core.base.BaseEntity;
import com.baiye.core.page.PageResult;
import com.baiye.dto.RoleSmallDto;
import com.baiye.dto.UserDto;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.query.UserQueryCriteria;
import com.baiye.service.*;
import com.baiye.util.SecurityUtils;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DeptServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DeptServiceImpl.java
index 7b805d2..3791531 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DeptServiceImpl.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DeptServiceImpl.java
@@ -12,8 +12,8 @@ import com.baiye.core.util.BeanUtils;
import com.baiye.core.util.FileUtils;
import com.baiye.core.util.RedisUtils;
import com.baiye.dto.DeptDto;
-import com.baiye.exception.global.BadRequestException;
-import com.baiye.exception.global.CreateFailException;
+import com.baiye.BadRequestException;
+import com.baiye.CreateFailException;
import com.baiye.mapper.DeptMapper;
import com.baiye.mapper.RoleDeptMapper;
import com.baiye.mapper.UserMapper;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DictDetailServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DictDetailServiceImpl.java
index 18ca8eb..bfb2fea 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DictDetailServiceImpl.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DictDetailServiceImpl.java
@@ -7,7 +7,7 @@ import com.baiye.core.page.PageResult;
import com.baiye.core.util.RedisUtils;
import com.baiye.core.util.StringUtils;
import com.baiye.dto.DictDetailDto;
-import com.baiye.exception.global.DeleteFailException;
+import com.baiye.DeleteFailException;
import com.baiye.mapper.DictDetailMapper;
import com.baiye.mapper.DictMapper;
import com.baiye.mapstruct.DictDetailMapStruct;
@@ -31,7 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
- *
+ *
* @description 字典详情业务
* @author Enzo
* @create: 2020-08-09 15:38
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DictServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DictServiceImpl.java
index 42e5551..eb34281 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DictServiceImpl.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/DictServiceImpl.java
@@ -6,8 +6,8 @@ import com.baiye.core.page.PageResult;
import com.baiye.core.util.FileUtils;
import com.baiye.core.util.RedisUtils;
import com.baiye.dto.DictDto;
-import com.baiye.exception.global.CreateFailException;
-import com.baiye.exception.global.UpdateFailException;
+import com.baiye.CreateFailException;
+import com.baiye.UpdateFailException;
import com.baiye.mapper.DictDetailMapper;
import com.baiye.mapper.DictMapper;
import com.baiye.mapstruct.DictMapStruct;
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
- *
+ *
* @description 字典业务实现类
* @author Enzo
* @create: 2020-08-08 21:44
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/JobServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/JobServiceImpl.java
index c54137d..b26762f 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/JobServiceImpl.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/JobServiceImpl.java
@@ -7,10 +7,10 @@ import com.baiye.core.page.PageResult;
import com.baiye.core.util.FileUtils;
import com.baiye.core.util.RedisUtils;
import com.baiye.dto.JobDto;
-import com.baiye.exception.global.BadRequestException;
-import com.baiye.exception.global.CreateFailException;
-import com.baiye.exception.global.DeleteFailException;
-import com.baiye.exception.global.EntityExistException;
+import com.baiye.BadRequestException;
+import com.baiye.CreateFailException;
+import com.baiye.DeleteFailException;
+import com.baiye.EntityExistException;
import com.baiye.mapper.JobMapper;
import com.baiye.mapper.UserJobMapper;
import com.baiye.mapstruct.JobMapStruct;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MemberServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MemberServiceImpl.java
index 3493e4a..12fc1d1 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MemberServiceImpl.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MemberServiceImpl.java
@@ -10,8 +10,8 @@ import com.baiye.core.constant.CacheKey;
import com.baiye.core.page.PageResult;
import com.baiye.core.util.RedisUtils;
import com.baiye.dto.UserSmallDto;
-import com.baiye.exception.global.BadRequestException;
-import com.baiye.exception.global.UpdateFailException;
+import com.baiye.BadRequestException;
+import com.baiye.UpdateFailException;
import com.baiye.feign.IRemoteAuthService;
import com.baiye.mapper.MemberMapper;
import com.baiye.mapstruct.MemberMapStruct;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java
index 793e757..5627306 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java
@@ -2,10 +2,6 @@ package com.baiye.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
import com.baiye.Menu;
import com.baiye.Role;
import com.baiye.User;
@@ -13,12 +9,11 @@ import com.baiye.core.constant.CacheKey;
import com.baiye.core.page.PageResult;
import com.baiye.core.util.FileUtils;
import com.baiye.core.util.RedisUtils;
-import com.baiye.core.util.RequestUtils;
import com.baiye.core.util.StringUtils;
import com.baiye.dto.MenuDto;
-import com.baiye.exception.global.BadRequestException;
-import com.baiye.exception.global.EntityExistException;
-import com.baiye.exception.global.UpdateFailException;
+import com.baiye.BadRequestException;
+import com.baiye.EntityExistException;
+import com.baiye.UpdateFailException;
import com.baiye.mapper.MenuMapper;
import com.baiye.mapper.UserMapper;
import com.baiye.mapstruct.MenuMapStruct;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/RoleServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/RoleServiceImpl.java
index a7897b9..f4c8a3c 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/RoleServiceImpl.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/RoleServiceImpl.java
@@ -9,7 +9,6 @@ import com.baiye.core.util.RedisUtils;
import com.baiye.dto.RoleDto;
import com.baiye.dto.RoleSmallDto;
import com.baiye.dto.UserDto;
-import com.baiye.exception.global.*;
import com.baiye.mapper.*;
import com.baiye.mapstruct.RoleMapStruct;
import com.baiye.mapstruct.RoleSmallMapStruct;
@@ -37,7 +36,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
- *
+ *
* @description
* @author Enzo
* @create: 2020-08-11 18:32
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java
index f934120..95efdf8 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java
@@ -14,7 +14,6 @@ import com.baiye.core.util.RedisUtils;
import com.baiye.core.util.StringUtils;
import com.baiye.dto.UserDto;
import com.baiye.dto.UserSmallDto;
-import com.baiye.exception.global.*;
import com.baiye.feign.IRemoteAuthService;
import com.baiye.mapper.UserJobMapper;
import com.baiye.mapper.UserMapper;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/util/FileUtil.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/util/FileUtil.java
index 382738a..7b1ac59 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/util/FileUtil.java
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/util/FileUtil.java
@@ -19,7 +19,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter;
import cn.hutool.poi.excel.ExcelUtil;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application.yml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application.yml
index f9283c0..4326042 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application.yml
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application.yml
@@ -9,7 +9,7 @@ spring:
freemarker:
check-template-location: false
profiles:
- active: prod
+ active: dev
jackson:
time-zone: GMT+8
data:
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/TiktokRequestClient.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/TiktokRequestClient.java
index e44a984..4796a6b 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/TiktokRequestClient.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/TiktokRequestClient.java
@@ -8,7 +8,7 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baiye.core.base.api.BaseTiktokRequest;
import com.baiye.core.base.api.BaseTiktokResponse;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.properties.TiktokProperties;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/handler/TiktokSocketServerHandler.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/handler/TiktokSocketServerHandler.java
index e84bf6c..60e5b86 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/handler/TiktokSocketServerHandler.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/handler/TiktokSocketServerHandler.java
@@ -14,7 +14,7 @@ import com.baiye.core.util.AesEncrypt;
import com.baiye.dto.*;
import com.baiye.dto.request.OptCommentVideoRequestDTO;
import com.baiye.dto.request.SendMessageRequestDTO;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.feign.TikTokUserFeignProvider;
import com.baiye.service.BaseSocketServerHandler;
import io.netty.buffer.ByteBuf;
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokHotCommentSopServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokHotCommentSopServiceImpl.java
index 2faf45b..0923a15 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokHotCommentSopServiceImpl.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokHotCommentSopServiceImpl.java
@@ -18,7 +18,7 @@ import com.baiye.dao.*;
import com.baiye.dto.HotCommentSopDto;
import com.baiye.dto.VideoDto;
import com.baiye.entity.*;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.service.TiktokHotCommentSopService;
import com.baiye.service.TiktokNumOrganizeService;
import com.baiye.service.TiktokUserService;
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMaterialServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMaterialServiceImpl.java
index c5f6ab4..3785b49 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMaterialServiceImpl.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMaterialServiceImpl.java
@@ -6,7 +6,7 @@ import com.baiye.core.util.StringUtils;
import com.baiye.entity.TiktokMaterialEntity;
import com.baiye.dao.TiktokMaterialMapper;
import com.baiye.entity.TiktokMaterialTemplateEntity;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.properties.FileProperties;
import com.baiye.service.TiktokMaterialService;
import com.baiye.service.TiktokMaterialTemplateService;
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokNumOrganizeServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokNumOrganizeServiceImpl.java
index e154faa..43404ba 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokNumOrganizeServiceImpl.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokNumOrganizeServiceImpl.java
@@ -2,9 +2,7 @@ package com.baiye.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.RandomUtil;
import com.baiye.constant.DefaultKeyConstants;
-import com.baiye.core.constant.DefaultNumberConstants;
import com.baiye.core.page.PageResult;
import com.baiye.core.util.StringUtils;
import com.baiye.dao.SopMapper;
@@ -15,7 +13,7 @@ import com.baiye.entity.TiktokEquipmentEntity;
import com.baiye.entity.TiktokHotCommentSopEntity;
import com.baiye.entity.TiktokNumOrganizeEntity;
import com.baiye.dao.TiktokNumOrganizeMapper;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.service.TiktokNumOrganizeService;
import com.baiye.service.TiktokEquipmentService;
import com.baiye.vo.SopVo;
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokVideoServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokVideoServiceImpl.java
index a70768f..d6a94e3 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokVideoServiceImpl.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokVideoServiceImpl.java
@@ -8,7 +8,6 @@ import cn.hutool.core.util.RandomUtil;
import com.baiye.api.TiktokRequestClient;
import com.baiye.api.request.*;
import com.baiye.api.response.*;
-import com.baiye.core.base.api.BaseTiktokResponse;
import com.baiye.core.base.api.Result;
import com.baiye.core.base.api.ResultCode;
import com.baiye.core.constant.DefaultNumberConstants;
@@ -19,7 +18,7 @@ import com.baiye.dto.TiktokMemberDTO;
import com.baiye.dto.request.*;
import com.baiye.entity.TiktokEquipmentEntity;
import com.baiye.entity.TiktokVideoComment;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.properties.TiktokProperties;
import com.baiye.service.TiktokEquipmentService;
import com.baiye.service.TiktokMemberService;
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/utils/FileUtil.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/utils/FileUtil.java
index d507075..5ebe0d4 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/utils/FileUtil.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/utils/FileUtil.java
@@ -19,7 +19,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter;
import cn.hutool.poi.excel.ExcelUtil;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/src/main/java/com/baiye/api/TiktokRequestClient.java b/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/src/main/java/com/baiye/api/TiktokRequestClient.java
index e6bc4e0..5e3f218 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/src/main/java/com/baiye/api/TiktokRequestClient.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/src/main/java/com/baiye/api/TiktokRequestClient.java
@@ -8,7 +8,7 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baiye.core.base.api.BaseTiktokRequest;
import com.baiye.core.base.api.BaseTiktokResponse;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.properties.TiktokProperties;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
diff --git a/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java
index 6f113ae..de8cba8 100644
--- a/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java
+++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java
@@ -19,7 +19,7 @@ import com.baiye.core.util.DesUtil;
import com.baiye.dao.*;
import com.baiye.dto.*;
import com.baiye.entity.*;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.properties.WeChatProperties;
import com.baiye.query.WeChatUserQuery;
import com.baiye.service.WeChatUserService;
diff --git a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/controller/AliYunOssUpload.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/controller/AliYunOssUpload.java
index 84644b1..b144750 100644
--- a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/controller/AliYunOssUpload.java
+++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/controller/AliYunOssUpload.java
@@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil;
import com.aliyun.oss.OSS;
import com.baiye.core.base.api.Result;
import com.baiye.core.constant.DefaultNumberConstants;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.oss.OssConfig;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
diff --git a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/UploadController.java b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/UploadController.java
index c39a538..3d70f9a 100644
--- a/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/UploadController.java
+++ b/cdp-tools/cdp-tool-xhs/cdp-tool-xhs-api/src/main/java/com/baiye/controller/UploadController.java
@@ -1,7 +1,7 @@
package com.baiye.controller;
import cn.hutool.core.text.CharSequenceUtil;
-import com.baiye.exception.global.BadRequestException;
+import com.baiye.BadRequestException;
import com.baiye.properties.FileProperties;
import com.baiye.util.FileUtil;
import com.google.common.collect.ImmutableMap;
diff --git a/pom.xml b/pom.xml
index 0006fff..5d66334 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
1.8
+ 2.0.23
5.2.3
22.0
1.15.0
@@ -305,6 +306,12 @@
${webmagic.version}
+
+
+ com.aliyun
+ dysmsapi20170525
+ ${sms.version}
+