🎨 格式化代码，无其他操作

pig-mesh · Jun 1, 2024 · df4ddea · df4ddea
1 parent 993879a
commit df4ddea
Show file tree

Hide file tree

Showing 13 changed files with 255 additions and 271 deletions.
diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java
@@ -107,8 +107,7 @@ public ModelAndView confirm(Principal principal, ModelAndView modelAndView,
 			@RequestParam(OAuth2ParameterNames.CLIENT_ID) String clientId,
 			@RequestParam(OAuth2ParameterNames.SCOPE) String scope,
 			@RequestParam(OAuth2ParameterNames.STATE) String state) {
-		SysOauthClientDetails clientDetails = RetOps
-			.of(clientDetailsService.getClientDetailsById(clientId))
+		SysOauthClientDetails clientDetails = RetOps.of(clientDetailsService.getClientDetailsById(clientId))
 			.getData()
 			.orElseThrow(() -> new OAuthClientException("clientId 不合法"));
 

diff --git a/...-common-feign/src/main/java/com/pig4cloud/pig/common/feign/PigFeignAutoConfiguration.java b/...-common-feign/src/main/java/com/pig4cloud/pig/common/feign/PigFeignAutoConfiguration.java
@@ -46,44 +46,42 @@
 @AutoConfigureBefore(SentinelFeignAutoConfiguration.class)
 public class PigFeignAutoConfiguration {
 
-    @Bean
-    @Scope("prototype")
-    @ConditionalOnMissingBean
-    @ConditionalOnProperty(name = "feign.sentinel.enabled")
-    public Feign.Builder feignSentinelBuilder() {
-        return PigSentinelFeign.builder();
-    }
+	@Bean
+	@Scope("prototype")
+	@ConditionalOnMissingBean
+	@ConditionalOnProperty(name = "feign.sentinel.enabled")
+	public Feign.Builder feignSentinelBuilder() {
+		return PigSentinelFeign.builder();
+	}
 
-    @Bean
-    @ConditionalOnMissingBean
-    public BlockExceptionHandler blockExceptionHandler(ObjectMapper objectMapper) {
-        return new PigUrlBlockHandler(objectMapper);
-    }
+	@Bean
+	@ConditionalOnMissingBean
+	public BlockExceptionHandler blockExceptionHandler(ObjectMapper objectMapper) {
+		return new PigUrlBlockHandler(objectMapper);
+	}
 
-    @Bean
-    @ConditionalOnMissingBean
-    public RequestOriginParser requestOriginParser() {
-        return new PigHeaderRequestOriginParser();
-    }
+	@Bean
+	@ConditionalOnMissingBean
+	public RequestOriginParser requestOriginParser() {
+		return new PigHeaderRequestOriginParser();
+	}
 
-    /**
-     * add http connection close header
-     *
-     * @return
-     */
-    @Bean
-    public PigFeignRequestCloseInterceptor pigFeignRequestCloseInterceptor() {
-        return new PigFeignRequestCloseInterceptor();
-    }
+	/**
+	 * add http connection close header
+	 * @return
+	 */
+	@Bean
+	public PigFeignRequestCloseInterceptor pigFeignRequestCloseInterceptor() {
+		return new PigFeignRequestCloseInterceptor();
+	}
 
-    /**
-     * add inner request header
-     *
-     * @return PigFeignInnerRequestInterceptor
-     */
-    @Bean
-    public PigFeignInnerRequestInterceptor pigFeignInnerRequestInterceptor() {
-        return new PigFeignInnerRequestInterceptor();
-    }
+	/**
+	 * add inner request header
+	 * @return PigFeignInnerRequestInterceptor
+	 */
+	@Bean
+	public PigFeignInnerRequestInterceptor pigFeignInnerRequestInterceptor() {
+		return new PigFeignInnerRequestInterceptor();
+	}
 
 }
diff --git a/...mon/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/annotation/NoToken.java b/...mon/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/annotation/NoToken.java
@@ -5,11 +5,12 @@
 /**
  * 服务无token调用声明注解
  * <p>
- * 只有发起方没有 token 时候才需要添加此注解，  @NoToken + @Inner
+ * 只有发起方没有 token 时候才需要添加此注解， @NoToken + @Inner
  * <p>
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface NoToken {
+
 }
diff --git a/...gn/src/main/java/com/pig4cloud/pig/common/feign/core/PigFeignInnerRequestInterceptor.java b/...gn/src/main/java/com/pig4cloud/pig/common/feign/core/PigFeignInnerRequestInterceptor.java
@@ -13,22 +13,24 @@
  * @date 2024/6/1
  */
 public class PigFeignInnerRequestInterceptor implements RequestInterceptor, Ordered {
-    /**
-     * Called for every request. Add data using methods on the supplied {@link RequestTemplate}.
-     *
-     * @param template
-     */
-    @Override
-    public void apply(RequestTemplate template) {
-        Method method = template.methodMetadata().method();
-        NoToken noToken = method.getAnnotation(NoToken.class);
-        if (noToken != null) {
-            template.header(SecurityConstants.FROM, SecurityConstants.FROM_IN);
-        }
-    }
 
-    @Override
-    public int getOrder() {
-        return Integer.MIN_VALUE;
-    }
+	/**
+	 * Called for every request. Add data using methods on the supplied
+	 * {@link RequestTemplate}.
+	 * @param template
+	 */
+	@Override
+	public void apply(RequestTemplate template) {
+		Method method = template.methodMetadata().method();
+		NoToken noToken = method.getAnnotation(NoToken.class);
+		if (noToken != null) {
+			template.header(SecurityConstants.FROM, SecurityConstants.FROM_IN);
+		}
+	}
+
+	@Override
+	public int getOrder() {
+		return Integer.MIN_VALUE;
+	}
+
 }
diff --git a/...mon-feign/src/main/java/org/springframework/cloud/openfeign/PigFeignClientsRegistrar.java b/...mon-feign/src/main/java/org/springframework/cloud/openfeign/PigFeignClientsRegistrar.java
@@ -17,8 +17,6 @@
 
 package org.springframework.cloud.openfeign;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pig.common.feign.PigFeignAutoConfiguration;
 import lombok.Getter;
 import org.springframework.beans.factory.BeanClassLoaderAware;

diff --git a/...ommon/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java b/...ommon/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java
@@ -44,45 +44,45 @@
 @RequiredArgsConstructor
 public class SysLogListener implements InitializingBean {
 
-    // new 一个 避免日志脱敏策略影响全局ObjectMapper
-    private final static ObjectMapper objectMapper = new ObjectMapper();
+	// new 一个 避免日志脱敏策略影响全局ObjectMapper
+	private final static ObjectMapper objectMapper = new ObjectMapper();
 
-    private final RemoteLogService remoteLogService;
+	private final RemoteLogService remoteLogService;
 
-    private final PigLogProperties logProperties;
+	private final PigLogProperties logProperties;
 
-    @SneakyThrows
-    @Async
-    @Order
-    @EventListener(SysLogEvent.class)
-    public void saveSysLog(SysLogEvent event) {
-        SysLogEventSource source = (SysLogEventSource) event.getSource();
-        SysLog sysLog = new SysLog();
-        BeanUtils.copyProperties(source, sysLog);
+	@SneakyThrows
+	@Async
+	@Order
+	@EventListener(SysLogEvent.class)
+	public void saveSysLog(SysLogEvent event) {
+		SysLogEventSource source = (SysLogEventSource) event.getSource();
+		SysLog sysLog = new SysLog();
+		BeanUtils.copyProperties(source, sysLog);
 
-        // json 格式刷参数放在异步中处理，提升性能
-        if (Objects.nonNull(source.getBody())) {
-            String params = objectMapper.writeValueAsString(source.getBody());
-            sysLog.setParams(StrUtil.subPre(params, logProperties.getMaxLength()));
-        }
+		// json 格式刷参数放在异步中处理，提升性能
+		if (Objects.nonNull(source.getBody())) {
+			String params = objectMapper.writeValueAsString(source.getBody());
+			sysLog.setParams(StrUtil.subPre(params, logProperties.getMaxLength()));
+		}
 
-        remoteLogService.saveLog(sysLog);
-    }
+		remoteLogService.saveLog(sysLog);
+	}
 
-    @Override
-    public void afterPropertiesSet() {
-        objectMapper.addMixIn(Object.class, PropertyFilterMixIn.class);
-        String[] ignorableFieldNames = logProperties.getExcludeFields().toArray(new String[0]);
+	@Override
+	public void afterPropertiesSet() {
+		objectMapper.addMixIn(Object.class, PropertyFilterMixIn.class);
+		String[] ignorableFieldNames = logProperties.getExcludeFields().toArray(new String[0]);
 
-        FilterProvider filters = new SimpleFilterProvider().addFilter("filter properties by name",
-                SimpleBeanPropertyFilter.serializeAllExcept(ignorableFieldNames));
-        objectMapper.setFilterProvider(filters);
-        objectMapper.registerModule(new PigJavaTimeModule());
-    }
+		FilterProvider filters = new SimpleFilterProvider().addFilter("filter properties by name",
+				SimpleBeanPropertyFilter.serializeAllExcept(ignorableFieldNames));
+		objectMapper.setFilterProvider(filters);
+		objectMapper.registerModule(new PigJavaTimeModule());
+	}
 
-    @JsonFilter("filter properties by name")
-    class PropertyFilterMixIn {
+	@JsonFilter("filter properties by name")
+	class PropertyFilterMixIn {
 
-    }
+	}
 
 }