> THREAD_LOCAL = new TransmittableThreadLocal<>();
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/domain/Result.java
similarity index 93%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/domain/Result.java
index 70faa40..f2a4c34 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/domain/Result.java
@@ -1,7 +1,7 @@
-package com.muyu.common.core.domain;
+package com.couplet.common.core.domain;
-import com.muyu.common.core.constant.Constants;
-import com.muyu.common.core.constant.HttpStatus;
+import com.couplet.common.core.constant.Constants;
+import com.couplet.common.core.constant.HttpStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -12,7 +12,7 @@ import java.io.Serializable;
/**
* 响应信息主体
*
- * @author muyu
+ * @author couplet
*/
@Data
@Builder
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/enums/UserStatus.java
similarity index 87%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/enums/UserStatus.java
index 32ff39a..1680ccd 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/enums/UserStatus.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.enums;
+package com.couplet.common.core.enums;
/**
* 用户状态
*
- * @author muyu
+ * @author couplet
*/
public enum UserStatus {
OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/CaptchaException.java
similarity index 78%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/CaptchaException.java
index eb32d0b..a869eca 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/CaptchaException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception;
+package com.couplet.common.core.exception;
/**
* 验证码错误异常类
*
- * @author muyu
+ * @author couplet
*/
public class CaptchaException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/CheckedException.java
similarity index 90%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/CheckedException.java
index 4f12893..c5f10d1 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/CheckedException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception;
+package com.couplet.common.core.exception;
/**
* 检查异常
*
- * @author muyu
+ * @author couplet
*/
public class CheckedException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/DemoModeException.java
similarity index 75%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/DemoModeException.java
index 82249cf..9952653 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/DemoModeException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception;
+package com.couplet.common.core.exception;
/**
* 演示模式异常
*
- * @author muyu
+ * @author couplet
*/
public class DemoModeException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/GlobalException.java
similarity index 94%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/GlobalException.java
index b14e03c..fd8cf36 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/GlobalException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception;
+package com.couplet.common.core.exception;
/**
* 全局异常
*
- * @author muyu
+ * @author couplet
*/
public class GlobalException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/InnerAuthException.java
similarity index 78%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/InnerAuthException.java
index f211c7f..c52c9ee 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/InnerAuthException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception;
+package com.couplet.common.core.exception;
/**
* 内部认证异常
*
- * @author muyu
+ * @author couplet
*/
public class InnerAuthException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/PreAuthorizeException.java
similarity index 75%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/PreAuthorizeException.java
index 6cb8636..2cb3739 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/PreAuthorizeException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception;
+package com.couplet.common.core.exception;
/**
* 权限异常
*
- * @author muyu
+ * @author couplet
*/
public class PreAuthorizeException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/ServiceException.java
similarity index 95%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/ServiceException.java
index 5039bc0..dece31d 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/ServiceException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception;
+package com.couplet.common.core.exception;
/**
* 业务异常
*
- * @author muyu
+ * @author couplet
*/
public final class ServiceException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/UtilException.java
similarity index 87%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/UtilException.java
index 8de4bbf..e844029 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/UtilException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception;
+package com.couplet.common.core.exception;
/**
* 工具类异常
*
- * @author muyu
+ * @author couplet
*/
public class UtilException extends RuntimeException {
private static final long serialVersionUID = 8247610319171014183L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotLoginException.java
similarity index 78%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotLoginException.java
index 40293bf..a79a344 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotLoginException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception.auth;
+package com.couplet.common.core.exception.auth;
/**
* 未能通过的登录认证异常
*
- * @author muyu
+ * @author couplet
*/
public class NotLoginException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotPermissionException.java
similarity index 86%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotPermissionException.java
index e464840..3ae3cef 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotPermissionException.java
@@ -1,11 +1,11 @@
-package com.muyu.common.core.exception.auth;
+package com.couplet.common.core.exception.auth;
import org.apache.commons.lang3.StringUtils;
/**
* 未能通过的权限认证异常
*
- * @author muyu
+ * @author couplet
*/
public class NotPermissionException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotRoleException.java
similarity index 84%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotRoleException.java
index 53a1522..1da212f 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/auth/NotRoleException.java
@@ -1,11 +1,11 @@
-package com.muyu.common.core.exception.auth;
+package com.couplet.common.core.exception.auth;
import org.apache.commons.lang3.StringUtils;
/**
* 未能通过的角色认证异常
*
- * @author muyu
+ * @author couplet
*/
public class NotRoleException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/base/BaseException.java
similarity index 95%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/base/BaseException.java
index 9bb1356..101ec98 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/base/BaseException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception.base;
+package com.couplet.common.core.exception.base;
/**
* 基础异常
*
- * @author muyu
+ * @author couplet
*/
public class BaseException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileException.java
similarity index 67%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileException.java
index ae2e184..454e06d 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileException.java
@@ -1,11 +1,11 @@
-package com.muyu.common.core.exception.file;
+package com.couplet.common.core.exception.file;
-import com.muyu.common.core.exception.base.BaseException;
+import com.couplet.common.core.exception.base.BaseException;
/**
* 文件信息异常类
*
- * @author muyu
+ * @author couplet
*/
public class FileException extends BaseException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileNameLengthLimitExceededException.java
similarity index 84%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileNameLengthLimitExceededException.java
index 3a85df3..c4845f6 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileNameLengthLimitExceededException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception.file;
+package com.couplet.common.core.exception.file;
/**
* 文件名称超长限制异常类
*
- * @author muyu
+ * @author couplet
*/
public class FileNameLengthLimitExceededException extends FileException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileSizeLimitExceededException.java
similarity index 83%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileSizeLimitExceededException.java
index 7570be5..01b36a8 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileSizeLimitExceededException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception.file;
+package com.couplet.common.core.exception.file;
/**
* 文件名大小限制异常类
*
- * @author muyu
+ * @author couplet
*/
public class FileSizeLimitExceededException extends FileException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileUploadException.java
similarity index 94%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileUploadException.java
index 94341ab..9734a8b 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/FileUploadException.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.exception.file;
+package com.couplet.common.core.exception.file;
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -6,7 +6,7 @@ import java.io.PrintWriter;
/**
* 文件上传异常类
*
- * @author muyu
+ * @author couplet
*/
public class FileUploadException extends Exception {
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/InvalidExtensionException.java
similarity index 97%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/InvalidExtensionException.java
index 3a993c2..105e40b 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/file/InvalidExtensionException.java
@@ -1,11 +1,11 @@
-package com.muyu.common.core.exception.file;
+package com.couplet.common.core.exception.file;
import java.util.Arrays;
/**
* 文件上传 误异常类
*
- * @author muyu
+ * @author couplet
*/
public class InvalidExtensionException extends FileUploadException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/job/TaskException.java
similarity index 89%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/job/TaskException.java
index aee364a..aa52306 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/job/TaskException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception.job;
+package com.couplet.common.core.exception.job;
/**
* 计划策略异常
*
- * @author muyu
+ * @author couplet
*/
public class TaskException extends Exception {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/CaptchaExpireException.java
similarity index 78%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/CaptchaExpireException.java
index a95a57b..97f50a0 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/CaptchaExpireException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception.user;
+package com.couplet.common.core.exception.user;
/**
* 验证码失效异常类
*
- * @author muyu
+ * @author couplet
*/
public class CaptchaExpireException extends UserException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/UserException.java
similarity index 65%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/UserException.java
index f113749..a33af18 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/UserException.java
@@ -1,11 +1,11 @@
-package com.muyu.common.core.exception.user;
+package com.couplet.common.core.exception.user;
-import com.muyu.common.core.exception.base.BaseException;
+import com.couplet.common.core.exception.base.BaseException;
/**
* 用户信息异常类
*
- * @author muyu
+ * @author couplet
*/
public class UserException extends BaseException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/UserPasswordNotMatchException.java
similarity index 81%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/UserPasswordNotMatchException.java
index 7615cda..d128a60 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/user/UserPasswordNotMatchException.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.exception.user;
+package com.couplet.common.core.exception.user;
/**
* 用户密码不正确或不符合规范异常类
*
- * @author muyu
+ * @author couplet
*/
public class UserPasswordNotMatchException extends UserException {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/CharsetKit.java
similarity index 95%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/CharsetKit.java
index fe5e9fa..fabfc51 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/CharsetKit.java
@@ -1,6 +1,6 @@
-package com.muyu.common.core.text;
+package com.couplet.common.core.text;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.StringUtils;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets;
/**
* 字符集工具类
*
- * @author muyu
+ * @author couplet
*/
public class CharsetKit {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/Convert.java
similarity index 99%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/Convert.java
index fb57cb9..5a3d6b7 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/Convert.java
@@ -1,6 +1,6 @@
-package com.muyu.common.core.text;
+package com.couplet.common.core.text;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.StringUtils;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -13,7 +13,7 @@ import java.util.Set;
/**
* 类型转换器
*
- * @author muyu
+ * @author couplet
*/
public class Convert {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/StrFormatter.java
similarity index 96%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/StrFormatter.java
index 0c07cf5..e971a1b 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/text/StrFormatter.java
@@ -1,11 +1,11 @@
-package com.muyu.common.core.text;
+package com.couplet.common.core.text;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.StringUtils;
/**
* 字符串格式化
*
- * @author muyu
+ * @author couplet
*/
public class StrFormatter {
public static final String EMPTY_JSON = "{}";
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/DateUtils.java
similarity index 98%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/DateUtils.java
index fb15c59..10ac63b 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/DateUtils.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils;
+package com.couplet.common.core.utils;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -11,7 +11,7 @@ import java.util.Date;
/**
* 时间工具类
*
- * @author muyu
+ * @author couplet
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY = "yyyy";
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ExceptionUtil.java
similarity index 93%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ExceptionUtil.java
index e6abdf9..1d41d1c 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ExceptionUtil.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils;
+package com.couplet.common.core.utils;
import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -8,7 +8,7 @@ import java.io.StringWriter;
/**
* 错误信息处理类。
*
- * @author muyu
+ * @author couplet
*/
public class ExceptionUtil {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/JwtUtils.java
similarity index 92%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/JwtUtils.java
index a12b839..dd4147c 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/JwtUtils.java
@@ -1,8 +1,8 @@
-package com.muyu.common.core.utils;
+package com.couplet.common.core.utils;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.constant.TokenConstants;
-import com.muyu.common.core.text.Convert;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.core.constant.TokenConstants;
+import com.couplet.common.core.text.Convert;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
@@ -12,7 +12,7 @@ import java.util.Map;
/**
* Jwt工具类
*
- * @author muyu
+ * @author couplet
*/
public class JwtUtils {
public static String secret = TokenConstants.SECRET;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/PageUtils.java
similarity index 77%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/PageUtils.java
index d4b0554..0bba702 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/PageUtils.java
@@ -1,14 +1,14 @@
-package com.muyu.common.core.utils;
+package com.couplet.common.core.utils;
import com.github.pagehelper.PageHelper;
-import com.muyu.common.core.utils.sql.SqlUtil;
-import com.muyu.common.core.web.page.PageDomain;
-import com.muyu.common.core.web.page.TableSupport;
+import com.couplet.common.core.utils.sql.SqlUtil;
+import com.couplet.common.core.web.page.PageDomain;
+import com.couplet.common.core.web.page.TableSupport;
/**
* 分页工具类
*
- * @author muyu
+ * @author couplet
*/
public class PageUtils extends PageHelper {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ServletUtils.java
similarity index 97%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ServletUtils.java
index c9a8998..5ba506b 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ServletUtils.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.utils;
+package com.couplet.common.core.utils;
import com.alibaba.fastjson2.JSON;
-import com.muyu.common.core.constant.Constants;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.text.Convert;
+import com.couplet.common.core.constant.Constants;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.core.text.Convert;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -31,7 +31,7 @@ import java.util.Map;
/**
* 客户端工具类
*
- * @author muyu
+ * @author couplet
*/
public class ServletUtils {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/SpringUtils.java
similarity index 98%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/SpringUtils.java
index c37a65c..da35121 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/SpringUtils.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils;
+package com.couplet.common.core.utils;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeansException;
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
/**
* spring工具类 方便在非spring管理环境中获取bean
*
- * @author muyu
+ * @author couplet
*/
@Component
public final class SpringUtils implements BeanFactoryPostProcessor {
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/StringUtils.java
similarity index 98%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/StringUtils.java
index ec8f557..ec2e184 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/StringUtils.java
@@ -1,7 +1,7 @@
-package com.muyu.common.core.utils;
+package com.couplet.common.core.utils;
-import com.muyu.common.core.constant.Constants;
-import com.muyu.common.core.text.StrFormatter;
+import com.couplet.common.core.constant.Constants;
+import com.couplet.common.core.text.StrFormatter;
import org.springframework.util.AntPathMatcher;
import java.util.Collection;
@@ -11,7 +11,7 @@ import java.util.Map;
/**
* 字符串工具类
*
- * @author muyu
+ * @author couplet
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/bean/BeanUtils.java
similarity index 97%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/bean/BeanUtils.java
index d44b351..42f899b 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/bean/BeanUtils.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils.bean;
+package com.couplet.common.core.utils.bean;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
/**
* Bean 工具类
*
- * @author muyu
+ * @author couplet
*/
public class BeanUtils extends org.springframework.beans.BeanUtils {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/bean/BeanValidators.java
similarity index 90%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/bean/BeanValidators.java
index abbb157..d9ccad9 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/bean/BeanValidators.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils.bean;
+package com.couplet.common.core.utils.bean;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
@@ -8,7 +8,7 @@ import java.util.Set;
/**
* bean对象属性验证
*
- * @author muyu
+ * @author couplet
*/
public class BeanValidators {
public static void validateWithException (Validator validator, Object object, Class... groups)
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/FileTypeUtils.java
similarity index 94%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/FileTypeUtils.java
index dde7e85..c95b719 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/FileTypeUtils.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils.file;
+package com.couplet.common.core.utils.file;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
@@ -10,13 +10,13 @@ import java.util.Objects;
/**
* 文件类型工具类
*
- * @author muyu
+ * @author couplet
*/
public class FileTypeUtils {
/**
* 获取文件类型
*
- * 例如: muyu.txt, 返回: txt
+ * 例如: couplet.txt, 返回: txt
*
* @param file 文件名
*
@@ -32,7 +32,7 @@ public class FileTypeUtils {
/**
* 获取文件类型
*
- * 例如: muyu.txt, 返回: txt
+ * 例如: couplet.txt, 返回: txt
*
* @param fileName 文件名
*
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/FileUtils.java
similarity index 98%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/FileUtils.java
index 30f01b8..5359b3d 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/FileUtils.java
@@ -1,6 +1,6 @@
-package com.muyu.common.core.utils.file;
+package com.couplet.common.core.utils.file;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import javax.servlet.http.HttpServletRequest;
@@ -12,7 +12,7 @@ import java.nio.charset.StandardCharsets;
/**
* 文件处理工具类
*
- * @author muyu
+ * @author couplet
*/
public class FileUtils {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/ImageUtils.java
similarity index 96%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/ImageUtils.java
index 7e23345..cc4a6b9 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/ImageUtils.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils.file;
+package com.couplet.common.core.utils.file;
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
@@ -13,7 +13,7 @@ import java.util.Arrays;
/**
* 图片处理工具类
*
- * @author muyu
+ * @author couplet
*/
public class ImageUtils {
private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/MimeTypeUtils.java
similarity index 96%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/MimeTypeUtils.java
index 9eb1d84..2f57c39 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/file/MimeTypeUtils.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.utils.file;
+package com.couplet.common.core.utils.file;
/**
* 媒体类型工具类
*
- * @author muyu
+ * @author couplet
*/
public class MimeTypeUtils {
public static final String IMAGE_PNG = "image/png";
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/html/EscapeUtil.java
similarity index 97%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/html/EscapeUtil.java
index 7dba9be..e4655df 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/html/EscapeUtil.java
@@ -1,11 +1,11 @@
-package com.muyu.common.core.utils.html;
+package com.couplet.common.core.utils.html;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.StringUtils;
/**
* 转义和反转义工具类
*
- * @author muyu
+ * @author couplet
*/
public class EscapeUtil {
public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/html/HTMLFilter.java
similarity index 99%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/html/HTMLFilter.java
index 68221f3..d599ff1 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/html/HTMLFilter.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils.html;
+package com.couplet.common.core.utils.html;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
/**
* HTML过滤器，用于去除XSS漏洞隐患。
*
- * @author muyu
+ * @author couplet
*/
public final class HTMLFilter {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ip/IpUtils.java
similarity index 98%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ip/IpUtils.java
index f7ad9bf..b689e73 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/ip/IpUtils.java
@@ -1,7 +1,7 @@
-package com.muyu.common.core.utils.ip;
+package com.couplet.common.core.utils.ip;
-import com.muyu.common.core.utils.ServletUtils;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.ServletUtils;
+import com.couplet.common.core.utils.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
@@ -10,7 +10,7 @@ import java.net.UnknownHostException;
/**
* 获取IP方法
*
- * @author muyu
+ * @author couplet
*/
public class IpUtils {
public final static String REGX_0_255 = "(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)";
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/poi/ExcelHandlerAdapter.java
similarity index 88%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/poi/ExcelHandlerAdapter.java
index e2041fc..99b7633 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/poi/ExcelHandlerAdapter.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.utils.poi;
+package com.couplet.common.core.utils.poi;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Workbook;
@@ -6,7 +6,7 @@ import org.apache.poi.ss.usermodel.Workbook;
/**
* Excel数据格式处理适配器
*
- * @author muyu
+ * @author couplet
*/
public interface ExcelHandlerAdapter {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/poi/ExcelUtil.java
similarity index 98%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/poi/ExcelUtil.java
index 69795db..05959f4 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/poi/ExcelUtil.java
@@ -1,16 +1,16 @@
-package com.muyu.common.core.utils.poi;
+package com.couplet.common.core.utils.poi;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.annotation.Excel.ColumnType;
-import com.muyu.common.core.annotation.Excel.Type;
-import com.muyu.common.core.annotation.Excels;
-import com.muyu.common.core.exception.UtilException;
-import com.muyu.common.core.text.Convert;
-import com.muyu.common.core.utils.DateUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.file.FileTypeUtils;
-import com.muyu.common.core.utils.file.ImageUtils;
-import com.muyu.common.core.utils.reflect.ReflectUtils;
+import com.couplet.common.core.annotation.Excel;
+import com.couplet.common.core.annotation.Excel.ColumnType;
+import com.couplet.common.core.annotation.Excel.Type;
+import com.couplet.common.core.annotation.Excels;
+import com.couplet.common.core.exception.UtilException;
+import com.couplet.common.core.text.Convert;
+import com.couplet.common.core.utils.DateUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.file.FileTypeUtils;
+import com.couplet.common.core.utils.file.ImageUtils;
+import com.couplet.common.core.utils.reflect.ReflectUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
/**
* Excel相关处理
*
- * @author muyu
+ * @author couplet
*/
public class ExcelUtil {
public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/reflect/ReflectUtils.java
similarity index 98%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/reflect/ReflectUtils.java
index 2ec7e4f..826483c 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/reflect/ReflectUtils.java
@@ -1,7 +1,7 @@
-package com.muyu.common.core.utils.reflect;
+package com.couplet.common.core.utils.reflect;
-import com.muyu.common.core.text.Convert;
-import com.muyu.common.core.utils.DateUtils;
+import com.couplet.common.core.text.Convert;
+import com.couplet.common.core.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.poi.ss.usermodel.DateUtil;
@@ -14,7 +14,7 @@ import java.util.Date;
/**
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
*
- * @author muyu
+ * @author couplet
*/
@SuppressWarnings("rawtypes")
public class ReflectUtils {
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sign/Base64.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/sign/Base64.java
similarity index 99%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sign/Base64.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/sign/Base64.java
index 038933f..ccf1a81 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sign/Base64.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/sign/Base64.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.utils.sign;
+package com.couplet.common.core.utils.sign;
/**
* Base64工具类
*
- * @author muyu
+ * @author couplet
*/
public final class Base64 {
static private final int BASELENGTH = 128;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sql/SqlUtil.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/sql/SqlUtil.java
similarity index 90%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sql/SqlUtil.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/sql/SqlUtil.java
index 3f418e7..491ae54 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sql/SqlUtil.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/sql/SqlUtil.java
@@ -1,12 +1,12 @@
-package com.muyu.common.core.utils.sql;
+package com.couplet.common.core.utils.sql;
-import com.muyu.common.core.exception.UtilException;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.exception.UtilException;
+import com.couplet.common.core.utils.StringUtils;
/**
* sql操作工具类
*
- * @author muyu
+ * @author couplet
*/
public class SqlUtil {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/IdUtils.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/IdUtils.java
similarity index 93%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/IdUtils.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/IdUtils.java
index 375b034..c96fbc2 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/IdUtils.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/IdUtils.java
@@ -1,9 +1,9 @@
-package com.muyu.common.core.utils.uuid;
+package com.couplet.common.core.utils.uuid;
/**
* ID生成器工具类
*
- * @author muyu
+ * @author couplet
*/
public class IdUtils {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/Seq.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/Seq.java
similarity index 92%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/Seq.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/Seq.java
index b72e3dd..f633bc1 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/Seq.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/Seq.java
@@ -1,12 +1,12 @@
-package com.muyu.common.core.utils.uuid;
+package com.couplet.common.core.utils.uuid;
-import com.muyu.common.core.utils.DateUtils;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.DateUtils;
+import com.couplet.common.core.utils.StringUtils;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * @author muyu 序列生成类
+ * @author couplet 序列生成类
*/
public class Seq {
// 通用序列类型
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/UUID.java
similarity index 99%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/UUID.java
index 37c3c9e..241cf3a 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/utils/uuid/UUID.java
@@ -1,6 +1,6 @@
-package com.muyu.common.core.utils.uuid;
+package com.couplet.common.core.utils.uuid;
-import com.muyu.common.core.exception.UtilException;
+import com.couplet.common.core.exception.UtilException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -11,7 +11,7 @@ import java.util.concurrent.ThreadLocalRandom;
/**
* 提供通用唯一识别码（universally unique identifier）（UUID）实现
*
- * @author muyu
+ * @author couplet
*/
public final class UUID implements java.io.Serializable, Comparable {
private static final long serialVersionUID = -1185015143654744140L;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/controller/BaseController.java
similarity index 91%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/controller/BaseController.java
index 3789a82..6d85211 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/controller/BaseController.java
@@ -1,10 +1,10 @@
-package com.muyu.common.core.web.controller;
+package com.couplet.common.core.web.controller;
import com.github.pagehelper.PageInfo;
-import com.muyu.common.core.utils.DateUtils;
-import com.muyu.common.core.utils.PageUtils;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.web.page.TableDataInfo;
+import com.couplet.common.core.utils.DateUtils;
+import com.couplet.common.core.utils.PageUtils;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.core.web.page.TableDataInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@@ -17,7 +17,7 @@ import java.util.List;
/**
* web层通用数据处理
*
- * @author muyu
+ * @author couplet
*/
public class BaseController {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java
similarity index 96%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java
index add8e3e..89f2da1 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.web.domain;
+package com.couplet.common.core.web.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -17,7 +17,7 @@ import java.util.Map;
/**
* Entity基类
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/TreeEntity.java
similarity index 96%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/TreeEntity.java
index 427fcc7..e017149 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/TreeEntity.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.web.domain;
+package com.couplet.common.core.web.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -12,7 +12,7 @@ import java.util.List;
/**
* Tree基类
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/PageDomain.java
similarity index 94%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/PageDomain.java
index b9c5e45..4be70a5 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/PageDomain.java
@@ -1,11 +1,11 @@
-package com.muyu.common.core.web.page;
+package com.couplet.common.core.web.page;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.StringUtils;
/**
* 分页数据
*
- * @author muyu
+ * @author couplet
*/
public class PageDomain {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/TableDataInfo.java
similarity index 91%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/TableDataInfo.java
index d677cce..8f3fd0c 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/TableDataInfo.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.web.page;
+package com.couplet.common.core.web.page;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -12,7 +12,7 @@ import java.util.List;
/**
* 表格分页数据对象
*
- * @author muyu
+ * @author couplet
*/
@Data
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/TableSupport.java
similarity index 88%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/TableSupport.java
index ce0328d..0832c0a 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/page/TableSupport.java
@@ -1,12 +1,12 @@
-package com.muyu.common.core.web.page;
+package com.couplet.common.core.web.page;
-import com.muyu.common.core.text.Convert;
-import com.muyu.common.core.utils.ServletUtils;
+import com.couplet.common.core.text.Convert;
+import com.couplet.common.core.utils.ServletUtils;
/**
* 表格数据处理
*
- * @author muyu
+ * @author couplet
*/
public class TableSupport {
/**
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/Xss.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/xss/Xss.java
similarity index 92%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/Xss.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/xss/Xss.java
index 7eb649b..713acb2 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/Xss.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/xss/Xss.java
@@ -1,4 +1,4 @@
-package com.muyu.common.core.xss;
+package com.couplet.common.core.xss;
import javax.validation.Constraint;
import javax.validation.Payload;
@@ -10,7 +10,7 @@ import java.lang.annotation.Target;
/**
* 自定义xss校验注解
*
- * @author muyu
+ * @author couplet
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER})
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/xss/XssValidator.java
similarity index 88%
rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java
rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/xss/XssValidator.java
index 5a59932..ea41fc9 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java
+++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/xss/XssValidator.java
@@ -1,6 +1,6 @@
-package com.muyu.common.core.xss;
+package com.couplet.common.core.xss;
-import com.muyu.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.StringUtils;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
@@ -10,7 +10,7 @@ import java.util.regex.Pattern;
/**
* 自定义xss校验注解实现
*
- * @author muyu
+ * @author couplet
*/
public class XssValidator implements ConstraintValidator {
private static final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />";
diff --git a/couplet-common/couplet-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..eca240b
--- /dev/null
+++ b/couplet-common/couplet-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.couplet.common.core.utils.SpringUtils
diff --git a/muyu-common/muyu-common-log/pom.xml b/couplet-common/couplet-common-datascope/pom.xml
similarity index 64%
rename from muyu-common/muyu-common-log/pom.xml
rename to couplet-common/couplet-common-datascope/pom.xml
index 3bf544e..b0d74d0 100644
--- a/muyu-common/muyu-common-log/pom.xml
+++ b/couplet-common/couplet-common-datascope/pom.xml
@@ -3,24 +3,24 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.muyu
- muyu-common
+ com.couplet
+ couplet-common
3.6.3
4.0.0
- muyu-common-log
+ couplet-common-datascope
- muyu-common-log日志记录
+ couplet-common-datascope权限范围
- com.muyu
- muyu-common-security
+ com.couplet
+ couplet-common-security
diff --git a/muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/annotation/DataScope.java b/couplet-common/couplet-common-datascope/src/main/java/com/couplet/common/datascope/annotation/DataScope.java
similarity index 89%
rename from muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/annotation/DataScope.java
rename to couplet-common/couplet-common-datascope/src/main/java/com/couplet/common/datascope/annotation/DataScope.java
index 498f06b..79254aa 100644
--- a/muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/annotation/DataScope.java
+++ b/couplet-common/couplet-common-datascope/src/main/java/com/couplet/common/datascope/annotation/DataScope.java
@@ -1,11 +1,11 @@
-package com.muyu.common.datascope.annotation;
+package com.couplet.common.datascope.annotation;
import java.lang.annotation.*;
/**
* 数据权限过滤注解
*
- * @author muyu
+ * @author couplet
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java b/couplet-common/couplet-common-datascope/src/main/java/com/couplet/common/datascope/aspect/DataScopeAspect.java
similarity index 90%
rename from muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java
rename to couplet-common/couplet-common-datascope/src/main/java/com/couplet/common/datascope/aspect/DataScopeAspect.java
index 3d66b0d..7bf51d0 100644
--- a/muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java
+++ b/couplet-common/couplet-common-datascope/src/main/java/com/couplet/common/datascope/aspect/DataScopeAspect.java
@@ -1,14 +1,14 @@
-package com.muyu.common.datascope.aspect;
+package com.couplet.common.datascope.aspect;
-import com.muyu.common.core.context.SecurityContextHolder;
-import com.muyu.common.core.text.Convert;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.web.domain.BaseEntity;
-import com.muyu.common.datascope.annotation.DataScope;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.SysRole;
-import com.muyu.common.system.domain.SysUser;
-import com.muyu.common.system.domain.LoginUser;
+import com.couplet.common.core.context.SecurityContextHolder;
+import com.couplet.common.core.text.Convert;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.web.domain.BaseEntity;
+import com.couplet.common.datascope.annotation.DataScope;
+import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.common.system.domain.SysRole;
+import com.couplet.common.system.domain.SysUser;
+import com.couplet.common.system.domain.LoginUser;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@@ -20,7 +20,7 @@ import java.util.List;
/**
* 数据过滤处理
*
- * @author muyu
+ * @author couplet
*/
@Aspect
@Component
diff --git a/couplet-common/couplet-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..6fca4ee
--- /dev/null
+++ b/couplet-common/couplet-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.couplet.common.datascope.aspect.DataScopeAspect
diff --git a/muyu-common/muyu-common-datasource/pom.xml b/couplet-common/couplet-common-datasource/pom.xml
similarity index 83%
rename from muyu-common/muyu-common-datasource/pom.xml
rename to couplet-common/couplet-common-datasource/pom.xml
index 994cf84..0c76a6c 100644
--- a/muyu-common/muyu-common-datasource/pom.xml
+++ b/couplet-common/couplet-common-datasource/pom.xml
@@ -3,16 +3,16 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.muyu
- muyu-common
+ com.couplet
+ couplet-common
3.6.3
4.0.0
- muyu-common-datasource
+ couplet-common-datasource
- muyu-common-datasource多数据源
+ couplet-common-datasource多数据源
diff --git a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Master.java b/couplet-common/couplet-common-datasource/src/main/java/com/couplet/common/datasource/annotation/Master.java
similarity index 78%
rename from muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Master.java
rename to couplet-common/couplet-common-datasource/src/main/java/com/couplet/common/datasource/annotation/Master.java
index d9aae00..c99681d 100644
--- a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Master.java
+++ b/couplet-common/couplet-common-datasource/src/main/java/com/couplet/common/datasource/annotation/Master.java
@@ -1,4 +1,4 @@
-package com.muyu.common.datasource.annotation;
+package com.couplet.common.datasource.annotation;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -7,7 +7,7 @@ import java.lang.annotation.*;
/**
* 主库数据源
*
- * @author muyu
+ * @author couplet
*/
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java b/couplet-common/couplet-common-datasource/src/main/java/com/couplet/common/datasource/annotation/Slave.java
similarity index 78%
rename from muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java
rename to couplet-common/couplet-common-datasource/src/main/java/com/couplet/common/datasource/annotation/Slave.java
index 9663cd4..475f104 100644
--- a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java
+++ b/couplet-common/couplet-common-datasource/src/main/java/com/couplet/common/datasource/annotation/Slave.java
@@ -1,4 +1,4 @@
-package com.muyu.common.datasource.annotation;
+package com.couplet.common.datasource.annotation;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -7,7 +7,7 @@ import java.lang.annotation.*;
/**
* 从库数据源
*
- * @author muyu
+ * @author couplet
*/
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/muyu-common/muyu-common-datascope/pom.xml b/couplet-common/couplet-common-log/pom.xml
similarity index 65%
rename from muyu-common/muyu-common-datascope/pom.xml
rename to couplet-common/couplet-common-log/pom.xml
index 079f752..ac08578 100644
--- a/muyu-common/muyu-common-datascope/pom.xml
+++ b/couplet-common/couplet-common-log/pom.xml
@@ -3,24 +3,24 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.muyu
- muyu-common
+ com.couplet
+ couplet-common
3.6.3
4.0.0
- muyu-common-datascope
+ couplet-common-log
- muyu-common-datascope权限范围
+ couplet-common-log日志记录
- com.muyu
- muyu-common-security
+ com.couplet
+ couplet-common-security
diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/annotation/Log.java b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/annotation/Log.java
similarity index 83%
rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/annotation/Log.java
rename to couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/annotation/Log.java
index ac6394e..8088006 100644
--- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/annotation/Log.java
+++ b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/annotation/Log.java
@@ -1,14 +1,14 @@
-package com.muyu.common.log.annotation;
+package com.couplet.common.log.annotation;
-import com.muyu.common.log.enums.BusinessType;
-import com.muyu.common.log.enums.OperatorType;
+import com.couplet.common.log.enums.BusinessType;
+import com.couplet.common.log.enums.OperatorType;
import java.lang.annotation.*;
/**
* 自定义操作日志记录注解
*
- * @author muyu
+ * @author couplet
*/
@Target({ElementType.PARAMETER, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/aspect/LogAspect.java
similarity index 93%
rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java
rename to couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/aspect/LogAspect.java
index 4ecefc5..d104e00 100644
--- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java
+++ b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/aspect/LogAspect.java
@@ -1,15 +1,15 @@
-package com.muyu.common.log.aspect;
+package com.couplet.common.log.aspect;
import com.alibaba.fastjson2.JSON;
-import com.muyu.common.core.utils.ServletUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.ip.IpUtils;
-import com.muyu.common.log.annotation.Log;
-import com.muyu.common.log.enums.BusinessStatus;
-import com.muyu.common.log.filter.PropertyPreExcludeFilter;
-import com.muyu.common.log.service.AsyncLogService;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.SysOperLog;
+import com.couplet.common.core.utils.ServletUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.ip.IpUtils;
+import com.couplet.common.log.annotation.Log;
+import com.couplet.common.log.enums.BusinessStatus;
+import com.couplet.common.log.filter.PropertyPreExcludeFilter;
+import com.couplet.common.log.service.AsyncLogService;
+import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.common.system.domain.SysOperLog;
import org.apache.commons.lang3.ArrayUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
@@ -33,7 +33,7 @@ import java.util.Map;
/**
* 操作日志记录处理
*
- * @author muyu
+ * @author couplet
*/
@Aspect
@Component
diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessStatus.java b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/BusinessStatus.java
similarity index 71%
rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessStatus.java
rename to couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/BusinessStatus.java
index 45e9713..55e1707 100644
--- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessStatus.java
+++ b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/BusinessStatus.java
@@ -1,9 +1,9 @@
-package com.muyu.common.log.enums;
+package com.couplet.common.log.enums;
/**
* 操作状态
*
- * @author muyu
+ * @author couplet
*/
public enum BusinessStatus {
/**
diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/BusinessType.java
similarity index 89%
rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java
rename to couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/BusinessType.java
index 2e928c7..90836ee 100644
--- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java
+++ b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/BusinessType.java
@@ -1,9 +1,9 @@
-package com.muyu.common.log.enums;
+package com.couplet.common.log.enums;
/**
* 业务操作类型
*
- * @author muyu
+ * @author couplet
*/
public enum BusinessType {
/**
diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/OperatorType.java b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/OperatorType.java
similarity index 77%
rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/OperatorType.java
rename to couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/OperatorType.java
index 645777f..7e16101 100644
--- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/OperatorType.java
+++ b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/OperatorType.java
@@ -1,9 +1,9 @@
-package com.muyu.common.log.enums;
+package com.couplet.common.log.enums;
/**
* 操作人类别
*
- * @author muyu
+ * @author couplet
*/
public enum OperatorType {
/**
diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/filter/PropertyPreExcludeFilter.java b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/filter/PropertyPreExcludeFilter.java
similarity index 88%
rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/filter/PropertyPreExcludeFilter.java
rename to couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/filter/PropertyPreExcludeFilter.java
index 2245256..87fd62d 100644
--- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/filter/PropertyPreExcludeFilter.java
+++ b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/filter/PropertyPreExcludeFilter.java
@@ -1,11 +1,11 @@
-package com.muyu.common.log.filter;
+package com.couplet.common.log.filter;
import com.alibaba.fastjson2.filter.SimplePropertyPreFilter;
/**
* 排除JSON敏感属性
*
- * @author muyu
+ * @author couplet
*/
public class PropertyPreExcludeFilter extends SimplePropertyPreFilter {
public PropertyPreExcludeFilter () {
diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/service/AsyncLogService.java
similarity index 69%
rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java
rename to couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/service/AsyncLogService.java
index 46e1cdf..eacdbee 100644
--- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java
+++ b/couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/service/AsyncLogService.java
@@ -1,8 +1,8 @@
-package com.muyu.common.log.service;
+package com.couplet.common.log.service;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.system.remote.RemoteLogService;
-import com.muyu.common.system.domain.SysOperLog;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.system.remote.RemoteLogService;
+import com.couplet.common.system.domain.SysOperLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
/**
* 异步调用日志服务
*
- * @author muyu
+ * @author couplet
*/
@Service
public class AsyncLogService {
diff --git a/couplet-common/couplet-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..4900e6f
--- /dev/null
+++ b/couplet-common/couplet-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.couplet.common.log.service.AsyncLogService
+com.couplet.common.log.aspect.LogAspect
diff --git a/muyu-common/muyu-common-redis/pom.xml b/couplet-common/couplet-common-redis/pom.xml
similarity index 72%
rename from muyu-common/muyu-common-redis/pom.xml
rename to couplet-common/couplet-common-redis/pom.xml
index 912bc01..1994df3 100644
--- a/muyu-common/muyu-common-redis/pom.xml
+++ b/couplet-common/couplet-common-redis/pom.xml
@@ -3,16 +3,16 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.muyu
- muyu-common
+ com.couplet
+ couplet-common
3.6.3
4.0.0
- muyu-common-redis
+ couplet-common-redis
- muyu-common-redis缓存服务
+ couplet-common-redis缓存服务
@@ -25,8 +25,8 @@
- com.muyu
- muyu-common-core
+ com.couplet
+ couplet-common-core
diff --git a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/FastJson2JsonRedisSerializer.java b/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/configure/FastJson2JsonRedisSerializer.java
similarity index 92%
rename from muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/FastJson2JsonRedisSerializer.java
rename to couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/configure/FastJson2JsonRedisSerializer.java
index 5959aad..2407dd5 100644
--- a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/FastJson2JsonRedisSerializer.java
+++ b/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/configure/FastJson2JsonRedisSerializer.java
@@ -1,10 +1,10 @@
-package com.muyu.common.redis.configure;
+package com.couplet.common.redis.configure;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONReader;
import com.alibaba.fastjson2.JSONWriter;
import com.alibaba.fastjson2.filter.Filter;
-import com.muyu.common.core.constant.Constants;
+import com.couplet.common.core.constant.Constants;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.SerializationException;
@@ -13,7 +13,7 @@ import java.nio.charset.Charset;
/**
* Redis使用FastJson序列化
*
- * @author muyu
+ * @author couplet
*/
public class FastJson2JsonRedisSerializer implements RedisSerializer {
public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
diff --git a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/RedisConfig.java b/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/configure/RedisConfig.java
similarity index 96%
rename from muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/RedisConfig.java
rename to couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/configure/RedisConfig.java
index ba8760e..aa33fb3 100644
--- a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/RedisConfig.java
+++ b/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/configure/RedisConfig.java
@@ -1,4 +1,4 @@
-package com.muyu.common.redis.configure;
+package com.couplet.common.redis.configure;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
@@ -13,7 +13,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
/**
* redis配置
*
- * @author muyu
+ * @author couplet
*/
@Configuration
@EnableCaching
diff --git a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java b/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java
similarity index 99%
rename from muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java
rename to couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java
index db90c1e..d8fcb84 100644
--- a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java
+++ b/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java
@@ -1,4 +1,4 @@
-package com.muyu.common.redis.service;
+package com.couplet.common.redis.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.BoundSetOperations;
@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
/**
* spring redis 工具类
*
- * @author muyu
+ * @author couplet
**/
@SuppressWarnings(value = {"unchecked", "rawtypes"})
@Component
diff --git a/couplet-common/couplet-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..ddce7e4
--- /dev/null
+++ b/couplet-common/couplet-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.couplet.common.redis.configure.RedisConfig
+com.couplet.common.redis.service.RedisService
diff --git a/muyu-common/muyu-common-seata/pom.xml b/couplet-common/couplet-common-seata/pom.xml
similarity index 78%
rename from muyu-common/muyu-common-seata/pom.xml
rename to couplet-common/couplet-common-seata/pom.xml
index a8cab12..1b198ac 100644
--- a/muyu-common/muyu-common-seata/pom.xml
+++ b/couplet-common/couplet-common-seata/pom.xml
@@ -3,16 +3,16 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.muyu
- muyu-common
+ com.couplet
+ couplet-common
3.6.3
4.0.0
- muyu-common-seata
+ couplet-common-seata
- muyu-common-seata分布式事务
+ couplet-common-seata分布式事务
diff --git a/muyu-common/muyu-common-security/pom.xml b/couplet-common/couplet-common-security/pom.xml
similarity index 66%
rename from muyu-common/muyu-common-security/pom.xml
rename to couplet-common/couplet-common-security/pom.xml
index 6bb80d3..dcc996a 100644
--- a/muyu-common/muyu-common-security/pom.xml
+++ b/couplet-common/couplet-common-security/pom.xml
@@ -2,16 +2,16 @@
- com.muyu
- muyu-common
+ com.couplet
+ couplet-common
3.6.3
4.0.0
- muyu-common-security
+ couplet-common-security
- muyu-common-security安全模块
+ couplet-common-security安全模块
@@ -24,14 +24,14 @@
- com.muyu
- muyu-common-redis
+ com.couplet
+ couplet-common-redis
- com.muyu
- muyu-common-system
+ com.couplet
+ couplet-common-system
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableCustomConfig.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/EnableCustomConfig.java
similarity index 76%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableCustomConfig.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/EnableCustomConfig.java
index ca7a07a..16617b7 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableCustomConfig.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/EnableCustomConfig.java
@@ -1,7 +1,7 @@
-package com.muyu.common.security.annotation;
+package com.couplet.common.security.annotation;
-import com.muyu.common.security.config.ApplicationConfig;
-import com.muyu.common.security.feign.FeignAutoConfiguration;
+import com.couplet.common.security.config.ApplicationConfig;
+import com.couplet.common.security.feign.FeignAutoConfiguration;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.context.annotation.Import;
@@ -16,7 +16,7 @@ import java.lang.annotation.*;
// 表示通过aop框架暴露该代理对象,AopContext能够访问
@EnableAspectJAutoProxy(exposeProxy = true)
// 指定要扫描的Mapper类的包的路径
-@MapperScan("com.muyu.**.mapper")
+@MapperScan("com.couplet.**.mapper")
// 开启线程异步执行
@EnableAsync
// 自动加载类
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableMyFeignClients.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/EnableMyFeignClients.java
similarity index 79%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableMyFeignClients.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/EnableMyFeignClients.java
index 7a59fa4..a03ed89 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableMyFeignClients.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/EnableMyFeignClients.java
@@ -1,4 +1,4 @@
-package com.muyu.common.security.annotation;
+package com.couplet.common.security.annotation;
import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -8,7 +8,7 @@ import java.lang.annotation.*;
* 自定义feign注解
* 添加basePackages路径
*
- * @author muyu
+ * @author couplet
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@@ -17,7 +17,7 @@ import java.lang.annotation.*;
public @interface EnableMyFeignClients {
String[] value () default {};
- String[] basePackages () default {"com.muyu"};
+ String[] basePackages () default {"com.couplet"};
Class[] basePackageClasses () default {};
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/InnerAuth.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/InnerAuth.java
similarity index 79%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/InnerAuth.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/InnerAuth.java
index 092a573..1c6909a 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/InnerAuth.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/InnerAuth.java
@@ -1,11 +1,11 @@
-package com.muyu.common.security.annotation;
+package com.couplet.common.security.annotation;
import java.lang.annotation.*;
/**
* 内部认证注解
*
- * @author muyu
+ * @author couplet
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/Logical.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/Logical.java
similarity index 73%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/Logical.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/Logical.java
index 0be306a..05939cd 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/Logical.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/Logical.java
@@ -1,9 +1,9 @@
-package com.muyu.common.security.annotation;
+package com.couplet.common.security.annotation;
/**
* 权限注解的验证模式
*
- * @author muyu
+ * @author couplet
*/
public enum Logical {
/**
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresLogin.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresLogin.java
similarity index 84%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresLogin.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresLogin.java
index 4eff911..0bc0fba 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresLogin.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresLogin.java
@@ -1,4 +1,4 @@
-package com.muyu.common.security.annotation;
+package com.couplet.common.security.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/**
* 登录认证：只有登录之后才能进入该方法
*
- * @author muyu
+ * @author couplet
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresPermissions.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresPermissions.java
similarity index 89%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresPermissions.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresPermissions.java
index 8d95bb4..f4f6b0c 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresPermissions.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresPermissions.java
@@ -1,4 +1,4 @@
-package com.muyu.common.security.annotation;
+package com.couplet.common.security.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/**
* 权限认证：必须具有指定权限才能进入该方法
*
- * @author muyu
+ * @author couplet
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresRoles.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresRoles.java
similarity index 89%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresRoles.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresRoles.java
index 78911cc..b8d35d4 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresRoles.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/annotation/RequiresRoles.java
@@ -1,4 +1,4 @@
-package com.muyu.common.security.annotation;
+package com.couplet.common.security.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/**
* 角色认证：必须具有指定角色标识才能进入该方法
*
- * @author muyu
+ * @author couplet
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/InnerAuthAspect.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/aspect/InnerAuthAspect.java
similarity index 80%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/InnerAuthAspect.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/aspect/InnerAuthAspect.java
index 1707742..f1671b7 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/InnerAuthAspect.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/aspect/InnerAuthAspect.java
@@ -1,10 +1,10 @@
-package com.muyu.common.security.aspect;
+package com.couplet.common.security.aspect;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.exception.InnerAuthException;
-import com.muyu.common.core.utils.ServletUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.security.annotation.InnerAuth;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.core.exception.InnerAuthException;
+import com.couplet.common.core.utils.ServletUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.security.annotation.InnerAuth;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
/**
* 内部服务调用验证处理
*
- * @author muyu
+ * @author couplet
*/
@Aspect
@Component
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/PreAuthorizeAspect.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/aspect/PreAuthorizeAspect.java
similarity index 81%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/PreAuthorizeAspect.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/aspect/PreAuthorizeAspect.java
index 4cdd933..6f306c9 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/PreAuthorizeAspect.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/aspect/PreAuthorizeAspect.java
@@ -1,9 +1,9 @@
-package com.muyu.common.security.aspect;
+package com.couplet.common.security.aspect;
-import com.muyu.common.security.annotation.RequiresLogin;
-import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.common.security.annotation.RequiresRoles;
-import com.muyu.common.security.auth.AuthUtil;
+import com.couplet.common.security.annotation.RequiresLogin;
+import com.couplet.common.security.annotation.RequiresPermissions;
+import com.couplet.common.security.annotation.RequiresRoles;
+import com.couplet.common.security.auth.AuthUtil;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -24,9 +24,9 @@ public class PreAuthorizeAspect {
/**
* 定义AOP签名 (切入所有使用鉴权注解的方法)
*/
- public static final String POINTCUT_SIGN = " @annotation(com.muyu.common.security.annotation.RequiresLogin) || "
- + "@annotation(com.muyu.common.security.annotation.RequiresPermissions) || "
- + "@annotation(com.muyu.common.security.annotation.RequiresRoles)";
+ public static final String POINTCUT_SIGN = " @annotation(com.couplet.common.security.annotation.RequiresLogin) || "
+ + "@annotation(com.couplet.common.security.annotation.RequiresPermissions) || "
+ + "@annotation(com.couplet.common.security.annotation.RequiresRoles)";
/**
* 构建
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/auth/AuthLogic.java
similarity index 90%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/auth/AuthLogic.java
index beb3426..4d7fc72 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/auth/AuthLogic.java
@@ -1,18 +1,18 @@
-package com.muyu.common.security.auth;
+package com.couplet.common.security.auth;
-import com.muyu.common.core.context.SecurityContextHolder;
-import com.muyu.common.core.exception.auth.NotLoginException;
-import com.muyu.common.core.exception.auth.NotPermissionException;
-import com.muyu.common.core.exception.auth.NotRoleException;
-import com.muyu.common.core.utils.SpringUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.security.annotation.Logical;
-import com.muyu.common.security.annotation.RequiresLogin;
-import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.common.security.annotation.RequiresRoles;
-import com.muyu.common.security.service.TokenService;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.LoginUser;
+import com.couplet.common.core.context.SecurityContextHolder;
+import com.couplet.common.core.exception.auth.NotLoginException;
+import com.couplet.common.core.exception.auth.NotPermissionException;
+import com.couplet.common.core.exception.auth.NotRoleException;
+import com.couplet.common.core.utils.SpringUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.security.annotation.Logical;
+import com.couplet.common.security.annotation.RequiresLogin;
+import com.couplet.common.security.annotation.RequiresPermissions;
+import com.couplet.common.security.annotation.RequiresRoles;
+import com.couplet.common.security.service.TokenService;
+import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.common.system.domain.LoginUser;
import org.springframework.util.PatternMatchUtils;
import java.util.Collection;
@@ -22,7 +22,7 @@ import java.util.Set;
/**
* Token 权限验证，逻辑实现类
*
- * @author muyu
+ * @author couplet
*/
public class AuthLogic {
/**
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthUtil.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/auth/AuthUtil.java
similarity index 94%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthUtil.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/auth/AuthUtil.java
index 131d150..11544cb 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthUtil.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/auth/AuthUtil.java
@@ -1,13 +1,13 @@
-package com.muyu.common.security.auth;
+package com.couplet.common.security.auth;
-import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.common.security.annotation.RequiresRoles;
-import com.muyu.common.system.domain.LoginUser;
+import com.couplet.common.security.annotation.RequiresPermissions;
+import com.couplet.common.security.annotation.RequiresRoles;
+import com.couplet.common.system.domain.LoginUser;
/**
* Token 权限验证工具类
*
- * @author muyu
+ * @author couplet
*/
public class AuthUtil {
/**
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/ApplicationConfig.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/config/ApplicationConfig.java
similarity index 88%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/ApplicationConfig.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/config/ApplicationConfig.java
index b78abbf..ac01d6b 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/ApplicationConfig.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/config/ApplicationConfig.java
@@ -1,4 +1,4 @@
-package com.muyu.common.security.config;
+package com.couplet.common.security.config;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.context.annotation.Bean;
@@ -8,7 +8,7 @@ import java.util.TimeZone;
/**
* 系统配置
*
- * @author muyu
+ * @author couplet
*/
public class ApplicationConfig {
/**
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/WebMvcConfig.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/config/WebMvcConfig.java
similarity index 85%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/WebMvcConfig.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/config/WebMvcConfig.java
index 8acde35..cc9e302 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/WebMvcConfig.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/config/WebMvcConfig.java
@@ -1,13 +1,13 @@
-package com.muyu.common.security.config;
+package com.couplet.common.security.config;
-import com.muyu.common.security.interceptor.HeaderInterceptor;
+import com.couplet.common.security.interceptor.HeaderInterceptor;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* 拦截器配置
*
- * @author muyu
+ * @author couplet
*/
public class WebMvcConfig implements WebMvcConfigurer {
/**
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignAutoConfiguration.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/feign/FeignAutoConfiguration.java
similarity index 85%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignAutoConfiguration.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/feign/FeignAutoConfiguration.java
index 4bfda6d..deda57f 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignAutoConfiguration.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/feign/FeignAutoConfiguration.java
@@ -1,4 +1,4 @@
-package com.muyu.common.security.feign;
+package com.couplet.common.security.feign;
import feign.RequestInterceptor;
import org.springframework.context.annotation.Bean;
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
/**
* Feign 配置注册
*
- * @author muyu
+ * @author couplet
**/
@Configuration
public class FeignAutoConfiguration {
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/feign/FeignRequestInterceptor.java
similarity index 86%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/feign/FeignRequestInterceptor.java
index 196765f..78b1dc4 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/feign/FeignRequestInterceptor.java
@@ -1,9 +1,9 @@
-package com.muyu.common.security.feign;
+package com.couplet.common.security.feign;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.utils.ServletUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.ip.IpUtils;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.core.utils.ServletUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.ip.IpUtils;
import feign.RequestInterceptor;
import feign.RequestTemplate;
import org.springframework.stereotype.Component;
@@ -14,7 +14,7 @@ import java.util.Map;
/**
* feign 请求拦截器
*
- * @author muyu
+ * @author couplet
*/
@Component
public class FeignRequestInterceptor implements RequestInterceptor {
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/handler/GlobalExceptionHandler.java
similarity index 91%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/handler/GlobalExceptionHandler.java
index 52b43af..9ccc2aa 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/handler/GlobalExceptionHandler.java
@@ -1,13 +1,13 @@
-package com.muyu.common.security.handler;
+package com.couplet.common.security.handler;
-import com.muyu.common.core.constant.HttpStatus;
-import com.muyu.common.core.exception.DemoModeException;
-import com.muyu.common.core.exception.InnerAuthException;
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.common.core.exception.auth.NotPermissionException;
-import com.muyu.common.core.exception.auth.NotRoleException;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.domain.Result;
+import com.couplet.common.core.constant.HttpStatus;
+import com.couplet.common.core.exception.DemoModeException;
+import com.couplet.common.core.exception.InnerAuthException;
+import com.couplet.common.core.exception.ServiceException;
+import com.couplet.common.core.exception.auth.NotPermissionException;
+import com.couplet.common.core.exception.auth.NotRoleException;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.domain.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.validation.BindException;
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* 全局异常处理器
*
- * @author muyu
+ * @author couplet
*/
@RestControllerAdvice
public class GlobalExceptionHandler {
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/interceptor/HeaderInterceptor.java
similarity index 78%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/interceptor/HeaderInterceptor.java
index fe1774c..6c64927 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/interceptor/HeaderInterceptor.java
@@ -1,12 +1,12 @@
-package com.muyu.common.security.interceptor;
+package com.couplet.common.security.interceptor;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.context.SecurityContextHolder;
-import com.muyu.common.core.utils.ServletUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.security.auth.AuthUtil;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.LoginUser;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.core.context.SecurityContextHolder;
+import com.couplet.common.core.utils.ServletUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.security.auth.AuthUtil;
+import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.common.system.domain.LoginUser;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.AsyncHandlerInterceptor;
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletResponse;
* 自定义请求头拦截器，将Header数据封装到线程变量中方便获取
* 注意：此拦截器会同时验证当前用户有效期自动刷新有效期
*
- * @author muyu
+ * @author couplet
*/
public class HeaderInterceptor implements AsyncHandlerInterceptor {
@Override
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/service/TokenService.java
similarity index 88%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/service/TokenService.java
index b19697e..54e4406 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/service/TokenService.java
@@ -1,15 +1,15 @@
-package com.muyu.common.security.service;
+package com.couplet.common.security.service;
-import com.muyu.common.core.constant.CacheConstants;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.utils.JwtUtils;
-import com.muyu.common.core.utils.ServletUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.ip.IpUtils;
-import com.muyu.common.core.utils.uuid.IdUtils;
-import com.muyu.common.redis.service.RedisService;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.LoginUser;
+import com.couplet.common.core.constant.CacheConstants;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.core.utils.JwtUtils;
+import com.couplet.common.core.utils.ServletUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.ip.IpUtils;
+import com.couplet.common.core.utils.uuid.IdUtils;
+import com.couplet.common.redis.service.RedisService;
+import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.common.system.domain.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
/**
* token验证处理
*
- * @author muyu
+ * @author couplet
*/
@Component
public class TokenService {
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/DictUtils.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/DictUtils.java
similarity index 83%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/DictUtils.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/DictUtils.java
index 04ee068..bc2e404 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/DictUtils.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/DictUtils.java
@@ -1,11 +1,11 @@
-package com.muyu.common.security.utils;
+package com.couplet.common.security.utils;
import com.alibaba.fastjson2.JSONArray;
-import com.muyu.common.core.constant.CacheConstants;
-import com.muyu.common.core.utils.SpringUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.redis.service.RedisService;
-import com.muyu.common.system.domain.SysDictData;
+import com.couplet.common.core.constant.CacheConstants;
+import com.couplet.common.core.utils.SpringUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.redis.service.RedisService;
+import com.couplet.common.system.domain.SysDictData;
import java.util.Collection;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
/**
* 字典工具类
*
- * @author muyu
+ * @author couplet
*/
public class DictUtils {
/**
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java
similarity index 86%
rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java
rename to couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java
index e7f2a2c..4daf3da 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java
+++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java
@@ -1,11 +1,11 @@
-package com.muyu.common.security.utils;
+package com.couplet.common.security.utils;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.constant.TokenConstants;
-import com.muyu.common.core.context.SecurityContextHolder;
-import com.muyu.common.core.utils.ServletUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.system.domain.LoginUser;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.core.constant.TokenConstants;
+import com.couplet.common.core.context.SecurityContextHolder;
+import com.couplet.common.core.utils.ServletUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.system.domain.LoginUser;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import javax.servlet.http.HttpServletRequest;
@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* 权限获取工具类
*
- * @author muyu
+ * @author couplet
*/
public class SecurityUtils {
/**
diff --git a/couplet-common/couplet-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..8731e30
--- /dev/null
+++ b/couplet-common/couplet-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,5 @@
+com.couplet.common.security.config.WebMvcConfig
+com.couplet.common.security.service.TokenService
+com.couplet.common.security.aspect.PreAuthorizeAspect
+com.couplet.common.security.aspect.InnerAuthAspect
+com.couplet.common.security.handler.GlobalExceptionHandler
diff --git a/muyu-common/muyu-common-swagger/pom.xml b/couplet-common/couplet-common-swagger/pom.xml
similarity index 82%
rename from muyu-common/muyu-common-swagger/pom.xml
rename to couplet-common/couplet-common-swagger/pom.xml
index 750bd3a..793b3ab 100644
--- a/muyu-common/muyu-common-swagger/pom.xml
+++ b/couplet-common/couplet-common-swagger/pom.xml
@@ -3,16 +3,16 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.muyu
- muyu-common
+ com.couplet
+ couplet-common
3.6.3
4.0.0
- muyu-common-swagger
+ couplet-common-swagger
- muyu-common-swagger系统接口
+ couplet-common-swagger系统接口
diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/annotation/EnableCustomSwagger2.java
similarity index 69%
rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java
rename to couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/annotation/EnableCustomSwagger2.java
index 8b56946..089ebba 100644
--- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java
+++ b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/annotation/EnableCustomSwagger2.java
@@ -1,6 +1,6 @@
-package com.muyu.common.swagger.annotation;
+package com.couplet.common.swagger.annotation;
-import com.muyu.common.swagger.config.SwaggerAutoConfiguration;
+import com.couplet.common.swagger.config.SwaggerAutoConfiguration;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerAutoConfiguration.java
similarity index 99%
rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java
rename to couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerAutoConfiguration.java
index a58a108..ee489bf 100644
--- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java
+++ b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerAutoConfiguration.java
@@ -1,4 +1,4 @@
-package com.muyu.common.swagger.config;
+package com.couplet.common.swagger.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerBeanPostProcessor.java
similarity index 96%
rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java
rename to couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerBeanPostProcessor.java
index 13d252f..50c66e5 100644
--- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java
+++ b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerBeanPostProcessor.java
@@ -1,4 +1,4 @@
-package com.muyu.common.swagger.config;
+package com.couplet.common.swagger.config;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
/**
* swagger 在 springboot 2.6.x 不兼容问题的处理
*
- * @author muyu
+ * @author couplet
*/
public class SwaggerBeanPostProcessor implements BeanPostProcessor {
@Override
diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerProperties.java
similarity index 99%
rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java
rename to couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerProperties.java
index a0dac64..336ce15 100644
--- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java
+++ b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerProperties.java
@@ -1,4 +1,4 @@
-package com.muyu.common.swagger.config;
+package com.couplet.common.swagger.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerWebConfiguration.java
similarity index 89%
rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java
rename to couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerWebConfiguration.java
index 48d66f6..9947aa6 100644
--- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java
+++ b/couplet-common/couplet-common-swagger/src/main/java/com/couplet/common/swagger/config/SwaggerWebConfiguration.java
@@ -1,4 +1,4 @@
-package com.muyu.common.swagger.config;
+package com.couplet.common.swagger.config;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* swagger 资源映射路径
*
- * @author muyu
+ * @author couplet
*/
public class SwaggerWebConfiguration implements WebMvcConfigurer {
@Override
diff --git a/couplet-common/couplet-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..5eb06fe
--- /dev/null
+++ b/couplet-common/couplet-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+# com.couplet.common.swagger.config.SwaggerAutoConfiguration
+# com.couplet.common.swagger.config.SwaggerWebConfiguration
+# com.couplet.common.swagger.config.SwaggerBeanPostProcessor
diff --git a/muyu-common/muyu-common-system/pom.xml b/couplet-common/couplet-common-system/pom.xml
similarity index 75%
rename from muyu-common/muyu-common-system/pom.xml
rename to couplet-common/couplet-common-system/pom.xml
index 62fdc74..506f73d 100644
--- a/muyu-common/muyu-common-system/pom.xml
+++ b/couplet-common/couplet-common-system/pom.xml
@@ -4,12 +4,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.muyu
- muyu-common
+ com.couplet
+ couplet-common
3.6.3
- muyu-common-system
+ couplet-common-system
17
@@ -20,8 +20,8 @@
- com.muyu
- muyu-common-core
+ com.couplet
+ couplet-common-core
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java
similarity index 97%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java
index ce39e96..1edfd94 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java
@@ -1,4 +1,4 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
import java.io.Serializable;
@@ -7,7 +7,7 @@ import java.util.Set;
/**
* 用户信息
*
- * @author muyu
+ * @author couplet
*/
public class LoginUser implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java
similarity index 97%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java
index 9569d64..85f67b2 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java
@@ -1,6 +1,6 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,7 +19,7 @@ import java.util.List;
/**
* 部门表 sys_dept
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDictData.java
similarity index 94%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDictData.java
index 43d28eb..4c24ffe 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDictData.java
@@ -1,9 +1,9 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.annotation.Excel.ColumnType;
-import com.muyu.common.core.constant.UserConstants;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.annotation.Excel;
+import com.couplet.common.core.annotation.Excel.ColumnType;
+import com.couplet.common.core.constant.UserConstants;
+import com.couplet.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,7 +18,7 @@ import javax.validation.constraints.Size;
/**
* 字典数据表 sys_dict_data
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDictType.java
similarity index 92%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDictType.java
index e87832d..6a32a6d 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDictType.java
@@ -1,8 +1,8 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.annotation.Excel.ColumnType;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.annotation.Excel;
+import com.couplet.common.core.annotation.Excel.ColumnType;
+import com.couplet.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,7 +18,7 @@ import javax.validation.constraints.Size;
/**
* 字典类型表 sys_dict_type
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFile.java
similarity index 92%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFile.java
index 38918d7..62289ee 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFile.java
@@ -1,4 +1,4 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 文件信息
*
- * @author muyu
+ * @author couplet
*/
public class SysFile {
/**
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysLogininfor.java
similarity index 90%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysLogininfor.java
index 9ad179f..ad6d095 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysLogininfor.java
@@ -1,9 +1,9 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.annotation.Excel.ColumnType;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.annotation.Excel;
+import com.couplet.common.core.annotation.Excel.ColumnType;
+import com.couplet.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@ import java.util.Date;
/**
* 系统访问记录表 sys_logininfor
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysOperLog.java
similarity index 95%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysOperLog.java
index c82fbb6..5495d2c 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysOperLog.java
@@ -1,9 +1,9 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.annotation.Excel.ColumnType;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.annotation.Excel;
+import com.couplet.common.core.annotation.Excel.ColumnType;
+import com.couplet.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@ import java.util.Date;
/**
* 操作日志记录表 oper_log
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysRole.java
similarity index 96%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysRole.java
index 09fda22..c90d780 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysRole.java
@@ -1,8 +1,8 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.annotation.Excel.ColumnType;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.annotation.Excel;
+import com.couplet.common.core.annotation.Excel.ColumnType;
+import com.couplet.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,7 +19,7 @@ import java.util.Set;
/**
* 角色表 sys_role
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysUser.java
similarity index 95%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysUser.java
index 6be7436..3e5256e 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysUser.java
@@ -1,11 +1,11 @@
-package com.muyu.common.system.domain;
+package com.couplet.common.system.domain;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.annotation.Excel.ColumnType;
-import com.muyu.common.core.annotation.Excel.Type;
-import com.muyu.common.core.annotation.Excels;
-import com.muyu.common.core.web.domain.BaseEntity;
-import com.muyu.common.core.xss.Xss;
+import com.couplet.common.core.annotation.Excel;
+import com.couplet.common.core.annotation.Excel.ColumnType;
+import com.couplet.common.core.annotation.Excel.Type;
+import com.couplet.common.core.annotation.Excels;
+import com.couplet.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.xss.Xss;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -23,7 +23,7 @@ import java.util.List;
/**
* 用户对象 sys_user
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteFileService.java
similarity index 72%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteFileService.java
index 96dd181..5359e31 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteFileService.java
@@ -1,9 +1,9 @@
-package com.muyu.common.system.remote;
+package com.couplet.common.system.remote;
-import com.muyu.common.core.constant.ServiceNameConstants;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.domain.SysFile;
-import com.muyu.common.system.remote.factory.RemoteFileFallbackFactory;
+import com.couplet.common.core.constant.ServiceNameConstants;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.system.domain.SysFile;
+import com.couplet.common.system.remote.factory.RemoteFileFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
@@ -13,7 +13,7 @@ import org.springframework.web.multipart.MultipartFile;
/**
* 文件服务
*
- * @author muyu
+ * @author couplet
*/
@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
public interface RemoteFileService {
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteLogService.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteLogService.java
similarity index 73%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteLogService.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteLogService.java
index 7e767c4..0032346 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteLogService.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteLogService.java
@@ -1,11 +1,11 @@
-package com.muyu.common.system.remote;
+package com.couplet.common.system.remote;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.constant.ServiceNameConstants;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.domain.SysLogininfor;
-import com.muyu.common.system.domain.SysOperLog;
-import com.muyu.common.system.remote.factory.RemoteLogFallbackFactory;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.core.constant.ServiceNameConstants;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.system.domain.SysLogininfor;
+import com.couplet.common.system.domain.SysOperLog;
+import com.couplet.common.system.remote.factory.RemoteLogFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
/**
* 日志服务
*
- * @author muyu
+ * @author couplet
*/
@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
public interface RemoteLogService {
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteUserService.java
similarity index 71%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteUserService.java
index cb968e0..66d5518 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteUserService.java
@@ -1,18 +1,18 @@
-package com.muyu.common.system.remote;
+package com.couplet.common.system.remote;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.constant.ServiceNameConstants;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.domain.SysUser;
-import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
-import com.muyu.common.system.domain.LoginUser;
+import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.common.core.constant.ServiceNameConstants;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.system.domain.SysUser;
+import com.couplet.common.system.remote.factory.RemoteUserFallbackFactory;
+import com.couplet.common.system.domain.LoginUser;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
/**
* 用户服务
*
- * @author muyu
+ * @author couplet
*/
@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
public interface RemoteUserService {
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteFileFallbackFactory.java
similarity index 79%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteFileFallbackFactory.java
index 395f74f..c4f5879 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteFileFallbackFactory.java
@@ -1,8 +1,8 @@
-package com.muyu.common.system.remote.factory;
+package com.couplet.common.system.remote.factory;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.remote.RemoteFileService;
-import com.muyu.common.system.domain.SysFile;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.system.remote.RemoteFileService;
+import com.couplet.common.system.domain.SysFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -12,7 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
/**
* 文件服务降级处理
*
- * @author muyu
+ * @author couplet
*/
@Component
public class RemoteFileFallbackFactory implements FallbackFactory {
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteLogFallbackFactory.java
similarity index 78%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteLogFallbackFactory.java
index 5998c17..1cf0f12 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteLogFallbackFactory.java
@@ -1,9 +1,9 @@
-package com.muyu.common.system.remote.factory;
+package com.couplet.common.system.remote.factory;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.remote.RemoteLogService;
-import com.muyu.common.system.domain.SysLogininfor;
-import com.muyu.common.system.domain.SysOperLog;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.system.remote.RemoteLogService;
+import com.couplet.common.system.domain.SysLogininfor;
+import com.couplet.common.system.domain.SysOperLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
/**
* 日志服务降级处理
*
- * @author muyu
+ * @author couplet
*/
@Component
public class RemoteLogFallbackFactory implements FallbackFactory {
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteUserFallbackFactory.java
similarity index 78%
rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteUserFallbackFactory.java
index b7f4d60..abdade9 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
+++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteUserFallbackFactory.java
@@ -1,9 +1,9 @@
-package com.muyu.common.system.remote.factory;
+package com.couplet.common.system.remote.factory;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.remote.RemoteUserService;
-import com.muyu.common.system.domain.SysUser;
-import com.muyu.common.system.domain.LoginUser;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.system.remote.RemoteUserService;
+import com.couplet.common.system.domain.SysUser;
+import com.couplet.common.system.domain.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
/**
* 用户服务降级处理
*
- * @author muyu
+ * @author couplet
*/
@Component
public class RemoteUserFallbackFactory implements FallbackFactory {
diff --git a/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..fe7c0f3
--- /dev/null
+++ b/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+com.couplet.common.system.remote.factory.RemoteUserFallbackFactory
+com.couplet.common.system.remote.factory.RemoteLogFallbackFactory
+com.couplet.common.system.remote.factory.RemoteFileFallbackFactory
diff --git a/couplet-common/pom.xml b/couplet-common/pom.xml
new file mode 100644
index 0000000..7b3b70f
--- /dev/null
+++ b/couplet-common/pom.xml
@@ -0,0 +1,30 @@
+
+
+
+ com.couplet
+ couplet
+ 3.6.3
+
+ 4.0.0
+
+
+ couplet-common-log
+ couplet-common-core
+ couplet-common-redis
+ couplet-common-seata
+ couplet-common-swagger
+ couplet-common-security
+ couplet-common-datascope
+ couplet-common-datasource
+ couplet-common-system
+
+
+ couplet-common
+ pom
+
+
+ couplet-common通用模块
+
+
+
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/MuYuGatewayApplication.java b/couplet-gateway/src/main/java/com/couplet/gateway/CoupletGatewayApplication.java
similarity index 78%
rename from couplet-gateway/src/main/java/com/muyu/gateway/MuYuGatewayApplication.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/CoupletGatewayApplication.java
index e452497..5aea28d 100644
--- a/couplet-gateway/src/main/java/com/muyu/gateway/MuYuGatewayApplication.java
+++ b/couplet-gateway/src/main/java/com/couplet/gateway/CoupletGatewayApplication.java
@@ -10,8 +10,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @author couplet
*/
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class MuYuGatewayApplication {
+public class CoupletGatewayApplication {
public static void main (String[] args) {
- SpringApplication.run(MuYuGatewayApplication.class, args);
+ SpringApplication.run(CoupletGatewayApplication.class, args);
}
}
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/config/CaptchaConfig.java b/couplet-gateway/src/main/java/com/couplet/gateway/config/CaptchaConfig.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/config/CaptchaConfig.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/config/CaptchaConfig.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/config/GatewayConfig.java b/couplet-gateway/src/main/java/com/couplet/gateway/config/GatewayConfig.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/config/GatewayConfig.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/config/GatewayConfig.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/config/KaptchaTextCreator.java b/couplet-gateway/src/main/java/com/couplet/gateway/config/KaptchaTextCreator.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/config/KaptchaTextCreator.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/config/KaptchaTextCreator.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java b/couplet-gateway/src/main/java/com/couplet/gateway/config/RouterFunctionConfiguration.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/config/RouterFunctionConfiguration.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/config/SwaggerProvider.java b/couplet-gateway/src/main/java/com/couplet/gateway/config/SwaggerProvider.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/config/SwaggerProvider.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/config/SwaggerProvider.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/config/properties/CaptchaProperties.java b/couplet-gateway/src/main/java/com/couplet/gateway/config/properties/CaptchaProperties.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/config/properties/CaptchaProperties.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/config/properties/CaptchaProperties.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/config/properties/IgnoreWhiteProperties.java b/couplet-gateway/src/main/java/com/couplet/gateway/config/properties/IgnoreWhiteProperties.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/config/properties/IgnoreWhiteProperties.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/config/properties/IgnoreWhiteProperties.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/config/properties/XssProperties.java b/couplet-gateway/src/main/java/com/couplet/gateway/config/properties/XssProperties.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/config/properties/XssProperties.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/config/properties/XssProperties.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java b/couplet-gateway/src/main/java/com/couplet/gateway/filter/AuthFilter.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/filter/AuthFilter.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/filter/BlackListUrlFilter.java b/couplet-gateway/src/main/java/com/couplet/gateway/filter/BlackListUrlFilter.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/filter/BlackListUrlFilter.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/filter/BlackListUrlFilter.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/filter/CacheRequestFilter.java b/couplet-gateway/src/main/java/com/couplet/gateway/filter/CacheRequestFilter.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/filter/CacheRequestFilter.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/filter/CacheRequestFilter.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java b/couplet-gateway/src/main/java/com/couplet/gateway/filter/ValidateCodeFilter.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/filter/ValidateCodeFilter.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java b/couplet-gateway/src/main/java/com/couplet/gateway/filter/XssFilter.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/filter/XssFilter.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/handler/GatewayExceptionHandler.java b/couplet-gateway/src/main/java/com/couplet/gateway/handler/GatewayExceptionHandler.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/handler/GatewayExceptionHandler.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/handler/GatewayExceptionHandler.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/handler/SentinelFallbackHandler.java b/couplet-gateway/src/main/java/com/couplet/gateway/handler/SentinelFallbackHandler.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/handler/SentinelFallbackHandler.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/handler/SentinelFallbackHandler.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/handler/SwaggerHandler.java b/couplet-gateway/src/main/java/com/couplet/gateway/handler/SwaggerHandler.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/handler/SwaggerHandler.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/handler/SwaggerHandler.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java b/couplet-gateway/src/main/java/com/couplet/gateway/handler/ValidateCodeHandler.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/handler/ValidateCodeHandler.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java b/couplet-gateway/src/main/java/com/couplet/gateway/model/resp/CaptchaCodeResp.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/model/resp/CaptchaCodeResp.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java b/couplet-gateway/src/main/java/com/couplet/gateway/service/ValidateCodeService.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/service/ValidateCodeService.java
diff --git a/couplet-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java b/couplet-gateway/src/main/java/com/couplet/gateway/service/impl/ValidateCodeServiceImpl.java
similarity index 100%
rename from couplet-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java
rename to couplet-gateway/src/main/java/com/couplet/gateway/service/impl/ValidateCodeServiceImpl.java
diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml
index cfdc0a1..307a581 100644
--- a/couplet-gateway/src/main/resources/bootstrap.yml
+++ b/couplet-gateway/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 121.89.211.230:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 121.89.211.230:8848
# 配置文件格式
file-extension: yml
# 共享配置
@@ -28,12 +28,12 @@ spring:
eager: true
transport:
# 控制台地址
- dashboard: 127.0.0.1:8718
+ dashboard: 121.89.211.230:8718
# nacos配置持久化
datasource:
ds1:
nacos:
- server-addr: 127.0.0.1:8848
+ server-addr: 121.89.211.230:8848
dataId: sentinel-couplet-gateway
groupId: DEFAULT_GROUP
data-type: json
diff --git a/couplet-modules/muyu-file/pom.xml b/couplet-modules/couplet-file/pom.xml
similarity index 87%
rename from couplet-modules/muyu-file/pom.xml
rename to couplet-modules/couplet-file/pom.xml
index e1de9af..cfd5cb7 100644
--- a/couplet-modules/muyu-file/pom.xml
+++ b/couplet-modules/couplet-file/pom.xml
@@ -3,16 +3,16 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.muyu
- muyu-modules
+ com.couplet
+ couplet-modules
3.6.3
4.0.0
- muyu-modules-file
+ couplet-modules-file
- muyu-modules-file文件服务
+ couplet-modules-file文件服务
@@ -57,14 +57,14 @@
- com.muyu
- muyu-common-swagger
+ com.couplet
+ couplet-common-swagger
- com.muyu
- muyu-common-system
+ com.couplet
+ couplet-common-system
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/CoupletFileApplication.java
similarity index 63%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/CoupletFileApplication.java
index b2e172f..a4243a9 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/CoupletFileApplication.java
@@ -1,6 +1,6 @@
-package com.muyu.file;
+package com.couplet.file;
-import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import com.couplet.common.swagger.annotation.EnableCustomSwagger2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -8,12 +8,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/**
* 文件服务
*
- * @author muyu
+ * @author couplet
*/
@EnableCustomSwagger2
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class MuYuFileApplication {
+public class CoupletFileApplication {
public static void main (String[] args) {
- SpringApplication.run(MuYuFileApplication.class, args);
+ SpringApplication.run(CoupletFileApplication.class, args);
}
}
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/config/MinioConfig.java
similarity index 96%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/config/MinioConfig.java
index af8c1bb..f6abf33 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/config/MinioConfig.java
@@ -1,4 +1,4 @@
-package com.muyu.file.config;
+package com.couplet.file.config;
import io.minio.MinioClient;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration;
/**
* Minio 配置信息
*
- * @author muyu
+ * @author couplet
*/
@Configuration
@ConfigurationProperties(prefix = "minio")
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/config/ResourcesConfig.java
similarity index 96%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/config/ResourcesConfig.java
index 78a8be0..b637da9 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/config/ResourcesConfig.java
@@ -1,4 +1,4 @@
-package com.muyu.file.config;
+package com.couplet.file.config;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@@ -11,7 +11,7 @@ import java.io.File;
/**
* 通用映射配置
*
- * @author muyu
+ * @author couplet
*/
@Configuration
public class ResourcesConfig implements WebMvcConfigurer {
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/controller/SysFileController.java
similarity index 81%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/controller/SysFileController.java
index 5f5ce31..c47bc25 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/controller/SysFileController.java
@@ -1,9 +1,9 @@
-package com.muyu.file.controller;
+package com.couplet.file.controller;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.utils.file.FileUtils;
-import com.muyu.file.service.ISysFileService;
-import com.muyu.common.system.domain.SysFile;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.core.utils.file.FileUtils;
+import com.couplet.file.service.ISysFileService;
+import com.couplet.common.system.domain.SysFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,7 @@ import org.springframework.web.multipart.MultipartFile;
/**
* 文件请求处理
*
- * @author muyu
+ * @author couplet
*/
@RestController
public class SysFileController {
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/service/FastDfsSysFileServiceImpl.java
similarity index 91%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/service/FastDfsSysFileServiceImpl.java
index 3cc2ee3..68c6bc4 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/service/FastDfsSysFileServiceImpl.java
@@ -1,9 +1,9 @@
-package com.muyu.file.service;
+package com.couplet.file.service;
import com.alibaba.nacos.common.utils.IoUtils;
import com.github.tobato.fastdfs.domain.fdfs.StorePath;
import com.github.tobato.fastdfs.service.FastFileStorageClient;
-import com.muyu.common.core.utils.file.FileTypeUtils;
+import com.couplet.common.core.utils.file.FileTypeUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -14,7 +14,7 @@ import java.io.InputStream;
/**
* FastDFS 文件存储
*
- * @author muyu
+ * @author couplet
*/
@Service
public class FastDfsSysFileServiceImpl implements ISysFileService {
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/service/ISysFileService.java
similarity index 86%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/service/ISysFileService.java
index 416c26c..3a031ea 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/service/ISysFileService.java
@@ -1,11 +1,11 @@
-package com.muyu.file.service;
+package com.couplet.file.service;
import org.springframework.web.multipart.MultipartFile;
/**
* 文件上传接口
*
- * @author muyu
+ * @author couplet
*/
public interface ISysFileService {
/**
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/service/LocalSysFileServiceImpl.java
similarity index 91%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/service/LocalSysFileServiceImpl.java
index f3ce089..4affdf1 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/service/LocalSysFileServiceImpl.java
@@ -1,6 +1,6 @@
-package com.muyu.file.service;
+package com.couplet.file.service;
-import com.muyu.file.utils.FileUploadUtils;
+import com.couplet.file.utils.FileUploadUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
@@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile;
/**
* 本地文件存储
*
- * @author muyu
+ * @author couplet
*/
@Primary
@Service
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/service/MinioSysFileServiceImpl.java
similarity index 90%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/service/MinioSysFileServiceImpl.java
index 9a50de4..1f3fbbe 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/service/MinioSysFileServiceImpl.java
@@ -1,8 +1,8 @@
-package com.muyu.file.service;
+package com.couplet.file.service;
import com.alibaba.nacos.common.utils.IoUtils;
-import com.muyu.file.config.MinioConfig;
-import com.muyu.file.utils.FileUploadUtils;
+import com.couplet.file.config.MinioConfig;
+import com.couplet.file.utils.FileUploadUtils;
import io.minio.MinioClient;
import io.minio.PutObjectArgs;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,7 @@ import java.io.InputStream;
/**
* Minio 文件存储
*
- * @author muyu
+ * @author couplet
*/
@Service
public class MinioSysFileServiceImpl implements ISysFileService {
diff --git a/couplet-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java b/couplet-modules/couplet-file/src/main/java/com/couplet/file/utils/FileUploadUtils.java
similarity index 90%
rename from couplet-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java
rename to couplet-modules/couplet-file/src/main/java/com/couplet/file/utils/FileUploadUtils.java
index 0a48cbf..98cbe95 100644
--- a/couplet-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java
+++ b/couplet-modules/couplet-file/src/main/java/com/couplet/file/utils/FileUploadUtils.java
@@ -1,14 +1,14 @@
-package com.muyu.file.utils;
+package com.couplet.file.utils;
-import com.muyu.common.core.exception.file.FileException;
-import com.muyu.common.core.exception.file.FileNameLengthLimitExceededException;
-import com.muyu.common.core.exception.file.FileSizeLimitExceededException;
-import com.muyu.common.core.exception.file.InvalidExtensionException;
-import com.muyu.common.core.utils.DateUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.file.FileTypeUtils;
-import com.muyu.common.core.utils.file.MimeTypeUtils;
-import com.muyu.common.core.utils.uuid.Seq;
+import com.couplet.common.core.exception.file.FileException;
+import com.couplet.common.core.exception.file.FileNameLengthLimitExceededException;
+import com.couplet.common.core.exception.file.FileSizeLimitExceededException;
+import com.couplet.common.core.exception.file.InvalidExtensionException;
+import com.couplet.common.core.utils.DateUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.utils.file.FileTypeUtils;
+import com.couplet.common.core.utils.file.MimeTypeUtils;
+import com.couplet.common.core.utils.uuid.Seq;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -20,7 +20,7 @@ import java.util.Objects;
/**
* 文件上传工具类
*
- * @author muyu
+ * @author couplet
*/
public class FileUploadUtils {
/**
diff --git a/couplet-modules/muyu-gen/src/main/resources/banner.txt b/couplet-modules/couplet-file/src/main/resources/banner.txt
similarity index 100%
rename from couplet-modules/muyu-gen/src/main/resources/banner.txt
rename to couplet-modules/couplet-file/src/main/resources/banner.txt
diff --git a/couplet-modules/muyu-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml
similarity index 80%
rename from couplet-modules/muyu-file/src/main/resources/bootstrap.yml
rename to couplet-modules/couplet-file/src/main/resources/bootstrap.yml
index 0cb85bd..fa968e9 100644
--- a/couplet-modules/muyu-file/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
- name: muyu-file
+ name: couplet-file
profiles:
# 环境配置
active: dev
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 121.89.211.230:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 121.89.211.230:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/muyu-auth/src/main/resources/logback.xml b/couplet-modules/couplet-file/src/main/resources/logback.xml
similarity index 96%
rename from muyu-auth/src/main/resources/logback.xml
rename to couplet-modules/couplet-file/src/main/resources/logback.xml
index 328fc49..be77ad1 100644
--- a/muyu-auth/src/main/resources/logback.xml
+++ b/couplet-modules/couplet-file/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
diff --git a/couplet-modules/muyu-gen/pom.xml b/couplet-modules/couplet-gen/pom.xml
similarity index 88%
rename from couplet-modules/muyu-gen/pom.xml
rename to couplet-modules/couplet-gen/pom.xml
index bd2a910..c7047e7 100644
--- a/couplet-modules/muyu-gen/pom.xml
+++ b/couplet-modules/couplet-gen/pom.xml
@@ -3,16 +3,16 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.muyu
- muyu-modules
+ com.couplet
+ couplet-modules
3.6.3
4.0.0
- muyu-modules-gen
+ couplet-modules-gen
- muyu-modules-gen代码生成
+ couplet-modules-gen代码生成
@@ -62,14 +62,14 @@
- com.muyu
- muyu-common-log
+ com.couplet
+ couplet-common-log
- com.muyu
- muyu-common-swagger
+ com.couplet
+ couplet-common-swagger
diff --git a/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/CoupletGenApplication.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/CoupletGenApplication.java
new file mode 100644
index 0000000..37f425b
--- /dev/null
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/CoupletGenApplication.java
@@ -0,0 +1,22 @@
+package com.couplet.gen;
+
+import com.couplet.common.security.annotation.EnableCustomConfig;
+import com.couplet.common.security.annotation.EnableMyFeignClients;
+import com.couplet.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 代码生成
+ *
+ * @author couplet
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication
+public class CoupletGenApplication {
+ public static void main (String[] args) {
+ SpringApplication.run(CoupletGenApplication.class, args);
+ }
+}
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/config/GenConfig.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/config/GenConfig.java
similarity index 96%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/config/GenConfig.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/config/GenConfig.java
index 65d9824..46d5136 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/config/GenConfig.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/config/GenConfig.java
@@ -1,4 +1,4 @@
-package com.muyu.gen.config;
+package com.couplet.gen.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
/**
* 代码生成相关配置
*
- * @author muyu
+ * @author couplet
*/
@Component
@ConfigurationProperties(prefix = "gen")
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/controller/GenController.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/controller/GenController.java
similarity index 90%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/controller/GenController.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/controller/GenController.java
index 7fe822a..792a15a 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/controller/GenController.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/controller/GenController.java
@@ -1,16 +1,16 @@
-package com.muyu.gen.controller;
+package com.couplet.gen.controller;
-import com.muyu.common.core.text.Convert;
-import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.web.page.TableDataInfo;
-import com.muyu.common.log.annotation.Log;
-import com.muyu.common.log.enums.BusinessType;
-import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.gen.domain.GenTable;
-import com.muyu.gen.domain.GenTableColumn;
-import com.muyu.gen.service.IGenTableColumnService;
-import com.muyu.gen.service.IGenTableService;
+import com.couplet.common.core.text.Convert;
+import com.couplet.common.core.web.controller.BaseController;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.core.web.page.TableDataInfo;
+import com.couplet.common.log.annotation.Log;
+import com.couplet.common.log.enums.BusinessType;
+import com.couplet.common.security.annotation.RequiresPermissions;
+import com.couplet.gen.domain.GenTable;
+import com.couplet.gen.domain.GenTableColumn;
+import com.couplet.gen.service.IGenTableColumnService;
+import com.couplet.gen.service.IGenTableService;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -25,7 +25,7 @@ import java.util.Map;
/**
* 代码生成 操作处理
*
- * @author muyu
+ * @author couplet
*/
@RequestMapping("/gen")
@RestController
@@ -185,7 +185,7 @@ public class GenController extends BaseController {
*/
private void genCode (HttpServletResponse response, byte[] data) throws IOException {
response.reset();
- response.setHeader("Content-Disposition", "attachment; filename=\"muyu.zip\"");
+ response.setHeader("Content-Disposition", "attachment; filename=\"couplet.zip\"");
response.addHeader("Content-Length", String.valueOf(data.length));
response.setContentType("application/octet-stream; charset=UTF-8");
IOUtils.write(data, response.getOutputStream());
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/domain/GenTable.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/domain/GenTable.java
similarity index 97%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/domain/GenTable.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/domain/GenTable.java
index 690d8d0..5e447ff 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/domain/GenTable.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/domain/GenTable.java
@@ -1,8 +1,8 @@
-package com.muyu.gen.domain;
+package com.couplet.gen.domain;
-import com.muyu.common.core.constant.GenConstants;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.constant.GenConstants;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,7 +20,7 @@ import java.util.List;
/**
* 业务表 gen_table
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/domain/GenTableColumn.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/domain/GenTableColumn.java
similarity index 98%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/domain/GenTableColumn.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/domain/GenTableColumn.java
index 638b0ab..dc6497c 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/domain/GenTableColumn.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/domain/GenTableColumn.java
@@ -1,7 +1,7 @@
-package com.muyu.gen.domain;
+package com.couplet.gen.domain;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
/**
* 代码生成业务字段表 gen_table_column
*
- * @author muyu
+ * @author couplet
*/
@Data
@SuperBuilder
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/mapper/GenTableColumnMapper.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/mapper/GenTableColumnMapper.java
similarity index 93%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/mapper/GenTableColumnMapper.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/mapper/GenTableColumnMapper.java
index 5825d59..a287872 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/mapper/GenTableColumnMapper.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/mapper/GenTableColumnMapper.java
@@ -1,14 +1,14 @@
-package com.muyu.gen.mapper;
+package com.couplet.gen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.gen.domain.GenTableColumn;
+import com.couplet.gen.domain.GenTableColumn;
import java.util.List;
/**
* 业务字段 数据层
*
- * @author muyu
+ * @author couplet
*/
public interface GenTableColumnMapper extends BaseMapper {
/**
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/mapper/GenTableMapper.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/mapper/GenTableMapper.java
similarity index 94%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/mapper/GenTableMapper.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/mapper/GenTableMapper.java
index 66858cb..84fe5e9 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/mapper/GenTableMapper.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/mapper/GenTableMapper.java
@@ -1,14 +1,14 @@
-package com.muyu.gen.mapper;
+package com.couplet.gen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.gen.domain.GenTable;
+import com.couplet.gen.domain.GenTable;
import java.util.List;
/**
* 业务 数据层
*
- * @author muyu
+ * @author couplet
*/
public interface GenTableMapper extends BaseMapper {
/**
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/GenTableColumnServiceImpl.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/GenTableColumnServiceImpl.java
similarity index 88%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/GenTableColumnServiceImpl.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/GenTableColumnServiceImpl.java
index 895b1ed..0b7a8ce 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/GenTableColumnServiceImpl.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/GenTableColumnServiceImpl.java
@@ -1,8 +1,8 @@
-package com.muyu.gen.service;
+package com.couplet.gen.service;
-import com.muyu.common.core.text.Convert;
-import com.muyu.gen.domain.GenTableColumn;
-import com.muyu.gen.mapper.GenTableColumnMapper;
+import com.couplet.common.core.text.Convert;
+import com.couplet.gen.domain.GenTableColumn;
+import com.couplet.gen.mapper.GenTableColumnMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -11,7 +11,7 @@ import java.util.List;
/**
* 业务字段 服务层实现
*
- * @author muyu
+ * @author couplet
*/
@Service
public class GenTableColumnServiceImpl implements IGenTableColumnService {
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/GenTableServiceImpl.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/GenTableServiceImpl.java
similarity index 95%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/GenTableServiceImpl.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/GenTableServiceImpl.java
index 6273779..0122861 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/GenTableServiceImpl.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/GenTableServiceImpl.java
@@ -1,20 +1,20 @@
-package com.muyu.gen.service;
+package com.couplet.gen.service;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.muyu.common.core.constant.Constants;
-import com.muyu.common.core.constant.GenConstants;
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.common.core.text.CharsetKit;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.gen.domain.GenTable;
-import com.muyu.gen.domain.GenTableColumn;
-import com.muyu.gen.mapper.GenTableColumnMapper;
-import com.muyu.gen.mapper.GenTableMapper;
-import com.muyu.gen.util.GenUtils;
-import com.muyu.gen.util.VelocityInitializer;
-import com.muyu.gen.util.VelocityUtils;
+import com.couplet.common.core.constant.Constants;
+import com.couplet.common.core.constant.GenConstants;
+import com.couplet.common.core.exception.ServiceException;
+import com.couplet.common.core.text.CharsetKit;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.gen.domain.GenTable;
+import com.couplet.gen.domain.GenTableColumn;
+import com.couplet.gen.mapper.GenTableColumnMapper;
+import com.couplet.gen.mapper.GenTableMapper;
+import com.couplet.gen.util.GenUtils;
+import com.couplet.gen.util.VelocityInitializer;
+import com.couplet.gen.util.VelocityUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.velocity.Template;
@@ -41,7 +41,7 @@ import java.util.zip.ZipOutputStream;
/**
* 业务 服务层实现
*
- * @author muyu
+ * @author couplet
*/
@Service
public class GenTableServiceImpl implements IGenTableService {
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/IGenTableColumnService.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/IGenTableColumnService.java
similarity index 89%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/IGenTableColumnService.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/IGenTableColumnService.java
index b60ea57..f1a9669 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/IGenTableColumnService.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/IGenTableColumnService.java
@@ -1,13 +1,13 @@
-package com.muyu.gen.service;
+package com.couplet.gen.service;
-import com.muyu.gen.domain.GenTableColumn;
+import com.couplet.gen.domain.GenTableColumn;
import java.util.List;
/**
* 业务字段 服务层
*
- * @author muyu
+ * @author couplet
*/
public interface IGenTableColumnService {
/**
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/IGenTableService.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/IGenTableService.java
similarity index 96%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/IGenTableService.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/IGenTableService.java
index f34dc37..505d780 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/service/IGenTableService.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/service/IGenTableService.java
@@ -1,6 +1,6 @@
-package com.muyu.gen.service;
+package com.couplet.gen.service;
-import com.muyu.gen.domain.GenTable;
+import com.couplet.gen.domain.GenTable;
import java.util.List;
import java.util.Map;
@@ -8,7 +8,7 @@ import java.util.Map;
/**
* 业务 服务层
*
- * @author muyu
+ * @author couplet
*/
public interface IGenTableService {
/**
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/GenUtils.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/GenUtils.java
similarity index 96%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/GenUtils.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/GenUtils.java
index 5aea1f2..862ce1c 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/GenUtils.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/GenUtils.java
@@ -1,10 +1,10 @@
-package com.muyu.gen.util;
+package com.couplet.gen.util;
-import com.muyu.common.core.constant.GenConstants;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.gen.config.GenConfig;
-import com.muyu.gen.domain.GenTable;
-import com.muyu.gen.domain.GenTableColumn;
+import com.couplet.common.core.constant.GenConstants;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.gen.config.GenConfig;
+import com.couplet.gen.domain.GenTable;
+import com.couplet.gen.domain.GenTableColumn;
import org.apache.commons.lang3.RegExUtils;
import java.util.Arrays;
@@ -12,7 +12,7 @@ import java.util.Arrays;
/**
* 代码生成器 工具类
*
- * @author muyu
+ * @author couplet
*/
public class GenUtils {
/**
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/VelocityInitializer.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/VelocityInitializer.java
similarity index 88%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/VelocityInitializer.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/VelocityInitializer.java
index cc171b4..9f15706 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/VelocityInitializer.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/VelocityInitializer.java
@@ -1,6 +1,6 @@
-package com.muyu.gen.util;
+package com.couplet.gen.util;
-import com.muyu.common.core.constant.Constants;
+import com.couplet.common.core.constant.Constants;
import org.apache.velocity.app.Velocity;
import java.util.Properties;
@@ -8,7 +8,7 @@ import java.util.Properties;
/**
* VelocityEngine工厂
*
- * @author muyu
+ * @author couplet
*/
public class VelocityInitializer {
/**
diff --git a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/VelocityUtils.java b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/VelocityUtils.java
similarity index 97%
rename from couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/VelocityUtils.java
rename to couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/VelocityUtils.java
index 9305ff7..0c8b58f 100644
--- a/couplet-modules/muyu-gen/src/main/java/com/couplet/gen/util/VelocityUtils.java
+++ b/couplet-modules/couplet-gen/src/main/java/com/couplet/gen/util/VelocityUtils.java
@@ -1,12 +1,12 @@
-package com.muyu.gen.util;
+package com.couplet.gen.util;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.muyu.common.core.constant.GenConstants;
-import com.muyu.common.core.utils.DateUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.gen.domain.GenTable;
-import com.muyu.gen.domain.GenTableColumn;
+import com.couplet.common.core.constant.GenConstants;
+import com.couplet.common.core.utils.DateUtils;
+import com.couplet.common.core.utils.StringUtils;
+import com.couplet.gen.domain.GenTable;
+import com.couplet.gen.domain.GenTableColumn;
import org.apache.velocity.VelocityContext;
import java.util.ArrayList;
@@ -17,7 +17,7 @@ import java.util.Set;
/**
* 模板工具类
*
- * @author muyu
+ * @author couplet
*/
public class VelocityUtils {
/**
diff --git a/muyu-auth/src/main/resources/banner.txt b/couplet-modules/couplet-gen/src/main/resources/banner.txt
similarity index 100%
rename from muyu-auth/src/main/resources/banner.txt
rename to couplet-modules/couplet-gen/src/main/resources/banner.txt
diff --git a/couplet-modules/muyu-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
similarity index 80%
rename from couplet-modules/muyu-gen/src/main/resources/bootstrap.yml
rename to couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
index b628931..df7344c 100644
--- a/couplet-modules/muyu-gen/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
- name: muyu-gen
+ name: couplet-gen
profiles:
# 环境配置
active: dev
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 121.89.211.230:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 121.89.211.230:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-modules/muyu-gen/src/main/resources/logback.xml b/couplet-modules/couplet-gen/src/main/resources/logback.xml
similarity index 96%
rename from couplet-modules/muyu-gen/src/main/resources/logback.xml
rename to couplet-modules/couplet-gen/src/main/resources/logback.xml
index 9ce06ea..be41ca7 100644
--- a/couplet-modules/muyu-gen/src/main/resources/logback.xml
+++ b/couplet-modules/couplet-gen/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
diff --git a/couplet-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/couplet-modules/couplet-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
similarity index 94%
rename from couplet-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
rename to couplet-modules/couplet-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index fb9800e..2976f57 100644
--- a/couplet-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/couplet-modules/couplet-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -2,9 +2,9 @@
-
+
-
+
@@ -55,7 +55,7 @@
from gen_table_column
-