🔖 Releasing / Version tags. 2.7.1

.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -1,4 +1,7 @@
+[pigx 相关问题请去此提，码云忽略](https://git.pig4cloud.com/pig/pigx/issues)
+
 ### 版本信息
+
 - pig版本:
 
 - 是否修改包名: 

pig-auth/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-auth</artifactId>
@@ -46,13 +46,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--security-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--JDBC相关-->
 		<dependency>

pig-codegen/pom.xml

@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-codegen</artifactId>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-swagger</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--注册中心客户端-->
 		<dependency>
@@ -53,30 +53,30 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-datasource</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-mybatis</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--common-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--日志处理-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-log</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--代码生成模板引擎-->
 		<dependency>

pig-common/pig-common-core/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-common-core</artifactId>

pig-common/pig-common-datasource/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>pig-common</artifactId>
 		<groupId>com.pig4cloud</groupId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

pig-common/pig-common-log/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-common-log</artifactId>
@@ -37,13 +37,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--UPMS接口模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--安全依赖获取上下文信息-->
 		<dependency>

pig-common/pig-common-mybatis/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-common-mybatis</artifactId>

pig-common/pig-common-security/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-common-security</artifactId>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 	</dependencies>
 </project>

pig-common/pig-common-swagger/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-common-swagger</artifactId>

pig-common/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-common</artifactId>

pig-gateway/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-gateway</artifactId>
@@ -61,7 +61,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--接口文档-->
 		<dependency>

pig-monitor/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-monitor</artifactId>

pig-register/pom.xml

@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-register</artifactId>

pig-register/src/main/java/com/alibaba/nacos/console/config/WebSecurityConfig.java

@@ -75,9 +75,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     public void configure(WebSecurity web) {
-        String ignoreURLs = env.getProperty("nacos.security.ignore.urls", "/**");
-        for (String ignoreURL : ignoreURLs.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) {
-            web.ignoring().antMatchers(ignoreURL.trim());
+        String ignoreUrls = env.getProperty("nacos.security.ignore.urls", "/**");
+        for (String url : ignoreUrls.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) {
+            web.ignoring().antMatchers(url.trim());
         }
     }
 

pig-register/src/main/java/com/alibaba/nacos/console/utils/JwtTokenUtils.java

@@ -38,102 +38,90 @@ import java.util.List;
 @Component
 public class JwtTokenUtils {
 
-    private final Logger log = LoggerFactory.getLogger(JwtTokenUtils.class);
+	private final Logger log = LoggerFactory.getLogger(JwtTokenUtils.class);
 
-    private static final String AUTHORITIES_KEY = "auth";
+	private static final String AUTHORITIES_KEY = "auth";
 
-    /**
-     * secret key
-     */
-    private String secretKey;
+	/**
+	 * secret key
+	 */
+	private String secretKey;
 
-    /**
-     * Token validity time(ms)
-     */
-    private long tokenValidityInMilliseconds;
+	/**
+	 * Token validity time(ms)
+	 */
+	private long tokenValidityInMilliseconds;
 
-    @PostConstruct
-    public void init() {
-        this.secretKey = "SecretKey012345678901234567890123456789012345678901234567890123456789";
-        this.tokenValidityInMilliseconds = 1000 * 60 * 30L;
-    }
+	@PostConstruct
+	public void init() {
+		this.secretKey = "SecretKey012345678901234567890123456789012345678901234567890123456789";
+		this.tokenValidityInMilliseconds = 1000 * 60 * 30L;
+	}
 
-    /**
-     * 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
+	 *
+	 * @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
-         */
-        return Jwts.builder()
-            .setSubject(authentication.getName())
-            .claim(AUTHORITIES_KEY, "")
-            .setExpiration(validity)
-            .signWith(SignatureAlgorithm.HS256, secretKey)
-            .compact();
-    }
+		/**
+		 * create token
+		 */
+		return Jwts.builder()
+			.setSubject(authentication.getName())
+			.claim(AUTHORITIES_KEY, "")
+			.setExpiration(validity)
+			.signWith(SignatureAlgorithm.HS256, secretKey)
+			.compact();
+	}
 
-    /**
-     * 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();
+	/**
+	 * 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.commaSeparatedStringToAuthorityList((String) claims.get(AUTHORITIES_KEY));
+		List<GrantedAuthority> authorities = AuthorityUtils.commaSeparatedStringToAuthorityList((String) claims.get(AUTHORITIES_KEY));
 
 
-        User principal = new User(claims.getSubject(), "", authorities);
-        return new UsernamePasswordAuthenticationToken(principal, "", authorities);
-    }
+		User principal = new User(claims.getSubject(), "", authorities);
+		return new UsernamePasswordAuthenticationToken(principal, "", authorities);
+	}
 
-    /**
-     * validate token
-     *
-     * @param token token
-     * @return whether valid
-     */
-    public boolean validateToken(String token) {
-        try {
-            Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
-            return true;
-        } catch (SignatureException e) {
-            log.info("Invalid JWT signature.");
-            log.trace("Invalid JWT signature trace: {}", e);
-        } catch (MalformedJwtException e) {
-            log.info("Invalid JWT token.");
-            log.trace("Invalid JWT token trace: {}", e);
-        } catch (ExpiredJwtException e) {
-            log.info("Expired JWT token.");
-            log.trace("Expired JWT token trace: {}", e);
-        } catch (UnsupportedJwtException e) {
-            log.info("Unsupported JWT token.");
-            log.trace("Unsupported JWT token trace: {}", e);
-        } catch (IllegalArgumentException e) {
-            log.info("JWT token compact of handler are invalid.");
-            log.trace("JWT token compact of handler are invalid trace: {}", e);
-        }
-        return false;
-    }
+	/**
+	 * validate token
+	 *
+	 * @param token token
+	 * @return whether valid
+	 */
+	public boolean validateToken(String token) {
+		try {
+			Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
+			return true;
+		} catch (Exception e) {
+			log.info("Invalid JWT signature.");
+			log.trace("Invalid JWT signature trace: {}", e);
+		}
+		return false;
+	}
 }

pig-upms/pig-upms-api/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-upms-api</artifactId>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 	</dependencies>
 </project>

pig-upms/pig-upms-biz/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-upms-biz</artifactId>
@@ -36,31 +36,31 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--日志处理-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-log</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--接口文档-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-swagger</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--mybatis 模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-mybatis</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--注册中心客户端-->
 		<dependency>

pig-upms/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>pig-upms</artifactId>

pom.xml

@@ -29,7 +29,7 @@
 
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pig</artifactId>
-	<version>2.7.0</version>
+	<version>2.7.1</version>
 	<name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 	<url>https://www.pig4cloud.com</url>