diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/GulimallAuthServerApplication.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/GulimallAuthServerApplication.java similarity index 93% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/GulimallAuthServerApplication.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/GulimallAuthServerApplication.java index b39144a5b999ce5047546269e70f155da4612c3f..71e0d3de3764ce52cc0162febcd3b3c8e9f6b9af 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/GulimallAuthServerApplication.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/GulimallAuthServerApplication.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver; +package com.forth.gulimall.authserver; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/config/GulimallSessionConfig.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/config/GulimallSessionConfig.java similarity index 94% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/config/GulimallSessionConfig.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/config/GulimallSessionConfig.java index 7e8e7f8cefb47ece390e800445328d6678654c39..6cdccc7a03f683f47f85ad4f31b620b4d17c8b83 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/config/GulimallSessionConfig.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/config/GulimallSessionConfig.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver.config; +package com.forth.gulimall.authserver.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/config/GulimallWebConfig.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/config/GulimallWebConfig.java similarity index 91% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/config/GulimallWebConfig.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/config/GulimallWebConfig.java index d5c5147976b83ec8094cafaa8ea0766f43023ec5..2e9f7cd663218393159ab27066e93faaf9d86e5b 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/config/GulimallWebConfig.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/config/GulimallWebConfig.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver.config; +package com.forth.gulimall.authserver.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/controller/LoginController.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/controller/LoginController.java similarity index 93% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/controller/LoginController.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/controller/LoginController.java index 2167bf9d07a70cdcd9e5d31ab1c5ba11e2e0cb00..73eec5817112a1de629f39adeca872983b9f6a6c 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/controller/LoginController.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/controller/LoginController.java @@ -1,15 +1,15 @@ -package com.forth.gulimall.gulimallauthserver.controller; +package com.forth.gulimall.authserver.controller; import com.alibaba.fastjson.TypeReference; import com.forth.common.constant.AuthServerConstant; import com.forth.common.utils.R; -import com.forth.gulimall.gulimallauthserver.feign.MemberFeignService; -import com.forth.gulimall.gulimallauthserver.feign.ThirdPartFeignService; +import com.forth.gulimall.authserver.feign.MemberFeignService; +import com.forth.gulimall.authserver.feign.ThirdPartFeignService; -import com.forth.gulimall.gulimallauthserver.vo.MemberRespVo; -import com.forth.gulimall.gulimallauthserver.vo.UserLoginVo; -import com.forth.gulimall.gulimallauthserver.vo.UserRegistVo; +import com.forth.gulimall.authserver.vo.MemberRespVo; +import com.forth.gulimall.authserver.vo.UserLoginVo; +import com.forth.gulimall.authserver.vo.UserRegistVo; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; @@ -25,7 +25,6 @@ import javax.servlet.http.HttpSession; import javax.validation.Valid; import java.util.HashMap; import java.util.Map; -import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/controller/OAuth2Controller.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/controller/OAuth2Controller.java similarity index 89% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/controller/OAuth2Controller.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/controller/OAuth2Controller.java index cf90cac16787b237e021bc6e965eab92185c66cb..237f87ff07650d1af11d6c37c7ac043eaf2eb40e 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/controller/OAuth2Controller.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/controller/OAuth2Controller.java @@ -1,21 +1,20 @@ -package com.forth.gulimall.gulimallauthserver.controller; +package com.forth.gulimall.authserver.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.forth.common.constant.AuthServerConstant; import com.forth.common.utils.R; -import com.forth.gulimall.gulimallauthserver.feign.MemberFeignService; -import com.forth.gulimall.gulimallauthserver.vo.MemberRespVo; -import com.forth.gulimall.gulimallauthserver.vo.SocialUserVo; +import com.forth.gulimall.authserver.feign.MemberFeignService; +import com.forth.gulimall.authserver.vo.MemberRespVo; +import com.forth.gulimall.authserver.vo.SocialUserVo; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import com.forth.gulimall.gulimallauthserver.utils.HttpUtils; +import com.forth.gulimall.authserver.utils.HttpUtils; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/feign/MemberFeignService.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/feign/MemberFeignService.java similarity index 70% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/feign/MemberFeignService.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/feign/MemberFeignService.java index a6651ab1baa69a2136a4cdec3c565df5d7ab6e88..849353c59ad1f4aa3a0d7b682e1aaa8d3daed488 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/feign/MemberFeignService.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/feign/MemberFeignService.java @@ -1,10 +1,10 @@ -package com.forth.gulimall.gulimallauthserver.feign; +package com.forth.gulimall.authserver.feign; import com.forth.common.utils.R; -import com.forth.gulimall.gulimallauthserver.vo.SocialUserVo; -import com.forth.gulimall.gulimallauthserver.vo.UserLoginVo; -import com.forth.gulimall.gulimallauthserver.vo.UserRegistVo; +import com.forth.gulimall.authserver.vo.SocialUserVo; +import com.forth.gulimall.authserver.vo.UserLoginVo; +import com.forth.gulimall.authserver.vo.UserRegistVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/feign/ThirdPartFeignService.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/feign/ThirdPartFeignService.java similarity index 88% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/feign/ThirdPartFeignService.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/feign/ThirdPartFeignService.java index f55726eeaa4c113caf4b589b9f04d5483d031a66..03ed2a276478fe6eab44cf03a98a0da981ba60f7 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/feign/ThirdPartFeignService.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/feign/ThirdPartFeignService.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver.feign; +package com.forth.gulimall.authserver.feign; import com.forth.common.utils.R; import org.springframework.cloud.openfeign.FeignClient; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/utils/HttpUtils.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/utils/HttpUtils.java similarity index 99% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/utils/HttpUtils.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/utils/HttpUtils.java index 143aaba2ae2bbc42f609795dc51cecf7ae1bffac..c2308832cd86a0a9f1cf46cfe7f133a3614a903f 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/utils/HttpUtils.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/utils/HttpUtils.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver.utils; +package com.forth.gulimall.authserver.utils; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/MemberRespVo.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/MemberRespVo.java similarity index 96% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/MemberRespVo.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/MemberRespVo.java index a2c0427c63bdc0a1bfe2f521782180d2092e66c2..2d5c3cb12fc5ff4299e25feea3f6e1b057c19587 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/MemberRespVo.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/MemberRespVo.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver.vo; +package com.forth.gulimall.authserver.vo; import lombok.Data; import lombok.ToString; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/SocialUserVo.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/SocialUserVo.java similarity index 80% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/SocialUserVo.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/SocialUserVo.java index 7b0937c022788e2c7916ac4603a8d7c3be50ff75..77cb6827abb8924f387697036a01a2b055b61b55 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/SocialUserVo.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/SocialUserVo.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver.vo; +package com.forth.gulimall.authserver.vo; import lombok.Data; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/UserLoginVo.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/UserLoginVo.java similarity index 70% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/UserLoginVo.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/UserLoginVo.java index 2183675fb519c2c025bad9ae420ff331ea7d1758..5c4a7c768dbcfe34436d6985fa896e64cce3b1fe 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/UserLoginVo.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/UserLoginVo.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver.vo; +package com.forth.gulimall.authserver.vo; import lombok.Data; diff --git a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/UserRegistVo.java b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/UserRegistVo.java similarity index 93% rename from gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/UserRegistVo.java rename to gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/UserRegistVo.java index bb96810b989ed5cda77c7b98ecca53e66a9ff9f7..7eae4d8329a377ea3651ec05cccc8730affb37f9 100644 --- a/gulimall-auth-server/src/main/java/com/forth/gulimall/gulimallauthserver/vo/UserRegistVo.java +++ b/gulimall-auth-server/src/main/java/com/forth/gulimall/authserver/vo/UserRegistVo.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimallauthserver.vo; +package com.forth.gulimall.authserver.vo; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/gulimall-auth-server/src/test/java/com/forth/gulimall/gulimallauthserver/GulimallAuthServerApplicationTests.java b/gulimall-auth-server/src/test/java/com/forth/gulimall/authserver/GulimallAuthServerApplicationTests.java similarity index 93% rename from gulimall-auth-server/src/test/java/com/forth/gulimall/gulimallauthserver/GulimallAuthServerApplicationTests.java rename to gulimall-auth-server/src/test/java/com/forth/gulimall/authserver/GulimallAuthServerApplicationTests.java index 952d2980b96f6e185ef87873ffe267934f8c60ff..fbcd72f4f1f3a749417e54df69403b21c2f1ef0a 100644 --- a/gulimall-auth-server/src/test/java/com/forth/gulimall/gulimallauthserver/GulimallAuthServerApplicationTests.java +++ b/gulimall-auth-server/src/test/java/com/forth/gulimall/authserver/GulimallAuthServerApplicationTests.java @@ -1,13 +1,12 @@ -package com.forth.gulimall.gulimallauthserver; +package com.forth.gulimall.authserver; import com.forth.common.constant.AuthServerConstant; import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.redis.core.StringRedisTemplate; -import com.forth.gulimall.gulimallauthserver.utils.HttpUtils; +import com.forth.gulimall.authserver.utils.HttpUtils; import java.util.HashMap; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/GulimallCartApplication.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/GulimallCartApplication.java similarity index 94% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/GulimallCartApplication.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/GulimallCartApplication.java index 3a8891d11d2d64f0440fc0f6a750f963501aac2c..edd1f6a2af3fa985f66430b11b4a435aa8f1ace6 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/GulimallCartApplication.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/GulimallCartApplication.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart; +package com.forth.gulimall.cart; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/GulimallSessionConfig.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/config/GulimallSessionConfig.java similarity index 95% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/GulimallSessionConfig.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/config/GulimallSessionConfig.java index 7a5f2fdea174ec5472c2e0751e6117fb47b89378..29e841137e243d01b9b9151d1037c23f842d4748 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/GulimallSessionConfig.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/config/GulimallSessionConfig.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart.config; +package com.forth.gulimall.cart.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/GulimallWebConfig.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/config/GulimallWebConfig.java similarity index 79% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/GulimallWebConfig.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/config/GulimallWebConfig.java index 40c04b7ef1a1341cb41287e3ecbdebd9b0d1a266..2a46bb6b449acc626421fb0a3b154687ea4decd0 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/GulimallWebConfig.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/config/GulimallWebConfig.java @@ -1,6 +1,6 @@ -package com.forth.gulimall.gulimall.cart.config; +package com.forth.gulimall.cart.config; -import com.forth.gulimall.gulimall.cart.interceptor.CartInterceptor; +import com.forth.gulimall.cart.interceptor.CartInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/MyThreadConfig.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/config/MyThreadConfig.java similarity index 93% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/MyThreadConfig.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/config/MyThreadConfig.java index 322e035b11a000c499595fb836f81ae7c7adfd84..7e6dd3b276e20d8394ca1a7152e7882825fb2f91 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/MyThreadConfig.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/config/MyThreadConfig.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart.config; +package com.forth.gulimall.cart.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/ThreadPoolConfigProperties.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/config/ThreadPoolConfigProperties.java similarity index 87% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/ThreadPoolConfigProperties.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/config/ThreadPoolConfigProperties.java index e859433cf1392c72b1a7b8ef6a2ed2a111cb23f8..824bb988c5e66cb8d5b2af4dd06c5b04a711b935 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/config/ThreadPoolConfigProperties.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/config/ThreadPoolConfigProperties.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart.config; +package com.forth.gulimall.cart.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/controller/CartController.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/controller/CartController.java similarity index 88% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/controller/CartController.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/controller/CartController.java index 4d1825bc25bec33026bdcd210927fbe82b305a6b..c46ff646d9e66077084e31952d10e2871ff53a03 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/controller/CartController.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/controller/CartController.java @@ -1,13 +1,11 @@ -package com.forth.gulimall.gulimall.cart.controller; +package com.forth.gulimall.cart.controller; -import com.forth.gulimall.gulimall.cart.feign.ProductFeignService; -import com.forth.gulimall.gulimall.cart.interceptor.CartInterceptor; -import com.forth.gulimall.gulimall.cart.service.CartService; -import com.forth.gulimall.gulimall.cart.vo.Cart; -import com.forth.gulimall.gulimall.cart.vo.CartItem; -import com.forth.gulimall.gulimall.cart.vo.UserInfoVo; -import org.checkerframework.checker.units.qual.C; +import com.forth.gulimall.cart.interceptor.CartInterceptor; +import com.forth.gulimall.cart.service.CartService; +import com.forth.gulimall.cart.vo.Cart; +import com.forth.gulimall.cart.vo.CartItem; +import com.forth.gulimall.cart.vo.UserInfoVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/feign/ProductFeignService.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/feign/ProductFeignService.java similarity index 94% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/feign/ProductFeignService.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/feign/ProductFeignService.java index 24b6a6d13a73d1fa14ac6fa83d3b1986a6b76a0d..ab0f9dbae096d8165e5f791a5eb6332e378859af 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/feign/ProductFeignService.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/feign/ProductFeignService.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart.feign; +package com.forth.gulimall.cart.feign; import com.forth.common.utils.R; import org.springframework.cloud.openfeign.FeignClient; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/interceptor/CartInterceptor.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/interceptor/CartInterceptor.java similarity index 94% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/interceptor/CartInterceptor.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/interceptor/CartInterceptor.java index ef2cbf526ffa868aa8c1a9fbfca3f4a5b03e7fbc..a3aba075acec8f386c471e92a1c8a1f05c6edd87 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/interceptor/CartInterceptor.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/interceptor/CartInterceptor.java @@ -1,10 +1,10 @@ -package com.forth.gulimall.gulimall.cart.interceptor; +package com.forth.gulimall.cart.interceptor; import com.forth.common.constant.AuthServerConstant; import com.forth.common.constant.CartConstant; -import com.forth.gulimall.gulimall.cart.vo.UserInfoVo; -import com.forth.gulimall.gulimallauthserver.vo.MemberRespVo; +import com.forth.gulimall.cart.vo.UserInfoVo; +import com.forth.gulimall.authserver.vo.MemberRespVo; import org.apache.commons.lang.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/service/CartService.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/service/CartService.java similarity index 88% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/service/CartService.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/service/CartService.java index 6e1d2f316df3880a25c5c4f53437aef99adbfb53..5e7443a4dc166011e7246fe79ef841c7436a9a60 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/service/CartService.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/service/CartService.java @@ -1,7 +1,7 @@ -package com.forth.gulimall.gulimall.cart.service; +package com.forth.gulimall.cart.service; -import com.forth.gulimall.gulimall.cart.vo.Cart; -import com.forth.gulimall.gulimall.cart.vo.CartItem; +import com.forth.gulimall.cart.vo.Cart; +import com.forth.gulimall.cart.vo.CartItem; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/service/impl/CartServiceImpl.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/service/impl/CartServiceImpl.java similarity index 94% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/service/impl/CartServiceImpl.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/service/impl/CartServiceImpl.java index 6fd1456ad333b762df3cc19839ed834c934031c3..1a1f802de50d5d6044e87902dd64c9191db2bd38 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/service/impl/CartServiceImpl.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/service/impl/CartServiceImpl.java @@ -1,15 +1,15 @@ -package com.forth.gulimall.gulimall.cart.service.impl; +package com.forth.gulimall.cart.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.forth.common.utils.R; -import com.forth.gulimall.gulimall.cart.feign.ProductFeignService; -import com.forth.gulimall.gulimall.cart.interceptor.CartInterceptor; -import com.forth.gulimall.gulimall.cart.service.CartService; -import com.forth.gulimall.gulimall.cart.vo.Cart; -import com.forth.gulimall.gulimall.cart.vo.CartItem; -import com.forth.gulimall.gulimall.cart.vo.SkuInfoVo; -import com.forth.gulimall.gulimall.cart.vo.UserInfoVo; +import com.forth.gulimall.cart.interceptor.CartInterceptor; +import com.forth.gulimall.cart.service.CartService; +import com.forth.gulimall.cart.feign.ProductFeignService; +import com.forth.gulimall.cart.vo.Cart; +import com.forth.gulimall.cart.vo.CartItem; +import com.forth.gulimall.cart.vo.SkuInfoVo; +import com.forth.gulimall.cart.vo.UserInfoVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/Cart.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/Cart.java similarity index 97% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/Cart.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/Cart.java index 6e614bb65bada94c80d47bb826adf0eb7be64f8c..89a53835ca2183880c05b5e441ebd6cac3846a8d 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/Cart.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/Cart.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart.vo; +package com.forth.gulimall.cart.vo; import java.math.BigDecimal; import java.util.List; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/CartItem.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/CartItem.java similarity index 97% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/CartItem.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/CartItem.java index 84926de6494b464fb019bd61fad87a9e46eeb19d..a641284a54f233f0e66647c72f18a6a0e31baaa4 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/CartItem.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/CartItem.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart.vo; +package com.forth.gulimall.cart.vo; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/SkuInfoVo.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/SkuInfoVo.java similarity index 94% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/SkuInfoVo.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/SkuInfoVo.java index ae3826869a05b0ed1b037eb05e40260845bc6ba6..8579025dc8b2ed68bb66f446d2505c373d834bc4 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/SkuInfoVo.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/SkuInfoVo.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart.vo; +package com.forth.gulimall.cart.vo; import lombok.Data; import lombok.ToString; diff --git a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/UserInfoVo.java b/gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/UserInfoVo.java similarity index 79% rename from gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/UserInfoVo.java rename to gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/UserInfoVo.java index 65c797163f312ceb0d88f4eec6f73f821c8868d5..c692a13d628ef4d61da69d7f6e143539b77e2295 100644 --- a/gulimall-cart/src/main/java/com/forth/gulimall/gulimall/cart/vo/UserInfoVo.java +++ b/gulimall-cart/src/main/java/com/forth/gulimall/cart/vo/UserInfoVo.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart.vo; +package com.forth.gulimall.cart.vo; import lombok.Data; import lombok.ToString; diff --git a/gulimall-cart/src/test/java/com/forth/gulimall/gulimall/cart/GulimallCartApplicationTests.java b/gulimall-cart/src/test/java/com/forth/gulimall/cart/GulimallCartApplicationTests.java similarity index 81% rename from gulimall-cart/src/test/java/com/forth/gulimall/gulimall/cart/GulimallCartApplicationTests.java rename to gulimall-cart/src/test/java/com/forth/gulimall/cart/GulimallCartApplicationTests.java index f86fc42a0ce1ee845b6093e71bfb4da8cc34156b..be18a6c6773498859a0c984e43bafdbd972d6841 100644 --- a/gulimall-cart/src/test/java/com/forth/gulimall/gulimall/cart/GulimallCartApplicationTests.java +++ b/gulimall-cart/src/test/java/com/forth/gulimall/cart/GulimallCartApplicationTests.java @@ -1,4 +1,4 @@ -package com.forth.gulimall.gulimall.cart; +package com.forth.gulimall.cart; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/interceptor/LoginUserInterceptor.java b/gulimall-order/src/main/java/com/forth/gulimall/order/interceptor/LoginUserInterceptor.java index fda6895fdbda7b6d518c46117762e80254a9d045..9563f4e6717b9b98c71d1deea6fddcbfd8756391 100644 --- a/gulimall-order/src/main/java/com/forth/gulimall/order/interceptor/LoginUserInterceptor.java +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/interceptor/LoginUserInterceptor.java @@ -2,7 +2,7 @@ package com.forth.gulimall.order.interceptor; import com.forth.common.constant.AuthServerConstant; -import com.forth.gulimall.gulimallauthserver.vo.MemberRespVo; +import com.forth.gulimall.authserver.vo.MemberRespVo; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderServiceImpl.java index 76a8e3a8bfb860b125f9afcc3ed23069ccf67d9d..bfed852ecd805f3e76d88ec585777c9deb3d3796 100644 --- a/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderServiceImpl.java +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderServiceImpl.java @@ -4,9 +4,8 @@ import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.forth.common.exception.NoStockException; import com.forth.common.utils.R; -import com.forth.gulimall.gulimallauthserver.vo.MemberRespVo; +import com.forth.gulimall.authserver.vo.MemberRespVo; import com.forth.gulimall.order.constant.OrderConstant; -import com.forth.gulimall.order.dao.OrderItemDao; import com.forth.gulimall.order.entity.OrderItemEntity; import com.forth.gulimall.order.enume.OrderStatusEnum; import com.forth.gulimall.order.fegin.CartFeignService; @@ -39,12 +38,10 @@ import com.forth.common.utils.Query; import com.forth.gulimall.order.dao.OrderDao; import com.forth.gulimall.order.entity.OrderEntity; import com.forth.gulimall.order.service.OrderService; -import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; -import sun.nio.ch.ThreadPool; @Service("orderService") diff --git a/gulimall-order/src/main/resources/static/js/jquery-3.1.1.min.js b/gulimall-order/src/main/resources/static/js/jquery-3.1.1.min.js deleted file mode 100644 index 5f61386388d302fd656750868fdc0f9216d6ae7a..0000000000000000000000000000000000000000 --- a/gulimall-order/src/main/resources/static/js/jquery-3.1.1.min.js +++ /dev/null @@ -1,3242 +0,0 @@ -/*! jQuery v3.1.1 | (c) jQuery Foundation | 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.1.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 = r.isArray(d))) ? (e ? (e = !1, f = c && r.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) - }, - isArray: Array.isArray, - 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) - }, - nodeName: function(a, b) { - return a.nodeName && a.nodeName.toLowerCase() === b.toLowerCase() - }, - 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 = { - ID: new RegExp("^#(" + L + ")"), - CLASS: new RegExp("^\\.(" + L + ")"), - TAG: new RegExp("^(" + L + "|[*])"), - ATTR: new RegExp("^" + M), - PSEUDO: new RegExp("^" + N), - CHILD: new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + K + "*(even|odd|(([+-]|)(\\d*)n|)" + K + "*(?:([+-]|)" + K + "*(\\d+)|))" + K + "*\\)|)", "i"), - bool: new RegExp("^(?:" + J + ")$", "i"), - needsContext: new RegExp("^" + K + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + K + "*((?:-\\d)?\\d*)" + K + "*\\)|)(?=[^-]|$)", "i") - }, - W = /^(?:input|select|textarea|button)$/i, - X = /^h\d$/i, - Y = /^[^{]+\{\s*\[native \w/, - Z = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - $ = /[+~]/, - _ = new RegExp("\\\\([\\da-f]{1,6}" + K + "?|(" + K + ")|.)", "ig"), - aa = function(a, b, c) { - var d = "0x" + b - 65536; - return d !== d || c ? b : d < 0 ? String.fromCharCode(d + 65536) : String.fromCharCode(d >> 10 | 55296, 1023 & d | 56320) - }, - ba = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g, - ca = function(a, b) { - return b ? "\0" === a ? "\ufffd" : a.slice(0, -1) + "\\" + a.charCodeAt(a.length - 1).toString(16) + " " : "\\" + a - }, - da = function() { - m() - }, - ea = ta(function(a) { - return a.disabled === !0 && ("form" in a || "label" in a) - }, { - dir: "parentNode", - next: "legend" - }); - try { - G.apply(D = H.call(v.childNodes), v.childNodes), D[v.childNodes.length].nodeType - } catch(fa) { - G = { - apply: D.length ? function(a, b) { - F.apply(a, H.call(b)) - } : function(a, b) { - var c = a.length, - d = 0; - while(a[c++] = b[d++]); - a.length = c - 1 - } - } - } - - function ga(a, b, d, e) { - var f, h, j, k, l, o, r, s = b && b.ownerDocument, - w = b ? b.nodeType : 9; - if(d = d || [], "string" != typeof a || !a || 1 !== w && 9 !== w && 11 !== w) return d; - if(!e && ((b ? b.ownerDocument || b : v) !== n && m(b), b = b || n, p)) { - if(11 !== w && (l = Z.exec(a))) - if(f = l[1]) { - if(9 === w) { - if(!(j = b.getElementById(f))) return d; - if(j.id === f) return d.push(j), d - } else if(s && (j = s.getElementById(f)) && t(b, j) && j.id === f) return d.push(j), d - } else { - if(l[2]) return G.apply(d, b.getElementsByTagName(a)), d; - if((f = l[3]) && c.getElementsByClassName && b.getElementsByClassName) return G.apply(d, b.getElementsByClassName(f)), d - } - if(c.qsa && !A[a + " "] && (!q || !q.test(a))) { - if(1 !== w) s = b, r = a; - else if("object" !== b.nodeName.toLowerCase()) { - (k = b.getAttribute("id")) ? k = k.replace(ba, ca): b.setAttribute("id", k = u), o = g(a), h = o.length; - while(h--) o[h] = "#" + k + " " + sa(o[h]); - r = o.join(","), s = $.test(a) && qa(b.parentNode) || b - } - if(r) try { - return G.apply(d, s.querySelectorAll(r)), d - } catch(x) {} finally { - k === u && b.removeAttribute("id") - } - } - } - return i(a.replace(P, "$1"), b, d, e) - } - - function ha() { - var a = []; - - function b(c, e) { - return a.push(c + " ") > d.cacheLength && delete b[a.shift()], b[c + " "] = e - } - return b - } - - function ia(a) { - return a[u] = !0, a - } - - function ja(a) { - var b = n.createElement("fieldset"); - try { - return !!a(b) - } catch(c) { - return !1 - } finally { - b.parentNode && b.parentNode.removeChild(b), b = null - } - } - - function ka(a, b) { - var c = a.split("|"), - e = c.length; - while(e--) d.attrHandle[c[e]] = b - } - - function la(a, b) { - var c = b && a, - d = c && 1 === a.nodeType && 1 === b.nodeType && a.sourceIndex - b.sourceIndex; - if(d) return d; - if(c) - while(c = c.nextSibling) - if(c === b) return -1; - return a ? 1 : -1 - } - - function ma(a) { - return function(b) { - var c = b.nodeName.toLowerCase(); - return "input" === c && b.type === a - } - } - - function na(a) { - return function(b) { - var c = b.nodeName.toLowerCase(); - return("input" === c || "button" === c) && b.type === a - } - } - - function oa(a) { - return function(b) { - return "form" in b ? b.parentNode && b.disabled === !1 ? "label" in b ? "label" in b.parentNode ? b.parentNode.disabled === a : b.disabled === a : b.isDisabled === a || b.isDisabled !== !a && ea(b) === a : b.disabled === a : "label" in b && b.disabled === a - } - } - - function pa(a) { - return ia(function(b) { - return b = +b, ia(function(c, d) { - var e, f = a([], c.length, b), - g = f.length; - while(g--) c[e = f[g]] && (c[e] = !(d[e] = c[e])) - }) - }) - } - - function qa(a) { - return a && "undefined" != typeof a.getElementsByTagName && a - } - c = ga.support = {}, f = ga.isXML = function(a) { - var b = a && (a.ownerDocument || a).documentElement; - return !!b && "HTML" !== b.nodeName - }, m = ga.setDocument = function(a) { - var b, e, g = a ? a.ownerDocument || a : v; - return g !== n && 9 === g.nodeType && g.documentElement ? (n = g, o = n.documentElement, p = !f(n), v !== n && (e = n.defaultView) && e.top !== e && (e.addEventListener ? e.addEventListener("unload", da, !1) : e.attachEvent && e.attachEvent("onunload", da)), c.attributes = ja(function(a) { - return a.className = "i", !a.getAttribute("className") - }), c.getElementsByTagName = ja(function(a) { - return a.appendChild(n.createComment("")), !a.getElementsByTagName("*").length - }), c.getElementsByClassName = Y.test(n.getElementsByClassName), c.getById = ja(function(a) { - return o.appendChild(a).id = u, !n.getElementsByName || !n.getElementsByName(u).length - }), c.getById ? (d.filter.ID = function(a) { - var b = a.replace(_, aa); - return function(a) { - return a.getAttribute("id") === b - } - }, d.find.ID = function(a, b) { - if("undefined" != typeof b.getElementById && p) { - var c = b.getElementById(a); - return c ? [c] : [] - } - }) : (d.filter.ID = function(a) { - var b = a.replace(_, aa); - return function(a) { - var c = "undefined" != typeof a.getAttributeNode && a.getAttributeNode("id"); - return c && c.value === b - } - }, d.find.ID = function(a, b) { - if("undefined" != typeof b.getElementById && p) { - var c, d, e, f = b.getElementById(a); - if(f) { - if(c = f.getAttributeNode("id"), c && c.value === a) return [f]; - e = b.getElementsByName(a), d = 0; - while(f = e[d++]) - if(c = f.getAttributeNode("id"), c && c.value === a) return [f] - } - return [] - } - }), d.find.TAG = c.getElementsByTagName ? function(a, b) { - return "undefined" != typeof b.getElementsByTagName ? b.getElementsByTagName(a) : c.qsa ? b.querySelectorAll(a) : void 0 - } : function(a, b) { - var c, d = [], - e = 0, - f = b.getElementsByTagName(a); - if("*" === a) { - while(c = f[e++]) 1 === c.nodeType && d.push(c); - return d - } - return f - }, d.find.CLASS = c.getElementsByClassName && function(a, b) { - if("undefined" != typeof b.getElementsByClassName && p) return b.getElementsByClassName(a) - }, r = [], q = [], (c.qsa = Y.test(n.querySelectorAll)) && (ja(function(a) { - o.appendChild(a).innerHTML = "", a.querySelectorAll("[msallowcapture^='']").length && q.push("[*^$]=" + K + "*(?:''|\"\")"), a.querySelectorAll("[selected]").length || q.push("\\[" + K + "*(?:value|" + J + ")"), a.querySelectorAll("[id~=" + u + "-]").length || q.push("~="), a.querySelectorAll(":checked").length || q.push(":checked"), a.querySelectorAll("a#" + u + "+*").length || q.push(".#.+[+~]") - }), ja(function(a) { - a.innerHTML = ""; - var b = n.createElement("input"); - b.setAttribute("type", "hidden"), a.appendChild(b).setAttribute("name", "D"), a.querySelectorAll("[name=d]").length && q.push("name" + K + "*[*^$|!~]?="), 2 !== a.querySelectorAll(":enabled").length && q.push(":enabled", ":disabled"), o.appendChild(a).disabled = !0, 2 !== a.querySelectorAll(":disabled").length && q.push(":enabled", ":disabled"), a.querySelectorAll("*,:x"), q.push(",.*:") - })), (c.matchesSelector = Y.test(s = o.matches || o.webkitMatchesSelector || o.mozMatchesSelector || o.oMatchesSelector || o.msMatchesSelector)) && ja(function(a) { - c.disconnectedMatch = s.call(a, "*"), s.call(a, "[s!='']:x"), r.push("!=", N) - }), q = q.length && new RegExp(q.join("|")), r = r.length && new RegExp(r.join("|")), b = Y.test(o.compareDocumentPosition), t = b || Y.test(o.contains) ? function(a, b) { - var c = 9 === a.nodeType ? a.documentElement : a, - d = b && b.parentNode; - return a === d || !(!d || 1 !== d.nodeType || !(c.contains ? c.contains(d) : a.compareDocumentPosition && 16 & a.compareDocumentPosition(d))) - } : function(a, b) { - if(b) - while(b = b.parentNode) - if(b === a) return !0; - return !1 - }, B = b ? function(a, b) { - if(a === b) return l = !0, 0; - var d = !a.compareDocumentPosition - !b.compareDocumentPosition; - return d ? d : (d = (a.ownerDocument || a) === (b.ownerDocument || b) ? a.compareDocumentPosition(b) : 1, 1 & d || !c.sortDetached && b.compareDocumentPosition(a) === d ? a === n || a.ownerDocument === v && t(v, a) ? -1 : b === n || b.ownerDocument === v && t(v, b) ? 1 : k ? I(k, a) - I(k, b) : 0 : 4 & d ? -1 : 1) - } : function(a, b) { - if(a === b) return l = !0, 0; - var c, d = 0, - e = a.parentNode, - f = b.parentNode, - g = [a], - h = [b]; - if(!e || !f) return a === n ? -1 : b === n ? 1 : e ? -1 : f ? 1 : k ? I(k, a) - I(k, b) : 0; - if(e === f) return la(a, b); - c = a; - while(c = c.parentNode) g.unshift(c); - c = b; - while(c = c.parentNode) h.unshift(c); - while(g[d] === h[d]) d++; - return d ? la(g[d], h[d]) : g[d] === v ? -1 : h[d] === v ? 1 : 0 - }, n) : n - }, ga.matches = function(a, b) { - return ga(a, null, null, b) - }, ga.matchesSelector = function(a, b) { - if((a.ownerDocument || a) !== n && m(a), b = b.replace(S, "='$1']"), c.matchesSelector && p && !A[b + " "] && (!r || !r.test(b)) && (!q || !q.test(b))) try { - var d = s.call(a, b); - if(d || c.disconnectedMatch || a.document && 11 !== a.document.nodeType) return d - } catch(e) {} - return ga(b, n, null, [a]).length > 0 - }, ga.contains = function(a, b) { - return(a.ownerDocument || a) !== n && m(a), t(a, b) - }, ga.attr = function(a, b) { - (a.ownerDocument || a) !== n && m(a); - var e = d.attrHandle[b.toLowerCase()], - f = e && C.call(d.attrHandle, b.toLowerCase()) ? e(a, b, !p) : void 0; - return void 0 !== f ? f : c.attributes || !p ? a.getAttribute(b) : (f = a.getAttributeNode(b)) && f.specified ? f.value : null - }, ga.escape = function(a) { - return(a + "").replace(ba, ca) - }, ga.error = function(a) { - throw new Error("Syntax error, unrecognized expression: " + a) - }, ga.uniqueSort = function(a) { - var b, d = [], - e = 0, - f = 0; - if(l = !c.detectDuplicates, k = !c.sortStable && a.slice(0), a.sort(B), l) { - while(b = a[f++]) b === a[f] && (e = d.push(f)); - while(e--) a.splice(d[e], 1) - } - return k = null, a - }, e = ga.getText = function(a) { - var b, c = "", - d = 0, - f = a.nodeType; - if(f) { - if(1 === f || 9 === f || 11 === f) { - if("string" == typeof a.textContent) return a.textContent; - for(a = a.firstChild; a; a = a.nextSibling) c += e(a) - } else if(3 === f || 4 === f) return a.nodeValue - } else - while(b = a[d++]) c += e(b); - return c - }, d = ga.selectors = { - cacheLength: 50, - createPseudo: ia, - match: V, - attrHandle: {}, - find: {}, - relative: { - ">": { - dir: "parentNode", - first: !0 - }, - " ": { - dir: "parentNode" - }, - "+": { - dir: "previousSibling", - first: !0 - }, - "~": { - dir: "previousSibling" - } - }, - preFilter: { - ATTR: function(a) { - return a[1] = a[1].replace(_, aa), a[3] = (a[3] || a[4] || a[5] || "").replace(_, aa), "~=" === a[2] && (a[3] = " " + a[3] + " "), a.slice(0, 4) - }, - CHILD: function(a) { - return a[1] = a[1].toLowerCase(), "nth" === a[1].slice(0, 3) ? (a[3] || ga.error(a[0]), a[4] = +(a[4] ? a[5] + (a[6] || 1) : 2 * ("even" === a[3] || "odd" === a[3])), a[5] = +(a[7] + a[8] || "odd" === a[3])) : a[3] && ga.error(a[0]), a - }, - PSEUDO: function(a) { - var b, c = !a[6] && a[2]; - return V.CHILD.test(a[0]) ? null : (a[3] ? a[2] = a[4] || a[5] || "" : c && T.test(c) && (b = g(c, !0)) && (b = c.indexOf(")", c.length - b) - c.length) && (a[0] = a[0].slice(0, b), a[2] = c.slice(0, b)), a.slice(0, 3)) - } - }, - filter: { - TAG: function(a) { - var b = a.replace(_, aa).toLowerCase(); - return "*" === a ? function() { - return !0 - } : function(a) { - return a.nodeName && a.nodeName.toLowerCase() === b - } - }, - CLASS: function(a) { - var b = y[a + " "]; - return b || (b = new RegExp("(^|" + K + ")" + a + "(" + K + "|$)")) && y(a, function(a) { - return b.test("string" == typeof a.className && a.className || "undefined" != typeof a.getAttribute && a.getAttribute("class") || "") - }) - }, - ATTR: function(a, b, c) { - return function(d) { - var e = ga.attr(d, a); - return null == e ? "!=" === b : !b || (e += "", "=" === b ? e === c : "!=" === b ? e !== c : "^=" === b ? c && 0 === e.indexOf(c) : "*=" === b ? c && e.indexOf(c) > -1 : "$=" === b ? c && e.slice(-c.length) === c : "~=" === b ? (" " + e.replace(O, " ") + " ").indexOf(c) > -1 : "|=" === b && (e === c || e.slice(0, c.length + 1) === c + "-")) - } - }, - CHILD: function(a, b, c, d, e) { - var f = "nth" !== a.slice(0, 3), - g = "last" !== a.slice(-4), - h = "of-type" === b; - return 1 === d && 0 === e ? function(a) { - return !!a.parentNode - } : function(b, c, i) { - var j, k, l, m, n, o, p = f !== g ? "nextSibling" : "previousSibling", - q = b.parentNode, - r = h && b.nodeName.toLowerCase(), - s = !i && !h, - t = !1; - if(q) { - if(f) { - while(p) { - m = b; - while(m = m[p]) - if(h ? m.nodeName.toLowerCase() === r : 1 === m.nodeType) return !1; - o = p = "only" === a && !o && "nextSibling" - } - return !0 - } - if(o = [g ? q.firstChild : q.lastChild], g && s) { - m = q, l = m[u] || (m[u] = {}), k = l[m.uniqueID] || (l[m.uniqueID] = {}), j = k[a] || [], n = j[0] === w && j[1], t = n && j[2], m = n && q.childNodes[n]; - while(m = ++n && m && m[p] || (t = n = 0) || o.pop()) - if(1 === m.nodeType && ++t && m === b) { - k[a] = [w, n, t]; - break - } - } else if(s && (m = b, l = m[u] || (m[u] = {}), k = l[m.uniqueID] || (l[m.uniqueID] = {}), j = k[a] || [], n = j[0] === w && j[1], t = n), t === !1) - while(m = ++n && m && m[p] || (t = n = 0) || o.pop()) - if((h ? m.nodeName.toLowerCase() === r : 1 === m.nodeType) && ++t && (s && (l = m[u] || (m[u] = {}), k = l[m.uniqueID] || (l[m.uniqueID] = {}), k[a] = [w, t]), m === b)) break; - return t -= e, t === d || t % d === 0 && t / d >= 0 - } - } - }, - PSEUDO: function(a, b) { - var c, e = d.pseudos[a] || d.setFilters[a.toLowerCase()] || ga.error("unsupported pseudo: " + a); - return e[u] ? e(b) : e.length > 1 ? (c = [a, a, "", b], d.setFilters.hasOwnProperty(a.toLowerCase()) ? ia(function(a, c) { - var d, f = e(a, b), - g = f.length; - while(g--) d = I(a, f[g]), a[d] = !(c[d] = f[g]) - }) : function(a) { - return e(a, 0, c) - }) : e - } - }, - pseudos: { - not: ia(function(a) { - var b = [], - c = [], - d = h(a.replace(P, "$1")); - return d[u] ? ia(function(a, b, c, e) { - var f, g = d(a, null, e, []), - h = a.length; - while(h--)(f = g[h]) && (a[h] = !(b[h] = f)) - }) : function(a, e, f) { - return b[0] = a, d(b, null, f, c), b[0] = null, !c.pop() - } - }), - has: ia(function(a) { - return function(b) { - return ga(a, b).length > 0 - } - }), - contains: ia(function(a) { - return a = a.replace(_, aa), - function(b) { - return(b.textContent || b.innerText || e(b)).indexOf(a) > -1 - } - }), - lang: ia(function(a) { - return U.test(a || "") || ga.error("unsupported lang: " + a), a = a.replace(_, aa).toLowerCase(), - function(b) { - var c; - do - if(c = p ? b.lang : b.getAttribute("xml:lang") || b.getAttribute("lang")) return c = c.toLowerCase(), c === a || 0 === c.indexOf(a + "-"); - while((b = b.parentNode) && 1 === b.nodeType); - return !1 - } - }), - target: function(b) { - var c = a.location && a.location.hash; - return c && c.slice(1) === b.id - }, - root: function(a) { - return a === o - }, - focus: function(a) { - return a === n.activeElement && (!n.hasFocus || n.hasFocus()) && !!(a.type || a.href || ~a.tabIndex) - }, - enabled: oa(!1), - disabled: oa(!0), - checked: function(a) { - var b = a.nodeName.toLowerCase(); - return "input" === b && !!a.checked || "option" === b && !!a.selected - }, - selected: function(a) { - return a.parentNode && a.parentNode.selectedIndex, a.selected === !0 - }, - empty: function(a) { - for(a = a.firstChild; a; a = a.nextSibling) - if(a.nodeType < 6) return !1; - return !0 - }, - parent: function(a) { - return !d.pseudos.empty(a) - }, - header: function(a) { - return X.test(a.nodeName) - }, - input: function(a) { - return W.test(a.nodeName) - }, - button: function(a) { - var b = a.nodeName.toLowerCase(); - return "input" === b && "button" === a.type || "button" === b - }, - text: function(a) { - var b; - return "input" === a.nodeName.toLowerCase() && "text" === a.type && (null == (b = a.getAttribute("type")) || "text" === b.toLowerCase()) - }, - first: pa(function() { - return [0] - }), - last: pa(function(a, b) { - return [b - 1] - }), - eq: pa(function(a, b, c) { - return [c < 0 ? c + b : c] - }), - even: pa(function(a, b) { - for(var c = 0; c < b; c += 2) a.push(c); - return a - }), - odd: pa(function(a, b) { - for(var c = 1; c < b; c += 2) a.push(c); - return a - }), - lt: pa(function(a, b, c) { - for(var d = c < 0 ? c + b : c; --d >= 0;) a.push(d); - return a - }), - gt: pa(function(a, b, c) { - for(var d = c < 0 ? c + b : c; ++d < b;) a.push(d); - return a - }) - } - }, d.pseudos.nth = d.pseudos.eq; - for(b in { - radio: !0, - checkbox: !0, - file: !0, - password: !0, - image: !0 - }) d.pseudos[b] = ma(b); - for(b in { - submit: !0, - reset: !0 - }) d.pseudos[b] = na(b); - - function ra() {} - ra.prototype = d.filters = d.pseudos, d.setFilters = new ra, g = ga.tokenize = function(a, b) { - var c, e, f, g, h, i, j, k = z[a + " "]; - if(k) return b ? 0 : k.slice(0); - h = a, i = [], j = d.preFilter; - while(h) { - c && !(e = Q.exec(h)) || (e && (h = h.slice(e[0].length) || h), i.push(f = [])), c = !1, (e = R.exec(h)) && (c = e.shift(), f.push({ - value: c, - type: e[0].replace(P, " ") - }), h = h.slice(c.length)); - for(g in d.filter) !(e = V[g].exec(h)) || j[g] && !(e = j[g](e)) || (c = e.shift(), f.push({ - value: c, - type: g, - matches: e - }), h = h.slice(c.length)); - if(!c) break - } - return b ? h.length : h ? ga.error(a) : z(a, i).slice(0) - }; - - function sa(a) { - for(var b = 0, c = a.length, d = ""; b < c; b++) d += a[b].value; - return d - } - - function ta(a, b, c) { - var d = b.dir, - e = b.next, - f = e || d, - g = c && "parentNode" === f, - h = x++; - return b.first ? function(b, c, e) { - while(b = b[d]) - if(1 === b.nodeType || g) return a(b, c, e); - return !1 - } : function(b, c, i) { - var j, k, l, m = [w, h]; - if(i) { - while(b = b[d]) - if((1 === b.nodeType || g) && a(b, c, i)) return !0 - } else - while(b = b[d]) - if(1 === b.nodeType || g) - if(l = b[u] || (b[u] = {}), k = l[b.uniqueID] || (l[b.uniqueID] = {}), e && e === b.nodeName.toLowerCase()) b = b[d] || b; - else { - if((j = k[f]) && j[0] === w && j[1] === h) return m[2] = j[2]; - if(k[f] = m, m[2] = a(b, c, i)) return !0 - } return !1 - } - } - - function ua(a) { - return a.length > 1 ? function(b, c, d) { - var e = a.length; - while(e--) - if(!a[e](b, c, d)) return !1; - return !0 - } : a[0] - } - - function va(a, b, c) { - for(var d = 0, e = b.length; d < e; d++) ga(a, b[d], c); - return c - } - - function wa(a, b, c, d, e) { - for(var f, g = [], h = 0, i = a.length, j = null != b; h < i; h++)(f = a[h]) && (c && !c(f, d, e) || (g.push(f), j && b.push(h))); - return g - } - - function xa(a, b, c, d, e, f) { - return d && !d[u] && (d = xa(d)), e && !e[u] && (e = xa(e, f)), ia(function(f, g, h, i) { - var j, k, l, m = [], - n = [], - o = g.length, - p = f || va(b || "*", h.nodeType ? [h] : h, []), - q = !a || !f && b ? p : wa(p, m, a, h, i), - r = c ? e || (f ? a : o || d) ? [] : g : q; - if(c && c(q, r, h, i), d) { - j = wa(r, n), d(j, [], h, i), k = j.length; - while(k--)(l = j[k]) && (r[n[k]] = !(q[n[k]] = l)) - } - if(f) { - if(e || a) { - if(e) { - j = [], k = r.length; - while(k--)(l = r[k]) && j.push(q[k] = l); - e(null, r = [], j, i) - } - k = r.length; - while(k--)(l = r[k]) && (j = e ? I(f, l) : m[k]) > -1 && (f[j] = !(g[j] = l)) - } - } else r = wa(r === g ? r.splice(o, r.length) : r), e ? e(null, g, r, i) : G.apply(g, r) - }) - } - - function ya(a) { - for(var b, c, e, f = a.length, g = d.relative[a[0].type], h = g || d.relative[" "], i = g ? 1 : 0, k = ta(function(a) { - return a === b - }, h, !0), l = ta(function(a) { - return I(b, a) > -1 - }, h, !0), m = [function(a, c, d) { - var e = !g && (d || c !== j) || ((b = c).nodeType ? k(a, c, d) : l(a, c, d)); - return b = null, e - }]; i < f; i++) - if(c = d.relative[a[i].type]) m = [ta(ua(m), c)]; - else { - if(c = d.filter[a[i].type].apply(null, a[i].matches), c[u]) { - for(e = ++i; e < f; e++) - if(d.relative[a[e].type]) break; - return xa(i > 1 && ua(m), i > 1 && sa(a.slice(0, i - 1).concat({ - value: " " === a[i - 2].type ? "*" : "" - })).replace(P, "$1"), c, i < e && ya(a.slice(i, e)), e < f && ya(a = a.slice(e)), e < f && sa(a)) - } - m.push(c) - } - return ua(m) - } - - function za(a, b) { - var c = b.length > 0, - e = a.length > 0, - f = function(f, g, h, i, k) { - var l, o, q, r = 0, - s = "0", - t = f && [], - u = [], - v = j, - x = f || e && d.find.TAG("*", k), - y = w += null == v ? 1 : Math.random() || .1, - z = x.length; - for(k && (j = g === n || g || k); s !== z && null != (l = x[s]); s++) { - if(e && l) { - o = 0, g || l.ownerDocument === n || (m(l), h = !p); - while(q = a[o++]) - if(q(l, g || n, h)) { - i.push(l); - break - } - k && (w = y) - } - c && ((l = !q && l) && r--, f && t.push(l)) - } - if(r += s, c && s !== r) { - o = 0; - while(q = b[o++]) q(t, u, g, h); - if(f) { - if(r > 0) - while(s--) t[s] || u[s] || (u[s] = E.call(i)); - u = wa(u) - } - G.apply(i, u), k && !f && u.length > 0 && r + b.length > 1 && ga.uniqueSort(i) - } - return k && (w = y, j = v), t - }; - return c ? ia(f) : f - } - return h = ga.compile = function(a, b) { - var c, d = [], - e = [], - f = A[a + " "]; - if(!f) { - b || (b = g(a)), c = b.length; - while(c--) f = ya(b[c]), f[u] ? d.push(f) : e.push(f); - f = A(a, za(e, d)), f.selector = a - } - return f - }, i = ga.select = function(a, b, c, e) { - var f, i, j, k, l, m = "function" == typeof a && a, - n = !e && g(a = m.selector || a); - if(c = c || [], 1 === n.length) { - if(i = n[0] = n[0].slice(0), i.length > 2 && "ID" === (j = i[0]).type && 9 === b.nodeType && p && d.relative[i[1].type]) { - if(b = (d.find.ID(j.matches[0].replace(_, aa), b) || [])[0], !b) return c; - m && (b = b.parentNode), a = a.slice(i.shift().value.length) - } - f = V.needsContext.test(a) ? 0 : i.length; - while(f--) { - if(j = i[f], d.relative[k = j.type]) break; - if((l = d.find[k]) && (e = l(j.matches[0].replace(_, aa), $.test(i[0].type) && qa(b.parentNode) || b))) { - if(i.splice(f, 1), a = e.length && sa(i), !a) return G.apply(c, e), c; - break - } - } - } - return(m || h(a, n))(e, b, !p, c, !b || $.test(a) && qa(b.parentNode) || b), c - }, c.sortStable = u.split("").sort(B).join("") === u, c.detectDuplicates = !!l, m(), c.sortDetached = ja(function(a) { - return 1 & a.compareDocumentPosition(n.createElement("fieldset")) - }), ja(function(a) { - return a.innerHTML = "", "#" === a.firstChild.getAttribute("href") - }) || ka("type|href|height|width", function(a, b, c) { - if(!c) return a.getAttribute(b, "type" === b.toLowerCase() ? 1 : 2) - }), c.attributes && ja(function(a) { - return a.innerHTML = "", a.firstChild.setAttribute("value", ""), "" === a.firstChild.getAttribute("value") - }) || ka("value", function(a, b, c) { - if(!c && "input" === a.nodeName.toLowerCase()) return a.defaultValue - }), ja(function(a) { - return null == a.getAttribute("disabled") - }) || ka(J, function(a, b, c) { - var d; - if(!c) return a[b] === !0 ? b.toLowerCase() : (d = a.getAttributeNode(b)) && d.specified ? d.value : null - }), ga - }(a); - r.find = x, r.expr = x.selectors, r.expr[":"] = r.expr.pseudos, r.uniqueSort = r.unique = x.uniqueSort, r.text = x.getText, r.isXMLDoc = x.isXML, r.contains = x.contains, r.escapeSelector = x.escape; - var y = function(a, b, c) { - var d = [], - e = void 0 !== c; - while((a = a[b]) && 9 !== a.nodeType) - if(1 === a.nodeType) { - if(e && r(a).is(c)) break; - d.push(a) - } - return d - }, - z = function(a, b) { - for(var c = []; a; a = a.nextSibling) 1 === a.nodeType && a !== b && c.push(a); - return c - }, - A = r.expr.match.needsContext, - B = /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i, - C = /^.[^:#\[\.,]*$/; - - function D(a, b, c) { - return r.isFunction(b) ? r.grep(a, function(a, d) { - return !!b.call(a, d, a) !== c - }) : b.nodeType ? r.grep(a, function(a) { - return a === b !== c - }) : "string" != typeof b ? r.grep(a, function(a) { - return i.call(b, a) > -1 !== c - }) : C.test(b) ? r.filter(b, a, c) : (b = r.filter(b, a), r.grep(a, function(a) { - return i.call(b, a) > -1 !== c && 1 === a.nodeType - })) - } - r.filter = function(a, b, c) { - var d = b[0]; - return c && (a = ":not(" + a + ")"), 1 === b.length && 1 === d.nodeType ? r.find.matchesSelector(d, a) ? [d] : [] : r.find.matches(a, r.grep(b, function(a) { - return 1 === a.nodeType - })) - }, r.fn.extend({ - find: function(a) { - var b, c, d = this.length, - e = this; - if("string" != typeof a) return this.pushStack(r(a).filter(function() { - for(b = 0; b < d; b++) - if(r.contains(e[b], this)) return !0 - })); - for(c = this.pushStack([]), b = 0; b < d; b++) r.find(a, e[b], c); - return d > 1 ? r.uniqueSort(c) : c - }, - filter: function(a) { - return this.pushStack(D(this, a || [], !1)) - }, - not: function(a) { - return this.pushStack(D(this, a || [], !0)) - }, - is: function(a) { - return !!D(this, "string" == typeof a && A.test(a) ? r(a) : a || [], !1).length - } - }); - var E, F = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/, - G = r.fn.init = function(a, b, c) { - var e, f; - if(!a) return this; - if(c = c || E, "string" == typeof a) { - if(e = "<" === a[0] && ">" === a[a.length - 1] && a.length >= 3 ? [null, a, null] : F.exec(a), !e || !e[1] && b) return !b || b.jquery ? (b || c).find(a) : this.constructor(b).find(a); - if(e[1]) { - if(b = b instanceof r ? b[0] : b, r.merge(this, r.parseHTML(e[1], b && b.nodeType ? b.ownerDocument || b : d, !0)), B.test(e[1]) && r.isPlainObject(b)) - for(e in b) r.isFunction(this[e]) ? this[e](b[e]) : this.attr(e, b[e]); - return this - } - return f = d.getElementById(e[2]), f && (this[0] = f, this.length = 1), this - } - return a.nodeType ? (this[0] = a, this.length = 1, this) : r.isFunction(a) ? void 0 !== c.ready ? c.ready(a) : a(r) : r.makeArray(a, this) - }; - G.prototype = r.fn, E = r(d); - var H = /^(?:parents|prev(?:Until|All))/, - I = { - children: !0, - contents: !0, - next: !0, - prev: !0 - }; - r.fn.extend({ - has: function(a) { - var b = r(a, this), - c = b.length; - return this.filter(function() { - for(var a = 0; a < c; a++) - if(r.contains(this, b[a])) return !0 - }) - }, - closest: function(a, b) { - var c, d = 0, - e = this.length, - f = [], - g = "string" != typeof a && r(a); - if(!A.test(a)) - for(; d < e; d++) - for(c = this[d]; c && c !== b; c = c.parentNode) - if(c.nodeType < 11 && (g ? g.index(c) > -1 : 1 === c.nodeType && r.find.matchesSelector(c, a))) { - f.push(c); - break - } - return this.pushStack(f.length > 1 ? r.uniqueSort(f) : f) - }, - index: function(a) { - return a ? "string" == typeof a ? i.call(r(a), this[0]) : i.call(this, a.jquery ? a[0] : a) : this[0] && this[0].parentNode ? this.first().prevAll().length : -1 - }, - add: function(a, b) { - return this.pushStack(r.uniqueSort(r.merge(this.get(), r(a, b)))) - }, - addBack: function(a) { - return this.add(null == a ? this.prevObject : this.prevObject.filter(a)) - } - }); - - function J(a, b) { - while((a = a[b]) && 1 !== a.nodeType); - return a - } - r.each({ - parent: function(a) { - var b = a.parentNode; - return b && 11 !== b.nodeType ? b : null - }, - parents: function(a) { - return y(a, "parentNode") - }, - parentsUntil: function(a, b, c) { - return y(a, "parentNode", c) - }, - next: function(a) { - return J(a, "nextSibling") - }, - prev: function(a) { - return J(a, "previousSibling") - }, - nextAll: function(a) { - return y(a, "nextSibling") - }, - prevAll: function(a) { - return y(a, "previousSibling") - }, - nextUntil: function(a, b, c) { - return y(a, "nextSibling", c) - }, - prevUntil: function(a, b, c) { - return y(a, "previousSibling", c) - }, - siblings: function(a) { - return z((a.parentNode || {}).firstChild, a) - }, - children: function(a) { - return z(a.firstChild) - }, - contents: function(a) { - return a.contentDocument || r.merge([], a.childNodes) - } - }, function(a, b) { - r.fn[a] = function(c, d) { - var e = r.map(this, b, c); - return "Until" !== a.slice(-5) && (d = c), d && "string" == typeof d && (e = r.filter(d, e)), this.length > 1 && (I[a] || r.uniqueSort(e), H.test(a) && e.reverse()), this.pushStack(e) - } - }); - var K = /[^\x20\t\r\n\f]+/g; - - function L(a) { - var b = {}; - return r.each(a.match(K) || [], function(a, c) { - b[c] = !0 - }), b - } - r.Callbacks = function(a) { - a = "string" == typeof a ? L(a) : r.extend({}, a); - var b, c, d, e, f = [], - g = [], - h = -1, - i = function() { - for(e = a.once, d = b = !0; g.length; h = -1) { - c = g.shift(); - while(++h < f.length) f[h].apply(c[0], c[1]) === !1 && a.stopOnFalse && (h = f.length, c = !1) - } - a.memory || (c = !1), b = !1, e && (f = c ? [] : "") - }, - j = { - add: function() { - return f && (c && !b && (h = f.length - 1, g.push(c)), function d(b) { - r.each(b, function(b, c) { - r.isFunction(c) ? a.unique && j.has(c) || f.push(c) : c && c.length && "string" !== r.type(c) && d(c) - }) - }(arguments), c && !b && i()), this - }, - remove: function() { - return r.each(arguments, function(a, b) { - var c; - while((c = r.inArray(b, f, c)) > -1) f.splice(c, 1), c <= h && h-- - }), this - }, - has: function(a) { - return a ? r.inArray(a, f) > -1 : f.length > 0 - }, - empty: function() { - return f && (f = []), this - }, - disable: function() { - return e = g = [], f = c = "", this - }, - disabled: function() { - return !f - }, - lock: function() { - return e = g = [], c || b || (f = c = ""), this - }, - locked: function() { - return !!e - }, - fireWith: function(a, c) { - return e || (c = c || [], c = [a, c.slice ? c.slice() : c], g.push(c), b || i()), this - }, - fire: function() { - return j.fireWith(this, arguments), this - }, - fired: function() { - return !!d - } - }; - return j - }; - - function M(a) { - return a - } - - function N(a) { - throw a - } - - function O(a, b, c) { - var d; - try { - a && r.isFunction(d = a.promise) ? d.call(a).done(b).fail(c) : a && r.isFunction(d = a.then) ? d.call(a, b, c) : b.call(void 0, a) - } catch(a) { - c.call(void 0, a) - } - } - r.extend({ - Deferred: function(b) { - var c = [ - ["notify", "progress", r.Callbacks("memory"), r.Callbacks("memory"), 2], - ["resolve", "done", r.Callbacks("once memory"), r.Callbacks("once memory"), 0, "resolved"], - ["reject", "fail", r.Callbacks("once memory"), r.Callbacks("once memory"), 1, "rejected"] - ], - d = "pending", - e = { - state: function() { - return d - }, - always: function() { - return f.done(arguments).fail(arguments), this - }, - "catch": function(a) { - return e.then(null, a) - }, - pipe: function() { - var a = arguments; - return r.Deferred(function(b) { - r.each(c, function(c, d) { - var e = r.isFunction(a[d[4]]) && a[d[4]]; - f[d[1]](function() { - var a = e && e.apply(this, arguments); - a && r.isFunction(a.promise) ? a.promise().progress(b.notify).done(b.resolve).fail(b.reject) : b[d[0] + "With"](this, e ? [a] : arguments) - }) - }), a = null - }).promise() - }, - then: function(b, d, e) { - var f = 0; - - function g(b, c, d, e) { - return function() { - var h = this, - i = arguments, - j = function() { - var a, j; - if(!(b < f)) { - if(a = d.apply(h, i), a === c.promise()) throw new TypeError("Thenable self-resolution"); - j = a && ("object" == typeof a || "function" == typeof a) && a.then, r.isFunction(j) ? e ? j.call(a, g(f, c, M, e), g(f, c, N, e)) : (f++, j.call(a, g(f, c, M, e), g(f, c, N, e), g(f, c, M, c.notifyWith))) : (d !== M && (h = void 0, i = [a]), (e || c.resolveWith)(h, i)) - } - }, - k = e ? j : function() { - try { - j() - } catch(a) { - r.Deferred.exceptionHook && r.Deferred.exceptionHook(a, k.stackTrace), b + 1 >= f && (d !== N && (h = void 0, i = [a]), c.rejectWith(h, i)) - } - }; - b ? k() : (r.Deferred.getStackHook && (k.stackTrace = r.Deferred.getStackHook()), a.setTimeout(k)) - } - } - return r.Deferred(function(a) { - c[0][3].add(g(0, a, r.isFunction(e) ? e : M, a.notifyWith)), c[1][3].add(g(0, a, r.isFunction(b) ? b : M)), c[2][3].add(g(0, a, r.isFunction(d) ? d : N)) - }).promise() - }, - promise: function(a) { - return null != a ? r.extend(a, e) : e - } - }, - f = {}; - return r.each(c, function(a, b) { - var g = b[2], - h = b[5]; - e[b[1]] = g.add, h && g.add(function() { - d = h - }, c[3 - a][2].disable, c[0][2].lock), g.add(b[3].fire), f[b[0]] = function() { - return f[b[0] + "With"](this === f ? void 0 : this, arguments), this - }, f[b[0] + "With"] = g.fireWith - }), e.promise(f), b && b.call(f, f), f - }, - when: function(a) { - var b = arguments.length, - c = b, - d = Array(c), - e = f.call(arguments), - g = r.Deferred(), - h = function(a) { - return function(c) { - d[a] = this, e[a] = arguments.length > 1 ? f.call(arguments) : c, --b || g.resolveWith(d, e) - } - }; - if(b <= 1 && (O(a, g.done(h(c)).resolve, g.reject), "pending" === g.state() || r.isFunction(e[c] && e[c].then))) return g.then(); - while(c--) O(e[c], h(c), g.reject); - return g.promise() - } - }); - var P = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/; - r.Deferred.exceptionHook = function(b, c) { - a.console && a.console.warn && b && P.test(b.name) && a.console.warn("jQuery.Deferred exception: " + b.message, b.stack, c) - }, r.readyException = function(b) { - a.setTimeout(function() { - throw b - }) - }; - var Q = r.Deferred(); - r.fn.ready = function(a) { - return Q.then(a)["catch"](function(a) { - r.readyException(a) - }), this - }, r.extend({ - isReady: !1, - readyWait: 1, - holdReady: function(a) { - a ? r.readyWait++ : r.ready(!0) - }, - ready: function(a) { - (a === !0 ? --r.readyWait : r.isReady) || (r.isReady = !0, a !== !0 && --r.readyWait > 0 || Q.resolveWith(d, [r])) - } - }), r.ready.then = Q.then; - - function R() { - d.removeEventListener("DOMContentLoaded", R), - a.removeEventListener("load", R), r.ready() - } - "complete" === d.readyState || "loading" !== d.readyState && !d.documentElement.doScroll ? a.setTimeout(r.ready) : (d.addEventListener("DOMContentLoaded", R), a.addEventListener("load", R)); - var S = 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) S(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 - }, - T = function(a) { - return 1 === a.nodeType || 9 === a.nodeType || !+a.nodeType - }; - - function U() { - this.expando = r.expando + U.uid++ - } - U.uid = 1, U.prototype = { - cache: function(a) { - var b = a[this.expando]; - return b || (b = {}, T(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) { - r.isArray(b) ? b = b.map(r.camelCase) : (b = r.camelCase(b), b = b in d ? [b] : b.match(K) || []), 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 V = new U, - W = new U, - X = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - Y = /[A-Z]/g; - - function Z(a) { - return "true" === a || "false" !== a && ("null" === a ? null : a === +a + "" ? +a : X.test(a) ? JSON.parse(a) : a) - } - - function $(a, b, c) { - var d; - if(void 0 === c && 1 === a.nodeType) - if(d = "data-" + b.replace(Y, "-$&").toLowerCase(), c = a.getAttribute(d), "string" == typeof c) { - try { - c = Z(c) - } catch(e) {} - W.set(a, b, c) - } else c = void 0; - return c - } - r.extend({ - hasData: function(a) { - return W.hasData(a) || V.hasData(a) - }, - data: function(a, b, c) { - return W.access(a, b, c) - }, - removeData: function(a, b) { - W.remove(a, b) - }, - _data: function(a, b, c) { - return V.access(a, b, c) - }, - _removeData: function(a, b) { - V.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 = W.get(f), 1 === f.nodeType && !V.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]))); - V.set(f, "hasDataAttrs", !0) - } - return e - } - return "object" == typeof a ? this.each(function() { - W.set(this, a) - }) : S(this, function(b) { - var c; - if(f && void 0 === b) { - if(c = W.get(f, a), void 0 !== c) return c; - if(c = $(f, a), void 0 !== c) return c - } else this.each(function() { - W.set(this, a, b) - }) - }, null, b, arguments.length > 1, null, !0) - }, - removeData: function(a) { - return this.each(function() { - W.remove(this, a) - }) - } - }), r.extend({ - queue: function(a, b, c) { - var d; - if(a) return b = (b || "fx") + "queue", d = V.get(a, b), c && (!d || r.isArray(c) ? d = V.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 V.get(a, c) || V.access(a, c, { - empty: r.Callbacks("once memory").add(function() { - V.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 = V.get(f[g], a + "queueHooks"), c && c.empty && (d++, c.empty.add(h)); - return h(), e.promise(b) - } - }); - var _ = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source, - aa = new RegExp("^(?:([+-])=|)(" + _ + ")([a-z%]*)$", "i"), - ba = ["Top", "Right", "Bottom", "Left"], - ca = function(a, b) { - return a = b || a, "none" === a.style.display || "" === a.style.display && r.contains(a.ownerDocument, a) && "none" === r.css(a, "display") - }, - da = 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 ea(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) && aa.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 fa = {}; - - function ga(a) { - var b, c = a.ownerDocument, - d = a.nodeName, - e = fa[d]; - return e ? e : (b = c.body.appendChild(c.createElement(d)), e = r.css(b, "display"), b.parentNode.removeChild(b), "none" === e && (e = "block"), fa[d] = e, e) - } - - function ha(a, b) { - for(var c, d, e = [], f = 0, g = a.length; f < g; f++) d = a[f], d.style && (c = d.style.display, b ? ("none" === c && (e[f] = V.get(d, "display") || null, e[f] || (d.style.display = "")), "" === d.style.display && ca(d) && (e[f] = ga(d))) : "none" !== c && (e[f] = "none", V.set(d, "display", c))); - for(f = 0; f < g; f++) null != e[f] && (a[f].style.display = e[f]); - return a - } - r.fn.extend({ - show: function() { - return ha(this, !0) - }, - hide: function() { - return ha(this) - }, - toggle: function(a) { - return "boolean" == typeof a ? a ? this.show() : this.hide() : this.each(function() { - ca(this) ? r(this).show() : r(this).hide() - }) - } - }); - var ia = /^(?:checkbox|radio)$/i, - ja = /<([a-z][^\/\0>\x20\t\r\n\f]+)/i, - ka = /^$|\/(?:java|ecma)script/i, - la = { - option: [1, ""], - thead: [1, "