diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java index 2ef6494a7..9ed59408a 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.controller; +package com.alibaba.nacos.controller; import javax.servlet.http.HttpServletRequest; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java index afd7c3ac3..00c8b5e0f 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java @@ -14,16 +14,24 @@ * limitations under the License. */ -package com.alibaba.nacos.console.controller; +package com.alibaba.nacos.controller; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.regex.Pattern; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import com.alibaba.nacos.auth.annotation.Secured; import com.alibaba.nacos.auth.common.ActionTypes; import com.alibaba.nacos.common.model.RestResult; import com.alibaba.nacos.config.server.model.TenantInfo; import com.alibaba.nacos.config.server.service.repository.PersistService; -import com.alibaba.nacos.console.model.Namespace; -import com.alibaba.nacos.console.model.NamespaceAllInfo; -import com.alibaba.nacos.console.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.model.Namespace; +import com.alibaba.nacos.model.NamespaceAllInfo; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -34,13 +42,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.regex.Pattern; - /** * namespace service. * diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java index 4704ff3d9..107a83118 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.alibaba.nacos.console.controller; +package com.alibaba.nacos.controller; import com.alibaba.nacos.auth.annotation.Secured; import com.alibaba.nacos.auth.common.ActionTypes; import com.alibaba.nacos.common.model.RestResult; -import com.alibaba.nacos.console.security.nacos.NacosAuthConfig; -import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java index 9854c9ccb..82788da64 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.alibaba.nacos.console.controller; +package com.alibaba.nacos.controller; import com.alibaba.nacos.auth.annotation.Secured; import com.alibaba.nacos.auth.common.ActionTypes; import com.alibaba.nacos.common.model.RestResult; -import com.alibaba.nacos.console.security.nacos.NacosAuthConfig; -import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java index 94e7e73c6..ae185c8c1 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.controller; +package com.alibaba.nacos.controller; import com.alibaba.nacos.common.utils.VersionUtils; import com.alibaba.nacos.sys.env.EnvUtil; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java index d8f10cb9c..3b7009fc8 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java @@ -34,12 +34,12 @@ import com.alibaba.nacos.common.utils.Objects; import com.alibaba.nacos.config.server.auth.RoleInfo; import com.alibaba.nacos.config.server.model.User; import com.alibaba.nacos.config.server.utils.RequestUtil; -import com.alibaba.nacos.console.security.nacos.JwtTokenManager; -import com.alibaba.nacos.console.security.nacos.NacosAuthConfig; -import com.alibaba.nacos.console.security.nacos.NacosAuthManager; -import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl; -import com.alibaba.nacos.console.security.nacos.users.NacosUser; -import com.alibaba.nacos.console.security.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.JwtTokenManager; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.NacosAuthManager; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUser; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import com.alibaba.nacos.utils.PasswordEncoderUtil; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java b/pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java index 0664beb65..092c1c4f0 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.exception; +package com.alibaba.nacos.exception; import com.alibaba.nacos.auth.exception.AccessException; import com.alibaba.nacos.common.utils.ExceptionUtil; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java b/pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java index 57ac3a342..b3e8b74d3 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.alibaba.nacos.console.filter; +package com.alibaba.nacos.filter; import com.alibaba.nacos.api.common.Constants; -import com.alibaba.nacos.console.security.nacos.JwtTokenManager; -import com.alibaba.nacos.console.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.JwtTokenManager; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; import org.apache.commons.lang3.StringUtils; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java b/pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java index b71d0d43d..29df59e22 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.model; +package com.alibaba.nacos.model; /** * Namespace. diff --git a/pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java b/pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java index 1106ee5d5..3ffb5f84f 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.model; +package com.alibaba.nacos.model; /** * all namespace info. diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java index 5e5645e69..e607921e7 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos; +package com.alibaba.nacos.security.nacos; -import com.alibaba.nacos.console.security.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java index ad5ec0683..f340adf7d 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos; +package com.alibaba.nacos.security.nacos; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java index f75b61829..c908b9bfd 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos; +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.auth.common.AuthConfigs; import io.jsonwebtoken.Claims; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java index b26bb6c74..22969c72b 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos; +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.auth.common.AuthConfigs; import com.alibaba.nacos.auth.common.AuthSystemTypes; -import com.alibaba.nacos.console.filter.JwtAuthenticationTokenFilter; -import com.alibaba.nacos.console.security.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.filter.JwtAuthenticationTokenFilter; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java index accba95a6..3dca4a842 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos; +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.api.common.Constants; import com.alibaba.nacos.auth.AuthManager; @@ -23,8 +23,8 @@ import com.alibaba.nacos.auth.model.Permission; import com.alibaba.nacos.auth.model.User; import com.alibaba.nacos.config.server.auth.RoleInfo; import com.alibaba.nacos.config.server.utils.RequestUtil; -import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl; -import com.alibaba.nacos.console.security.nacos.users.NacosUser; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUser; import com.alibaba.nacos.core.utils.Loggers; import io.jsonwebtoken.ExpiredJwtException; import org.apache.commons.lang3.StringUtils; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java index 5772bd2f9..40f323d3e 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos.roles; +package com.alibaba.nacos.security.nacos.roles; import com.alibaba.nacos.auth.common.AuthConfigs; import com.alibaba.nacos.auth.model.Permission; @@ -23,8 +23,8 @@ import com.alibaba.nacos.config.server.auth.PermissionPersistService; import com.alibaba.nacos.config.server.auth.RoleInfo; import com.alibaba.nacos.config.server.auth.RolePersistService; import com.alibaba.nacos.config.server.model.Page; -import com.alibaba.nacos.console.security.nacos.NacosAuthConfig; -import com.alibaba.nacos.console.security.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import com.alibaba.nacos.core.utils.Loggers; import io.jsonwebtoken.lang.Collections; import org.apache.commons.lang3.StringUtils; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java index 0845595b3..2aceeb420 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos.users; +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.auth.model.User; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java index 023d31c5f..cc75e038b 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos.users; +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.config.server.model.User; import org.springframework.security.core.GrantedAuthority; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java index ce2351050..c8c1acb17 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.console.security.nacos.users; +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.auth.common.AuthConfigs; import com.alibaba.nacos.config.server.auth.UserPersistService;