⬆️ Upgrading dependencies. up nacos 1.3.2 https://gitee.com/log4j/pig/issues/I1Q9RG

2020-08-24 22:04:35 +08:00
1 parent 4b27431edb
commit 86b40ec069
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>com.pig4cloud.nacos</groupId>
 			<artifactId>nacos-config</artifactId>
-			<version>1.3.0</version>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
@@ -40,13 +40,13 @@
 		<dependency>
 			<groupId>com.pig4cloud.nacos</groupId>
 			<artifactId>nacos-naming</artifactId>
-			<version>1.3.0</version>
+			<version>1.3.2</version>
 		</dependency>

 		<dependency>
 			<groupId>com.pig4cloud.nacos</groupId>
 			<artifactId>nacos-istio</artifactId>
-			<version>1.3.0</version>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -43,7 +43,7 @@ public class ConsoleConfig {
 	@PostConstruct
 	public void init() {
 		methodsCache.initClassMethod("com.alibaba.nacos.naming.controllers");
-		methodsCache.initClassMethod("com.alibaba.nacos.console.controller");
+		methodsCache.initClassMethod("com.alibaba.nacos.controller");
 		methodsCache.initClassMethod("com.alibaba.nacos.config.server.controller");
 	}

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.controller;

 import com.alibaba.nacos.config.server.service.repository.PersistService;
@@ -28,13 +29,15 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;

 /**
+ * Health Controller.
+ *
 * @author <a href="mailto:huangxiaoyu1018@gmail.com">hxy1991</a>
 */
@RestController("consoleHealth")
@RequestMapping("/v1/console/health")
 public class HealthController {

-	private static final Logger logger = LoggerFactory.getLogger(HealthController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(HealthController.class);

 	private final PersistService persistService;

@@ -48,7 +51,7 @@ public class HealthController {

 	/**
 	 * Whether the Nacos is in broken states or not, and cannot recover except by being
-	 * restarted
+	 * restarted.
 	 * @return HTTP code equal to 200 indicates that Nacos is in right states. HTTP code
 	 * equal to 500 indicates that Nacos is in broken states.
 	 */
@@ -58,7 +61,7 @@ public class HealthController {
 	}

 	/**
-	 * Ready to receive the request or not
+	 * Ready to receive the request or not.
 	 * @return HTTP code equal to 200 indicates that Nacos is ready. HTTP code equal to
 	 * 500 indicates that Nacos is not ready.
 	 */
@@ -89,7 +92,7 @@ public class HealthController {
 			return true;
 		}
 		catch (Exception e) {
-			logger.error("Config health check fail.", e);
+			LOGGER.error("Config health check fail.", e);
 		}
 		return false;
 	}
@@ -100,7 +103,7 @@ public class HealthController {
 			return true;
 		}
 		catch (Exception e) {
-			logger.error("Naming health check fail.", e);
+			LOGGER.error("Naming health check fail.", e);
 		}
 		return false;
 	}
@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.controller;

 import com.alibaba.nacos.common.model.RestResult;
@@ -20,12 +21,18 @@ import com.alibaba.nacos.config.server.model.TenantInfo;
 import com.alibaba.nacos.config.server.service.repository.PersistService;
 import com.alibaba.nacos.model.Namespace;
 import com.alibaba.nacos.model.NamespaceAllInfo;
-import com.alibaba.nacos.nacos.NacosAuthConfig;
+import com.alibaba.nacos.security.nacos.NacosAuthConfig;
 import com.alibaba.nacos.core.auth.ActionTypes;
 import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+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;
@@ -35,7 +42,7 @@ import java.util.UUID;
 import java.util.regex.Pattern;

 /**
- * namespace service
+ * namespace service.
 *
 * @author Nacos
 */
@@ -46,12 +53,12 @@ public class NamespaceController {
 	@Autowired
 	private PersistService persistService;

-	private Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+");
+	private final Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+");

 	private static final int NAMESPACE_ID_MAX_LENGTH = 128;

 	/**
-	 * Get namespace list
+	 * Get namespace list.
 	 * @param request request
 	 * @param response response
 	 * @return namespace list
@@ -76,7 +83,7 @@ public class NamespaceController {
 	}

 	/**
-	 * get namespace all info by namespace id
+	 * get namespace all info by namespace id.
 	 * @param request request
 	 * @param response response
 	 * @param namespaceId namespaceId
@@ -99,7 +106,7 @@ public class NamespaceController {
 	}

 	/**
-	 * create namespace
+	 * create namespace.
 	 * @param request request
 	 * @param response response
 	 * @param namespaceName namespace Name
@@ -133,11 +140,9 @@ public class NamespaceController {
 	}

 	/**
-	 * @author klw(213539@qq.com)
-	 * @Description: check namespaceId exist
-	 * @Date 2019/12/10 21:41
-	 * @param: namespaceId
-	 * @return java.lang.Boolean
+	 * check namespaceId exist.
+	 * @param namespaceId namespace id
+	 * @return true if exist, otherwise false
 	 */
 	@GetMapping(params = "checkNamespaceIdExist=true")
 	public Boolean checkNamespaceIdExist(@RequestParam("customNamespaceId") String namespaceId) {
@@ -148,7 +153,7 @@ public class NamespaceController {
 	}

 	/**
-	 * edit namespace
+	 * edit namespace.
 	 * @param namespace namespace
 	 * @param namespaceShowName namespace ShowName
 	 * @param namespaceDesc namespace Desc
@@ -165,7 +170,7 @@ public class NamespaceController {
 	}

 	/**
-	 * del namespace by id
+	 * del namespace by id.
 	 * @param request request
 	 * @param response response
 	 * @param namespaceId namespace Id
@@ -13,19 +13,25 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.controller;

 import com.alibaba.nacos.common.model.RestResult;
-import com.alibaba.nacos.nacos.NacosAuthConfig;
-import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl;
+import com.alibaba.nacos.security.nacos.NacosAuthConfig;
+import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl;
 import com.alibaba.nacos.core.auth.ActionTypes;
 import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;

 /**
- * Permission operation controller
+ * Permission operation controller.
 *
 * @author nkorange
 * @since 1.2.0
@@ -38,7 +44,7 @@ public class PermissionController {
 	private NacosRoleServiceImpl nacosRoleService;

 	/**
-	 * Query permissions of a role
+	 * Query permissions of a role.
 	 * @param role the role
 	 * @param pageNo page index
 	 * @param pageSize page size
@@ -52,7 +58,7 @@ public class PermissionController {
 	}

 	/**
-	 * Add a permission to a role
+	 * Add a permission to a role.
 	 * @param role the role
 	 * @param resource the related resource
 	 * @param action the related action
@@ -66,7 +72,7 @@ public class PermissionController {
 	}

 	/**
-	 * Delete a permission from a role
+	 * Delete a permission from a role.
 	 * @param role the role
 	 * @param resource the related resource
 	 * @param action the related action
@@ -13,19 +13,25 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.controller;

 import com.alibaba.nacos.common.model.RestResult;
-import com.alibaba.nacos.nacos.NacosAuthConfig;
-import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl;
+import com.alibaba.nacos.security.nacos.NacosAuthConfig;
+import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl;
 import com.alibaba.nacos.core.auth.ActionTypes;
 import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;

 /**
- * Role operation controller
+ * Role operation controller.
 *
 * @author nkorange
 * @since 1.2.0
@@ -38,7 +44,7 @@ public class RoleController {
 	private NacosRoleServiceImpl roleService;

 	/**
-	 * Get roles list
+	 * Get roles list.
 	 * @param pageNo number index of page
 	 * @param pageSize page size
 	 * @param username optional, username of user
@@ -53,12 +59,13 @@ public class RoleController {

 	/**
 	 * Add a role to a user
+	 *
 	 * <p>
 	 * This method is used for 2 functions: 1. create a role and bind it to GLOBAL_ADMIN.
 	 * 2. bind a role to an user.
-	 * @param role
-	 * @param username
-	 * @return
+	 * @param role role name
+	 * @param username username
+	 * @return Code 200 and message 'add role ok!'
 	 */
 	@PostMapping
 	@Secured(resource = NacosAuthConfig.CONSOLE_RESOURCE_NAME_PREFIX + "roles", action = ActionTypes.WRITE)
@@ -68,7 +75,7 @@ public class RoleController {
 	}

 	/**
-	 * Delete a role. If no username is specified, all users under this role are deleted
+	 * Delete a role. If no username is specified, all users under this role are deleted.
 	 * @param role role
 	 * @param username username
 	 * @return ok if succeed
@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.controller;

 import com.alibaba.nacos.common.utils.VersionUtils;
@@ -26,12 +27,18 @@ import java.util.HashMap;
 import java.util.Map;

 /**
+ * Server state controller.
+ *
 * @author xingxuechao on:2019/2/27 11:17 AM
 */
@RestController
@RequestMapping("/v1/console/server")
 public class ServerStateController {

+	/**
+	 * Get server state of current server.
+	 * @return state json.
+	 */
 	@GetMapping("/state")
 	public ResponseEntity serverState() {
 		Map<String, String> serverState = new HashMap<>(3);
@@ -39,7 +46,7 @@ public class ServerStateController {
 				: ApplicationUtils.STANDALONE_MODE_CLUSTER);

 		serverState.put("function_mode", ApplicationUtils.getFunctionMode());
-		serverState.put("version", VersionUtils.VERSION);
+		serverState.put("version", VersionUtils.version);

 		return ResponseEntity.ok().body(serverState);
 	}
@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.controller;

 import com.alibaba.nacos.api.common.Constants;
@@ -20,16 +21,19 @@ import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.utils.JacksonUtils;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
 import com.alibaba.nacos.config.server.model.User;
-import com.alibaba.nacos.nacos.NacosAuthConfig;
-import com.alibaba.nacos.nacos.NacosAuthManager;
-import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl;
-import com.alibaba.nacos.nacos.users.NacosUser;
-import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl;
+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.JwtTokenUtils;
 import com.alibaba.nacos.utils.PasswordEncoderUtil;
-import com.alibaba.nacos.core.auth.*;
+import com.alibaba.nacos.core.auth.AccessException;
+import com.alibaba.nacos.core.auth.ActionTypes;
+import com.alibaba.nacos.core.auth.AuthConfigs;
+import com.alibaba.nacos.core.auth.AuthSystemTypes;
+import com.alibaba.nacos.core.auth.Secured;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -37,14 +41,20 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+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.List;

 /**
- * User related methods entry
+ * User related methods entry.
 *
 * @author wfnuser
 * @author nkorange
@@ -72,7 +82,7 @@ public class UserController {
 	private NacosAuthManager authManager;

 	/**
-	 * Create a new user
+	 * Create a new user.
 	 * @param username username
 	 * @param password password
 	 * @return ok if create succeed
@@ -92,7 +102,7 @@ public class UserController {
 	}

 	/**
-	 * Delete an existed user
+	 * Delete an existed user.
 	 * @param username username of user
 	 * @return ok if deleted succeed, keep silent if user not exist
 	 * @since 1.2.0
@@ -113,7 +123,7 @@ public class UserController {
 	}

 	/**
-	 * Update an user
+	 * Update an user.
 	 * @param username username of user
 	 * @param newPassword new password of user
 	 * @return ok if update succeed
@@ -135,7 +145,7 @@ public class UserController {
 	}

 	/**
-	 * Get paged users
+	 * Get paged users.
 	 * @param pageNo number index of page
 	 * @param pageSize size of page
 	 * @return A collection of users, empty set if no user is found
@@ -149,6 +159,7 @@ public class UserController {

 	/**
 	 * Login to Nacos
+	 *
 	 * <p>
 	 * This methods uses username and password to require a new token.
 	 * @param username username of user
@@ -201,6 +212,13 @@ public class UserController {
 		}
 	}

+	/**
+	 * Update password.
+	 * @param oldPassword old password
+	 * @param newPassword new password
+	 * @return Code 200 if update successfully, Code 401 if old password invalid,
+	 * otherwise 500
+	 */
 	@PutMapping("/password")
 	@Deprecated
 	public RestResult<String> updatePassword(@RequestParam(value = "oldPassword") String oldPassword,
@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.exception;

 import com.alibaba.nacos.common.utils.ExceptionUtil;
@@ -25,7 +26,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;

 /**
- * Exception handler for console module
+ * Exception handler for console module.
 *
 * @author nkorange
 * @since 1.2.0
@@ -33,7 +34,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
@ControllerAdvice
 public class ConsoleExceptionHandler {

-	private static final Logger logger = LoggerFactory.getLogger(ConsoleExceptionHandler.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleExceptionHandler.class);

 	@ExceptionHandler(AccessException.class)
 	private ResponseEntity<String> handleAccessException(AccessException e) {
@@ -47,7 +48,7 @@ public class ConsoleExceptionHandler {

 	@ExceptionHandler(Exception.class)
 	private ResponseEntity<String> handleException(Exception e) {
-		logger.error("CONSOLE", e);
+		LOGGER.error("CONSOLE", e);
 		return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ExceptionUtil.getAllExceptionMsg(e));
 	}

@@ -13,11 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.filter;

 import com.alibaba.nacos.api.common.Constants;
-import com.alibaba.nacos.nacos.JwtTokenManager;
-import com.alibaba.nacos.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;
@@ -30,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

 /**
- * jwt auth token filter
+ * jwt auth token filter.
 *
 * @author wfnuser
 */
@@ -38,7 +39,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {

 	private static final String TOKEN_PREFIX = "Bearer ";

-	private JwtTokenManager tokenManager;
+	private final JwtTokenManager tokenManager;

 	public JwtAuthenticationTokenFilter(JwtTokenManager tokenManager) {
 		this.tokenManager = tokenManager;
@@ -59,7 +60,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
 	}

 	/**
-	 * Get token from header
+	 * Get token from header.
 	 */
 	private String resolveToken(HttpServletRequest request) {
 		String bearerToken = request.getHeader(NacosAuthConfig.AUTHORIZATION_HEADER);
@@ -13,10 +13,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.model;

 /**
- * Namespace
+ * Namespace.
 *
 * @author diamond
 */
@@ -31,7 +32,7 @@ public class Namespace {
 	private int configCount;

 	/**
-	 * 0 : Global configuration， 1 : Default private namespace ，2 : Custom namespace
+	 * 0 : Global configuration， 1 : Default private namespace ，2 : Custom namespace.
 	 */
 	private int type;

@@ -13,10 +13,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.model;

 /**
- * all namespace info
+ * all namespace info.
 *
 * @author Nacos
 */
@@ -13,9 +13,10 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.alibaba.nacos.nacos;

-import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl;
+package com.alibaba.nacos.security.nacos;
+
+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;
@@ -25,7 +26,7 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;

 /**
- * auth provider
+ * auth provider.
 *
 * @author wfnuser
 */
@@ -13,7 +13,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.alibaba.nacos.nacos;
+
+package com.alibaba.nacos.security.nacos;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,19 +28,19 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

 /**
- * jwt auth fail point
+ * jwt auth fail point.
 *
 * @author wfnuser
 */
@Component
 public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {

-	private static final Logger logger = LoggerFactory.getLogger(JwtAuthenticationEntryPoint.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(JwtAuthenticationEntryPoint.class);

 	@Override
 	public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
 			throws IOException, ServletException {
-		logger.error("Responding with unauthorized error. Message:{}, url:{}", e.getMessage(), request.getRequestURI());
+		LOGGER.error("Responding with unauthorized error. Message:{}, url:{}", e.getMessage(), request.getRequestURI());
 		response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
 	}

@@ -13,7 +13,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.alibaba.nacos.nacos;
+
+package com.alibaba.nacos.security.nacos;

 import com.alibaba.nacos.core.auth.AuthConfigs;
 import io.jsonwebtoken.Claims;
@@ -31,7 +32,7 @@ import java.util.Date;
 import java.util.List;

 /**
- * JWT token manager
+ * JWT token manager.
 *
 * @author wfnuser
 * @author nkorange
@@ -45,7 +46,7 @@ public class JwtTokenManager {
 	private AuthConfigs authConfigs;

 	/**
-	 * Create token
+	 * Create token.
 	 * @param authentication auth info
 	 * @return token
 	 */
@@ -53,9 +54,14 @@ public class JwtTokenManager {
 		return createToken(authentication.getName());
 	}

+	/**
+	 * Create token.
+	 * @param userName auth info
+	 * @return token
+	 */
 	public String createToken(String userName) {

-		long now = (new Date()).getTime();
+		long now = System.currentTimeMillis();

 		Date validity;
 		validity = new Date(now + authConfigs.getTokenValidityInSeconds() * 1000L);
@@ -67,14 +73,12 @@ public class JwtTokenManager {
 	}

 	/**
-	 * Get auth Info
+	 * Get auth Info.
 	 * @param token token
 	 * @return auth info
 	 */
 	public Authentication getAuthentication(String token) {
-		/**
-		 * parse the payload of token
-		 */
+
 		Claims claims = Jwts.parser().setSigningKey(authConfigs.getSecretKey()).parseClaimsJws(token).getBody();

 		List<GrantedAuthority> authorities = AuthorityUtils
@@ -85,9 +89,8 @@ public class JwtTokenManager {
 	}

 	/**
-	 * validate token
+	 * validate token.
 	 * @param token token
-	 * @return whether valid
 	 */
 	public void validateToken(String token) {
 		Jwts.parser().setSigningKey(authConfigs.getSecretKey()).parseClaimsJws(token);
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.alibaba.nacos.nacos;
+
+package com.alibaba.nacos.security.nacos;

 import com.alibaba.nacos.filter.JwtAuthenticationTokenFilter;
-import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl;
+import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl;
 import com.alibaba.nacos.core.auth.AuthConfigs;
 import com.alibaba.nacos.core.auth.AuthSystemTypes;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.BeanIds;
@@ -38,11 +38,10 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 import org.springframework.web.cors.CorsUtils;

 /**
- * Spring security config
+ * Spring security config.
 *
 * @author Nacos
 */
-@Configuration
@EnableGlobalMethodSecurity(prePostEnabled = true)
 public class NacosAuthConfig extends WebSecurityConfigurerAdapter {

@@ -79,22 +78,18 @@ public class NacosAuthConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	public void configure(WebSecurity web) {

-		String ignoreURLs = null;
-		//
+		String ignoreUrls = null;
 		if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) {
-			ignoreURLs = "/**";
+			ignoreUrls = "/**";
 		}
-		//
 		if (StringUtils.isBlank(authConfigs.getNacosAuthSystemType())) {
-			ignoreURLs = env.getProperty("nacos.security.ignore.urls", "/**");
+			ignoreUrls = env.getProperty("nacos.security.ignore.urls", "/**");
 		}
-
-		if (StringUtils.isNotBlank(ignoreURLs)) {
-			for (String ignoreURL : ignoreURLs.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) {
-				web.ignoring().antMatchers(ignoreURL.trim());
+		if (StringUtils.isNotBlank(ignoreUrls)) {
+			for (String each : ignoreUrls.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) {
+				web.ignoring().antMatchers(each.trim());
 			}
 		}
-
 	}

 	@Override
@@ -13,12 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.alibaba.nacos.nacos;
+
+package com.alibaba.nacos.security.nacos;

 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
-import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl;
-import com.alibaba.nacos.nacos.users.NacosUser;
+import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl;
+import com.alibaba.nacos.security.nacos.users.NacosUser;
 import com.alibaba.nacos.core.auth.AccessException;
 import com.alibaba.nacos.core.auth.AuthManager;
 import com.alibaba.nacos.core.auth.Permission;
@@ -38,7 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;

 /**
- * Builtin access control entry of Nacos
+ * Builtin access control entry of Nacos.
 *
 * @author nkorange
 * @since 1.2.0
@@ -107,7 +108,7 @@ public class NacosAuthManager implements AuthManager {
 	}

 	/**
-	 * Get token from header
+	 * Get token from header.
 	 */
 	private String resolveToken(HttpServletRequest request) throws AccessException {
 		String bearerToken = request.getHeader(NacosAuthConfig.AUTHORIZATION_HEADER);
@@ -13,15 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.alibaba.nacos.nacos.roles;
+
+package com.alibaba.nacos.security.nacos.roles;

 import com.alibaba.nacos.config.server.auth.PermissionInfo;
 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.nacos.NacosAuthConfig;
-import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl;
+import com.alibaba.nacos.security.nacos.NacosAuthConfig;
+import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl;
 import com.alibaba.nacos.core.auth.AuthConfigs;
 import com.alibaba.nacos.core.auth.Permission;
 import com.alibaba.nacos.core.utils.Loggers;
@@ -32,7 +33,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;

@@ -59,11 +64,11 @@ public class NacosRoleServiceImpl {
 	@Autowired
 	private PermissionPersistService permissionPersistService;

-	private Set<String> roleSet = new ConcurrentHashSet<>();
+	private volatile Set<String> roleSet = new ConcurrentHashSet<>();

-	private Map<String, List<RoleInfo>> roleInfoMap = new ConcurrentHashMap<>();
+	private volatile Map<String, List<RoleInfo>> roleInfoMap = new ConcurrentHashMap<>();

-	private Map<String, List<PermissionInfo>> permissionInfoMap = new ConcurrentHashMap<>();
+	private volatile Map<String, List<PermissionInfo>> permissionInfoMap = new ConcurrentHashMap<>();

 	@Scheduled(initialDelay = 5000, fixedDelay = 15000)
 	private void reload() {
@@ -90,9 +95,9 @@ public class NacosRoleServiceImpl {
 				tmpPermissionInfoMap.put(role, permissionInfoPage.getPageItems());
 			}

-			roleSet.addAll(tmpRoleSet);
-			roleInfoMap.putAll(tmpRoleInfoMap);
-			permissionInfoMap.putAll(tmpPermissionInfoMap);
+			roleSet = tmpRoleSet;
+			roleInfoMap = tmpRoleInfoMap;
+			permissionInfoMap = tmpPermissionInfoMap;
 		}
 		catch (Exception e) {
 			Loggers.AUTH.warn("[LOAD-ROLES] load failed", e);
@@ -101,6 +106,7 @@ public class NacosRoleServiceImpl {

 	/**
 	 * Determine if the user has permission of the resource.
+	 *
 	 * <p>
 	 * Note if the user has many roles, this method returns true if any one role of the
 	 * user has the desired permission.
@@ -179,6 +185,11 @@ public class NacosRoleServiceImpl {
 		return permissionPersistService.getPermissions(role, pageNo, pageSize);
 	}

+	/**
+	 * Add role.
+	 * @param role role name
+	 * @param username user name
+	 */
 	public void addRole(String role, String username) {
 		if (userDetailsService.getUserFromDatabase(username) == null) {
 			throw new IllegalArgumentException("user '" + username + "' not found!");
@@ -207,6 +218,12 @@ public class NacosRoleServiceImpl {
 		return pageInfo;
 	}

+	/**
+	 * Add permission.
+	 * @param role role name
+	 * @param resource resource
+	 * @param action action
+	 */
 	public void addPermission(String role, String resource, String action) {
 		if (!roleSet.contains(role)) {
 			throw new IllegalArgumentException("role " + role + " not found!");
@@ -14,11 +14,13 @@
 * limitations under the License.
 */

-package com.alibaba.nacos.nacos.users;
+package com.alibaba.nacos.security.nacos.users;

 import com.alibaba.nacos.core.auth.User;

 /**
+ * Nacos User.
+ *
 * @author nkorange
 * @since 1.2.0
 */
@@ -13,7 +13,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.alibaba.nacos.nacos.users;
+
+package com.alibaba.nacos.security.nacos.users;

 import com.alibaba.nacos.config.server.model.User;
 import org.springframework.security.core.GrantedAuthority;
@@ -23,13 +24,13 @@ import org.springframework.security.core.userdetails.UserDetails;
 import java.util.Collection;

 /**
- * custem user
+ * custom user.
 *
 * @author wfnuser
 */
 public class NacosUserDetails implements UserDetails {

-	private User user;
+	private final User user;

 	public NacosUserDetails(User user) {
 		this.user = user;
@@ -13,7 +13,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.alibaba.nacos.nacos.users;
+
+package com.alibaba.nacos.security.nacos.users;

 import com.alibaba.nacos.config.server.auth.UserPersistService;
 import com.alibaba.nacos.config.server.model.Page;
@@ -31,7 +32,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

 /**
- * Custem user service
+ * Custem user service.
 *
 * @author wfnuser
 * @author nkorange
@@ -13,9 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.utils;

-import io.jsonwebtoken.*;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.MalformedJwtException;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.SignatureException;
+import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.Keys;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,7 +40,7 @@ import java.util.Date;
 import java.util.List;

 /**
- * Jwt token tool
+ * Jwt token tool.
 *
 * @author wfnuser
 */
@@ -45,31 +52,34 @@ public class JwtTokenUtils {
 	private static final String AUTHORITIES_KEY = "auth";

 	/**
-	 * minimum SHA_256 secretKey string length
+	 * minimum SHA_256 secretKey string length.
 	 */
 	private static final int SHA_256_SECRET_CHAR_SIZE = 256 / 8;

 	/**
-	 * default SHA_256 secretKey flag
+	 * default SHA_256 secretKey flag.
 	 */
 	private static final String DEFAULT_SECRET_FLAG = "default";

 	/**
-	 * custom SHA_256 secretKey from config property
+	 * custom SHA_256 secretKey from config property.
 	 */
 	@Value("${nacos.security.token.secret-key:default}")
 	private String customSecretKeyStr;

 	/**
-	 * secret key
+	 * secret key.
 	 */
 	private SecretKey secretKey;

 	/**
-	 * Token validity time(ms)
+	 * Token validity time(ms).
 	 */
 	private long tokenValidityInMilliseconds;

+	/**
+	 * Init.
+	 */
 	@PostConstruct
 	public void init() {
 		// use default secretKey for SHA-256
@@ -96,37 +106,27 @@ public class JwtTokenUtils {
 	}

 	/**
-	 * Create token
+	 * Create token.
 	 * @param authentication auth info
 	 * @return token
 	 */
 	public String createToken(Authentication authentication) {
-		/**
-		 * Current time
-		 */
-		long now = (new Date()).getTime();
-		/**
-		 * Validity date
-		 */
-		Date validity;
-		validity = new Date(now + this.tokenValidityInMilliseconds);

-		/**
-		 * create token
-		 */
+		long now = System.currentTimeMillis();
+
+		Date validity = new Date(now + this.tokenValidityInMilliseconds);
+
 		return Jwts.builder().setSubject(authentication.getName()).claim(AUTHORITIES_KEY, "").setExpiration(validity)
 				.signWith(secretKey, SignatureAlgorithm.HS256).compact();
 	}

 	/**
-	 * Get auth Info
+	 * Get auth Info.
 	 * @param token token
 	 * @return auth info
 	 */
 	public Authentication getAuthentication(String token) {
-		/**
-		 * parse the payload of token
-		 */
+
 		Claims claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody();

 		List<GrantedAuthority> authorities = AuthorityUtils
@@ -137,7 +137,7 @@ public class JwtTokenUtils {
 	}

 	/**
-	 * validate token
+	 * validate token.
 	 * @param token token
 	 * @return whether valid
 	 */
@@ -13,12 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.nacos.utils;

 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

 /**
- * Password encoder tool
+ * Password encoder tool.
 *
 * @author nacos
 */
@@ -60,14 +60,13 @@
    "style-loader": "^1.1.2",
    "uglifyjs-webpack-plugin": "^2.2.0",
    "url-loader": "^3.0.0",
-    "webpack": "^4.41.4",
-    "webpack-cli": "^3.3.10",
-    "webpack-dev-server": "^3.10.1"
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.12",
+    "webpack-dev-server": "^3.11.0"
  },
  "dependencies": {
    "@alifd/next": "^1.17.4",
    "axios": "^0.18.0",
-    "jquery": "^3.3.1",
    "moment": "^2.23.0",
    "qs": "^6.8.2",
    "prop-types": "^15.6.2",
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -259,4 +262,4 @@

 .icon-alitomcat:before {
    content: "\e607" !important;
-}
+}
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1,10 +1,12 @@
-<!DOCTYPE html>
 <!--
  ~ Copyright 1999-2018 Alibaba Group Holding Ltd.
+  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
+  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12,6 +14,8 @@
  ~ limitations under the License.
  -->

+<!DOCTYPE html>
+
 <html lang="en">

 <head>
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,4 +51,4 @@
    window.scrollTo(info.scrollLeft, info.scrollTop);
    cm.refresh();
  }
-});
+});
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,4 +41,4 @@ CodeMirror.registerHelper("lint", "json", function(text) {
  return found;
 });

-});
+});
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -245,4 +248,4 @@
  CodeMirror.defineExtension("performLint", function() {
    if (this.state.lint) startLinting(this);
  });
-});
+});
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -796,4 +799,4 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
    }
  });

-});
+});
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +33,7 @@ case 1: // replace escaped characters with actual character
                     .replace(/\\v/g,'\v')
                     .replace(/\\f/g,'\f')
                     .replace(/\\b/g,'\b');
-        
+
 break;
 case 2:this.$ = Number(yytext);
 break;
@@ -354,7 +357,7 @@ next:function () {
        if (this._input === "") {
            return this.EOF;
        } else {
-            this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(), 
+            this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
                    {text: "", token: null, line: this.yylineno});
        }
    },
@@ -442,4 +445,4 @@ exports.main = function commonjsMain(args) {
 if (typeof module !== 'undefined' && require.main === module) {
  exports.main(typeof process !== 'undefined' ? process.argv.slice(1) : require("system").args);
 }
-}
+}
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1,4 +1,2 @@
-/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=Array.isArray(d)))?(e?(e=!1,f=c&&Array.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={IDLine truncated
-a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},U=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function V(){this.expando=r.expando+V.uid++}V.uid=1,V.prototype={cache:function(a){var b=a[this.expando];return b||(b={},U(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){Array.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(L)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var W=new V,X=new V,Y=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function $(a){return"true"===a||"false"!==a&&("null"===a?null:a===+a+""?+a:Y.test(a)?JSON.parse(a):a)}function _(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Z,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c=$(c)}catch(e){}X.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return X.hasData(a)||W.hasData(a)},data:function(a,b,c){return X.access(a,b,c)},removeData:function(a,b){X.remove(a,b)},_data:function(a,b,c){return W.access(a,b,c)},_removeData:function(a,b){W.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=X.get(f),1===f.nodeType&&!W.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),_(f,d,e[d])));W.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){X.set(this,a)}):T(this,function(b){var c;if(f&&void 0===b){if(c=X.get(f,a),void 0!==c)return c;if(c=_(f,a),void 0!==c)return c}else this.each(function(){X.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){X.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=W.get(a,b),c&&(!d||Array.isArray(c)?d=W.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return W.get(a,c)||W.access(a,c,{empty:r.Callbacks("once memory").add(function(){W.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=W.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var aa=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ba=new RegExp("^(?:([+-])=|)("+aa+")([a-z%]*)$","i"),ca=["Top","Right","Bottom","Left"],da=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ea=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function fa(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&ba.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ga={};function ha(a){var b,c=a.ownerDocument,d=a.nodeName,e=ga[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e=Line truncated
-null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=mb[g],mb[g]=e,e=null!=c(a,b,d)?g:null,mb[g]=f),e}});var nb=/^(?:input|select|textarea|button)$/i,ob=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return T(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):nb.test(a.nodeName)||ob.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function pb(a){var b=a.match(L)||[];return b.join(" ")}function qb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,qb(this)))});if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,qb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,qb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(L)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=qb(this),b&&W.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":W.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+pb(qb(c))+" ").indexOf(b)>-1)return!0;return!1}});var rb=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":Array.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:pb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d<i;d++)if(c=e[d],(c.selected||d===f)&&!c.disabled&&(!c.parentNode.disabled||!B(c.parentNode,"optgroup"))){if(b=r(c).val(),g)return b;h.push(b)}return h},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(Array.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!sb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?bLine truncated
+/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-lLine truncated
@@ -1,9 +1,12 @@
 /*
 * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
+ *
 *      http://www.apache.org/licenses/LICENSE-2.0
+ *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.