mrbird 6 lat temu
rodzic
commit
815cbc1db4

+ 2 - 2
febs-auth/src/main/java/cc/mrbird/febs/auth/service/impl/SocialLoginServiceImpl.java

@@ -73,7 +73,7 @@ public class SocialLoginServiceImpl implements SocialLoginService {
     public FebsResponse resolveBind(String oauthType, AuthCallback callback) throws FebsException {
         FebsResponse febsResponse = new FebsResponse();
         AuthRequest authRequest = factory.get(getAuthSource(oauthType));
-        AuthResponse response = authRequest.login(resolveAuthCallback(callback));
+        AuthResponse<?> response = authRequest.login(resolveAuthCallback(callback));
         if (response.ok()) {
             febsResponse.data(response.getData());
         } else {
@@ -86,7 +86,7 @@ public class SocialLoginServiceImpl implements SocialLoginService {
     public FebsResponse resolveLogin(String oauthType, AuthCallback callback) throws FebsException {
         FebsResponse febsResponse = new FebsResponse();
         AuthRequest authRequest = factory.get(getAuthSource(oauthType));
-        AuthResponse response = authRequest.login(resolveAuthCallback(callback));
+        AuthResponse<?> response = authRequest.login(resolveAuthCallback(callback));
         if (response.ok()) {
             AuthUser authUser = (AuthUser) response.getData();
             UserConnection userConnection = userConnectionService.selectByCondition(authUser.getSource().toString(), authUser.getUuid());

+ 1 - 1
febs-auth/src/main/java/cc/mrbird/febs/auth/translator/FebsWebResponseExceptionTranslator.java

@@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
 public class FebsWebResponseExceptionTranslator implements WebResponseExceptionTranslator {
 
     @Override
-    public ResponseEntity translate(Exception e) {
+    public ResponseEntity<?> translate(Exception e) {
         ResponseEntity.BodyBuilder status = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR);
         FebsResponse response = new FebsResponse();
         String message = "认证失败";

+ 6 - 7
febs-common/src/main/java/cc/mrbird/febs/common/utils/SortUtil.java

@@ -12,7 +12,6 @@ import org.apache.commons.lang3.StringUtils;
  * 
  * @author MrBird
  */
-@SuppressWarnings("unchecked")
 public class SortUtil {
     /**
      * 处理排序(分页情况下) for mybatis-plus
@@ -23,7 +22,7 @@ public class SortUtil {
      * @param defaultOrder      默认排序规则
      * @param camelToUnderscore 是否开启驼峰转下划线
      */
-    public static void handlePageSort(QueryRequest request, Page page, String defaultSort, String defaultOrder, boolean camelToUnderscore) {
+    public static void handlePageSort(QueryRequest request, Page<?> page, String defaultSort, String defaultOrder, boolean camelToUnderscore) {
         page.setCurrent(request.getPageNum());
         page.setSize(request.getPageSize());
         String sortField = request.getField();
@@ -55,7 +54,7 @@ public class SortUtil {
      * @param request QueryRequest
      * @param page    Page
      */
-    public static void handlePageSort(QueryRequest request, Page page) {
+    public static void handlePageSort(QueryRequest request, Page<?> page) {
         handlePageSort(request, page, null, null, false);
     }
 
@@ -66,7 +65,7 @@ public class SortUtil {
      * @param page              Page
      * @param camelToUnderscore 是否开启驼峰转下划线
      */
-    public static void handlePageSort(QueryRequest request, Page page, boolean camelToUnderscore) {
+    public static void handlePageSort(QueryRequest request, Page<?> page, boolean camelToUnderscore) {
         handlePageSort(request, page, null, null, camelToUnderscore);
     }
 
@@ -79,7 +78,7 @@ public class SortUtil {
      * @param defaultOrder      默认排序规则
      * @param camelToUnderscore 是否开启驼峰转下划线
      */
-    public static void handleWrapperSort(QueryRequest request, QueryWrapper wrapper, String defaultSort, String defaultOrder, boolean camelToUnderscore) {
+    public static void handleWrapperSort(QueryRequest request, QueryWrapper<?> wrapper, String defaultSort, String defaultOrder, boolean camelToUnderscore) {
         String sortField = request.getField();
         if (camelToUnderscore) {
             sortField = FebsUtil.camelToUnderscore(sortField);
@@ -109,7 +108,7 @@ public class SortUtil {
      * @param request QueryRequest
      * @param wrapper wrapper
      */
-    public static void handleWrapperSort(QueryRequest request, QueryWrapper wrapper) {
+    public static void handleWrapperSort(QueryRequest request, QueryWrapper<?> wrapper) {
         handleWrapperSort(request, wrapper, null, null, false);
     }
 
@@ -120,7 +119,7 @@ public class SortUtil {
      * @param wrapper           wrapper
      * @param camelToUnderscore 是否开启驼峰转下划线
      */
-    public static void handleWrapperSort(QueryRequest request, QueryWrapper wrapper, boolean camelToUnderscore) {
+    public static void handleWrapperSort(QueryRequest request, QueryWrapper<?> wrapper, boolean camelToUnderscore) {
         handleWrapperSort(request, wrapper, null, null, camelToUnderscore);
     }
 }

+ 0 - 2
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/configure/FebsWebConfigure.java

@@ -6,10 +6,8 @@ import cc.mrbird.febs.server.system.properties.FesbSwaggerProperties;
 import com.baomidou.mybatisplus.core.parser.ISqlParser;
 import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import io.micrometer.core.instrument.MeterRegistry;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;