🎨 改进结构和代码格式。 优化代码生成格式

pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/rule/MetadataAwareRule.java

@@ -25,6 +25,7 @@ import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
 import com.pig4cloud.pigx.common.gateway.predicate.DiscoveryEnabledPredicate;
 import com.pig4cloud.pigx.common.gateway.predicate.MetadataAwarePredicate;
 import com.pig4cloud.pigx.common.gateway.support.PigxRibbonRuleProperties;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.PatternMatchUtils;
 
 import java.util.ArrayList;
@@ -36,6 +37,7 @@ import java.util.List;
  *
  * @author dream.lu
  */
+@Slf4j
 public class MetadataAwareRule extends DiscoveryEnabledRule {
 
 	public MetadataAwareRule() {
@@ -62,14 +64,17 @@ public class MetadataAwareRule extends DiscoveryEnabledRule {
 		List<Server> priorServerList = new ArrayList<>();
 		for (Server server : serverList) {
 			String host = server.getHost();
-			// 2. 优先本地 ip 的服务
-			if (ObjectUtil.equal(hostIp, host)) {
-				return Collections.singletonList(server);
-			}
-			// 3. 优先的 ip 服务
+			// 2. 优先的 ip 服务
 			if (hasPriorIpPattern && PatternMatchUtils.simpleMatch(priorIpPatterns, host)) {
+				log.debug("路由匹配 {},优先路由", priorIpPatterns);
 				priorServerList.add(server);
 			}
+
+			// 3. 优先本地 ip 的服务
+			if (ObjectUtil.equal(hostIp, host)) {
+				log.debug("路由匹配本地IP,优先路由", hostIp);
+				return Collections.singletonList(server);
+			}
 		}
 
 		// 4. 如果优先的有数据直接返回

pigx-register/src/main/java/com/alibaba/nacos/console/filter/JwtAuthenticationTokenFilter.java

@@ -69,7 +69,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     private String resolveToken(HttpServletRequest request) {
         String bearerToken = request.getHeader(WebSecurityConfig.AUTHORIZATION_HEADER);
         if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(TOKEN_PREFIX)) {
-            return bearerToken.substring(7, bearerToken.length());
+            return bearerToken.substring(7);
         }
         String jwt = request.getParameter(WebSecurityConfig.AUTHORIZATION_TOKEN);
         if (StringUtils.hasText(jwt)) {

pigx-visual/pigx-codegen/src/main/resources/generator.properties

@@ -34,4 +34,4 @@ datetime=LocalDateTime
 timestamp=LocalDateTime
 
 # hidden columns in Swagger Models
-hiddenColumn=gmt_create,gmt_modified,tenant_id
+hiddenColumn=tenant_id

pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm

@@ -42,15 +42,14 @@ import java.time.LocalDateTime;
 public class ${className} extends Model<${className}> {
 private static final long serialVersionUID = 1L;
 
-  #foreach ($column in $columns)
-  /**
-   * $column.comments
-   */
-  #if($column.columnName == $pk.columnName)
-  @TableId
-  #end
-  @ApiModelProperty(value="$column.comments"#if($column.nullable),required=$column.nullable#end#if($column.hidden),hidden=$column.hidden#end)
-  private $column.attrType $column.lowerAttrName;
-  #end
-
+    #foreach ($column in $columns)
+/**
+     * $column.comments
+     */
+    #if($column.columnName == $pk.columnName)
+@TableId
+    #end
+@ApiModelProperty(value="$column.comments"#if($column.hidden),hidden=$column.hidden#end)
+    private $column.attrType $column.lowerAttrName;
+    #end
 }