reformat code

febs-apm/febs-admin/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

febs-apm/febs-admin/src/main/java/cc/mrbird/febs/monitor/admin/runner/StartedUpRunner.java

@@ -24,13 +24,6 @@ public class StartedUpRunner implements ApplicationRunner {
         this.environment = environment;
     }
 
-    @Override
-    public void run(ApplicationArguments args) {
-        if (context.isActive()) {
-            printSystemUpBanner(environment);
-        }
-    }
-
     private static void printSystemUpBanner(Environment environment) {
         String banner = "-----------------------------------------\n" +
                 "服务启动成功，时间：" + LocalDateTime.now() + "\n" +
@@ -39,4 +32,11 @@ public class StartedUpRunner implements ApplicationRunner {
                 "-----------------------------------------";
         System.out.println(banner);
     }
+
+    @Override
+    public void run(ApplicationArguments args) {
+        if (context.isActive()) {
+            printSystemUpBanner(environment);
+        }
+    }
 }

febs-apm/febs-admin/src/main/resources/logback-spring.xml

@@ -3,7 +3,8 @@
     <springProperty scope="context" name="springAppName" source="spring.application.name"/>
     <property name="log.path" value="log/febs-admin"/>
     <property name="log.maxHistory" value="15"/>
-    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.colorPattern"
+              value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
 
     <!--输出到控制台-->
@@ -44,11 +45,11 @@
     </appender>
 
     <root level="debug">
-        <appender-ref ref="console" />
+        <appender-ref ref="console"/>
     </root>
 
     <root level="info">
-        <appender-ref ref="file_info" />
-        <appender-ref ref="file_error" />
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
     </root>
 </configuration>

febs-apm/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>febs-cloud</artifactId>

febs-auth/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

febs-auth/src/main/java/cc/mrbird/febs/auth/configure/FebsSecurityConfigure.java

@@ -1,7 +1,7 @@
 package cc.mrbird.febs.auth.configure;
 
-import cc.mrbird.febs.common.core.entity.constant.EndpointConstant;
 import cc.mrbird.febs.auth.filter.ValidateCodeFilter;
+import cc.mrbird.febs.common.core.entity.constant.EndpointConstant;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.annotation.Order;

febs-auth/src/main/java/cc/mrbird/febs/auth/controller/OauthClientDetailsController.java

@@ -1,11 +1,11 @@
 package cc.mrbird.febs.auth.controller;
 
+import cc.mrbird.febs.auth.entity.OauthClientDetails;
+import cc.mrbird.febs.auth.service.OauthClientDetailsService;
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
 import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.auth.entity.OauthClientDetails;
-import cc.mrbird.febs.auth.service.OauthClientDetailsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

febs-auth/src/main/java/cc/mrbird/febs/auth/controller/SecurityController.java

@@ -1,8 +1,8 @@
 package cc.mrbird.febs.auth.controller;
 
-import cc.mrbird.febs.common.core.exception.ValidateCodeException;
 import cc.mrbird.febs.auth.manager.UserManager;
 import cc.mrbird.febs.auth.service.ValidateCodeService;
+import cc.mrbird.febs.common.core.exception.ValidateCodeException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

febs-auth/src/main/java/cc/mrbird/febs/auth/controller/SocialLoginController.java

@@ -1,11 +1,11 @@
 package cc.mrbird.febs.auth.controller;
 
-import cc.mrbird.febs.common.core.entity.FebsResponse;
-import cc.mrbird.febs.common.core.exception.FebsException;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.auth.entity.BindUser;
 import cc.mrbird.febs.auth.entity.UserConnection;
 import cc.mrbird.febs.auth.service.SocialLoginService;
+import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.model.AuthCallback;

febs-auth/src/main/java/cc/mrbird/febs/auth/service/OauthClientDetailsService.java

@@ -1,8 +1,8 @@
 package cc.mrbird.febs.auth.service;
 
+import cc.mrbird.febs.auth.entity.OauthClientDetails;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
 import cc.mrbird.febs.common.core.exception.FebsException;
-import cc.mrbird.febs.auth.entity.OauthClientDetails;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 

febs-auth/src/main/java/cc/mrbird/febs/auth/service/SocialLoginService.java

@@ -1,9 +1,9 @@
 package cc.mrbird.febs.auth.service;
 
-import cc.mrbird.febs.common.core.entity.FebsResponse;
-import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.auth.entity.BindUser;
 import cc.mrbird.febs.auth.entity.UserConnection;
+import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.exception.FebsException;
 import me.zhyd.oauth.model.AuthCallback;
 import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.AuthRequest;

febs-auth/src/main/java/cc/mrbird/febs/auth/service/impl/FebsUserDetailServiceImpl.java

@@ -1,11 +1,11 @@
 package cc.mrbird.febs.auth.service.impl;
 
+import cc.mrbird.febs.auth.manager.UserManager;
 import cc.mrbird.febs.common.core.entity.FebsAuthUser;
 import cc.mrbird.febs.common.core.entity.constant.ParamsConstant;
 import cc.mrbird.febs.common.core.entity.constant.SocialConstant;
 import cc.mrbird.febs.common.core.entity.system.SystemUser;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.auth.manager.UserManager;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

febs-auth/src/main/java/cc/mrbird/febs/auth/service/impl/OauthClientDetailsServiceImpl.java

@@ -1,10 +1,10 @@
 package cc.mrbird.febs.auth.service.impl;
 
-import cc.mrbird.febs.common.core.entity.QueryRequest;
-import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.auth.entity.OauthClientDetails;
 import cc.mrbird.febs.auth.mapper.OauthClientDetailsMapper;
 import cc.mrbird.febs.auth.service.OauthClientDetailsService;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.exception.FebsException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -1,5 +1,11 @@
 package cc.mrbird.febs.auth.service.impl;
 
+import cc.mrbird.febs.auth.entity.BindUser;
+import cc.mrbird.febs.auth.entity.UserConnection;
+import cc.mrbird.febs.auth.manager.UserManager;
+import cc.mrbird.febs.auth.properties.FebsAuthProperties;
+import cc.mrbird.febs.auth.service.SocialLoginService;
+import cc.mrbird.febs.auth.service.UserConnectionService;
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.constant.GrantTypeConstant;
 import cc.mrbird.febs.common.core.entity.constant.ParamsConstant;
@@ -7,12 +13,6 @@ import cc.mrbird.febs.common.core.entity.constant.SocialConstant;
 import cc.mrbird.febs.common.core.entity.system.SystemUser;
 import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.auth.entity.BindUser;
-import cc.mrbird.febs.auth.entity.UserConnection;
-import cc.mrbird.febs.auth.manager.UserManager;
-import cc.mrbird.febs.auth.properties.FebsAuthProperties;
-import cc.mrbird.febs.auth.service.SocialLoginService;
-import cc.mrbird.febs.auth.service.UserConnectionService;
 import cn.hutool.core.util.StrUtil;
 import com.xkcoding.justauth.AuthRequestFactory;
 import lombok.RequiredArgsConstructor;

febs-auth/src/main/java/cc/mrbird/febs/auth/service/impl/ValidateCodeServiceImpl.java

@@ -1,13 +1,13 @@
 package cc.mrbird.febs.auth.service.impl;
 
+import cc.mrbird.febs.auth.properties.FebsAuthProperties;
+import cc.mrbird.febs.auth.properties.FebsValidateCodeProperties;
+import cc.mrbird.febs.auth.service.ValidateCodeService;
 import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
 import cc.mrbird.febs.common.core.entity.constant.ImageTypeConstant;
 import cc.mrbird.febs.common.core.entity.constant.ParamsConstant;
 import cc.mrbird.febs.common.core.exception.ValidateCodeException;
 import cc.mrbird.febs.common.redis.service.RedisService;
-import cc.mrbird.febs.auth.properties.FebsAuthProperties;
-import cc.mrbird.febs.auth.properties.FebsValidateCodeProperties;
-import cc.mrbird.febs.auth.service.ValidateCodeService;
 import com.wf.captcha.GifCaptcha;
 import com.wf.captcha.SpecCaptcha;
 import com.wf.captcha.base.Captcha;

febs-auth/src/main/resources/febs-auth.properties

@@ -1,8 +1,6 @@
 febs.auth.enableJwt=false
 febs.auth.jwtAccessKey=febs
-
 febs.auth.socialLoginClientId=app
-
 febs.auth.code.time=120
 febs.auth.code.type=png
 febs.auth.code.width=115

febs-auth/src/main/resources/logback-spring.xml

@@ -3,7 +3,8 @@
     <springProperty scope="context" name="springAppName" source="spring.application.name"/>
     <property name="log.path" value="log/febs-auth"/>
     <property name="log.maxHistory" value="15"/>
-    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.colorPattern"
+              value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
 
     <!--输出到控制台-->
@@ -44,18 +45,18 @@
     </appender>
 
     <!--输出到 logstash的 appender-->
-<!--    <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
-<!--        <destination>${logstash.url}:4560</destination>-->
-<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
-<!--    </appender>-->
+    <!--    <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
+    <!--        <destination>${logstash.url}:4560</destination>-->
+    <!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
+    <!--    </appender>-->
 
     <root level="debug">
-        <appender-ref ref="console" />
+        <appender-ref ref="console"/>
     </root>
 
     <root level="info">
-        <appender-ref ref="file_info" />
-        <appender-ref ref="file_error" />
-<!--        <appender-ref ref="logstash" />-->
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+        <!--        <appender-ref ref="logstash" />-->
     </root>
 </configuration>

febs-auth/src/main/resources/templates/error.html

@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="ch">
+<html lang="ch">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
+          name="viewport">
+    <meta content="ie=edge" http-equiv="X-UA-Compatible">
     <title>第三方登录失败</title>
 </head>
 <style>
@@ -15,6 +15,6 @@
     }
 </style>
 <body>
-    <span>[[${error}]]</span>
+<span>[[${error}]]</span>
 </body>
 </html>

febs-auth/src/main/resources/templates/result.html

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="ch">
+<html lang="ch" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
+          name="viewport">
+    <meta content="ie=edge" http-equiv="X-UA-Compatible">
     <title>登录跳转中</title>
 </head>
 <body>
-    登录中..
+登录中..
 <script th:inline="javascript">
     var response = [[${response}]];
     var frontUrl = [[${frontUrl}]];

febs-cloud/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

febs-cloud/postman/FEBS-Cloud.postman_collection.json

@@ -1,196 +1,196 @@
 {
-	"info": {
-		"_postman_id": "4d61085d-8340-4bf6-880c-15a4185fd915",
-		"name": "FEBS-Cloud",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "1. 获取令牌",
-			"request": {
-				"auth": {
-					"type": "noauth"
-				},
-				"method": "POST",
-				"header": [
-					{
-						"description": "客户端凭证，值的格式为Basic空格 + client_id:client_secret经过Base64加密后的值",
-						"key": "Authorization",
-						"type": "text",
-						"value": "Basic ZmViczoxMjM0NTY="
-					}
-				],
-				"url": {
-					"raw": "http://localhost:8301/auth/oauth/token?grant_type=password&username=mrbird&password=1234qwer&key=1234&code=9976",
-					"protocol": "http",
-					"host": [
-						"localhost"
-					],
-					"port": "8301",
-					"path": [
-						"auth",
-						"oauth",
-						"token"
-					],
-					"query": [
-						{
-							"key": "grant_type",
-							"value": "password",
-							"description": "认证类型，password密码模式"
-						},
-						{
-							"key": "username",
-							"value": "mrbird",
-							"description": "用户名"
-						},
-						{
-							"key": "password",
-							"value": "1234qwer",
-							"description": "密码"
-						},
-						{
-							"key": "key",
-							"value": "1234",
-							"description": "代表每个验证码的唯一key"
-						},
-						{
-							"key": "code",
-							"value": "9976",
-							"description": "验证码值（验证码的值可以通过浏览器访问http://localhost:8301/auth/captcha?key=1234获取）"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "2. 刷新令牌",
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic ZmViczoxMjM0NTY=",
-						"description": "客户端凭证，值的格式为Basic空格 + client_id:client_secret经过Base64加密后的值",
-						"type": "text"
-					}
-				],
-				"url": {
-					"raw": "localhost:8301/auth/oauth/token?grant_type=refresh_token&refresh_token=5d2dd6c3-bd99-4558-b622-bf8612d7c4fb",
-					"host": [
-						"localhost"
-					],
-					"port": "8301",
-					"path": [
-						"auth",
-						"oauth",
-						"token"
-					],
-					"query": [
-						{
-							"key": "grant_type",
-							"value": "refresh_token"
-						},
-						{
-							"key": "refresh_token",
-							"value": "5d2dd6c3-bd99-4558-b622-bf8612d7c4fb"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "3. feign测试",
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "bearer 41171c4d-5b22-41d3-bb41-cb08564b2373",
-						"equals": true,
-						"description": "值格式：bearer空格+访问令牌"
-					}
-				],
-				"url": {
-					"raw": "localhost:8301/test/user/list",
-					"host": [
-						"localhost"
-					],
-					"port": "8301",
-					"path": [
-						"test",
-						"user",
-						"list"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "4. 通过febsutil获取在线用户信息",
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"description": "值格式：bearer空格+访问令牌",
-						"equals": true,
-						"key": "Authorization",
-						"value": "bearer 41171c4d-5b22-41d3-bb41-cb08564b2373"
-					}
-				],
-				"url": {
-					"raw": "localhost:8301/test/user",
-					"host": [
-						"localhost"
-					],
-					"port": "8301",
-					"path": [
-						"test",
-						"user"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "5. 分布式事务测试",
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"description": "值格式：bearer空格+访问令牌",
-						"key": "Authorization",
-						"type": "text",
-						"value": "bearer 41171c4d-5b22-41d3-bb41-cb08564b2373"
-					}
-				],
-				"url": {
-					"raw": "localhost:8301/test/pay?goodsId=1&goodsName=iPhone SE",
-					"host": [
-						"localhost"
-					],
-					"port": "8301",
-					"path": [
-						"test",
-						"pay"
-					],
-					"query": [
-						{
-							"key": "goodsId",
-							"value": "1",
-							"description": "商品ID"
-						},
-						{
-							"key": "goodsName",
-							"value": "iPhone SE",
-							"description": "商品名称"
-						}
-					]
-				}
-			},
-			"response": []
-		}
-	],
-	"protocolProfileBehavior": {}
+  "info": {
+    "_postman_id": "4d61085d-8340-4bf6-880c-15a4185fd915",
+    "name": "FEBS-Cloud",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "1. 获取令牌",
+      "request": {
+        "auth": {
+          "type": "noauth"
+        },
+        "method": "POST",
+        "header": [
+          {
+            "description": "客户端凭证，值的格式为Basic空格 + client_id:client_secret经过Base64加密后的值",
+            "key": "Authorization",
+            "type": "text",
+            "value": "Basic ZmViczoxMjM0NTY="
+          }
+        ],
+        "url": {
+          "raw": "http://localhost:8301/auth/oauth/token?grant_type=password&username=mrbird&password=1234qwer&key=1234&code=9976",
+          "protocol": "http",
+          "host": [
+            "localhost"
+          ],
+          "port": "8301",
+          "path": [
+            "auth",
+            "oauth",
+            "token"
+          ],
+          "query": [
+            {
+              "key": "grant_type",
+              "value": "password",
+              "description": "认证类型，password密码模式"
+            },
+            {
+              "key": "username",
+              "value": "mrbird",
+              "description": "用户名"
+            },
+            {
+              "key": "password",
+              "value": "1234qwer",
+              "description": "密码"
+            },
+            {
+              "key": "key",
+              "value": "1234",
+              "description": "代表每个验证码的唯一key"
+            },
+            {
+              "key": "code",
+              "value": "9976",
+              "description": "验证码值（验证码的值可以通过浏览器访问http://localhost:8301/auth/captcha?key=1234获取）"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "2. 刷新令牌",
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic ZmViczoxMjM0NTY=",
+            "description": "客户端凭证，值的格式为Basic空格 + client_id:client_secret经过Base64加密后的值",
+            "type": "text"
+          }
+        ],
+        "url": {
+          "raw": "localhost:8301/auth/oauth/token?grant_type=refresh_token&refresh_token=5d2dd6c3-bd99-4558-b622-bf8612d7c4fb",
+          "host": [
+            "localhost"
+          ],
+          "port": "8301",
+          "path": [
+            "auth",
+            "oauth",
+            "token"
+          ],
+          "query": [
+            {
+              "key": "grant_type",
+              "value": "refresh_token"
+            },
+            {
+              "key": "refresh_token",
+              "value": "5d2dd6c3-bd99-4558-b622-bf8612d7c4fb"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "3. feign测试",
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "bearer 41171c4d-5b22-41d3-bb41-cb08564b2373",
+            "equals": true,
+            "description": "值格式：bearer空格+访问令牌"
+          }
+        ],
+        "url": {
+          "raw": "localhost:8301/test/user/list",
+          "host": [
+            "localhost"
+          ],
+          "port": "8301",
+          "path": [
+            "test",
+            "user",
+            "list"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "4. 通过febsutil获取在线用户信息",
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "description": "值格式：bearer空格+访问令牌",
+            "equals": true,
+            "key": "Authorization",
+            "value": "bearer 41171c4d-5b22-41d3-bb41-cb08564b2373"
+          }
+        ],
+        "url": {
+          "raw": "localhost:8301/test/user",
+          "host": [
+            "localhost"
+          ],
+          "port": "8301",
+          "path": [
+            "test",
+            "user"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "5. 分布式事务测试",
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "description": "值格式：bearer空格+访问令牌",
+            "key": "Authorization",
+            "type": "text",
+            "value": "bearer 41171c4d-5b22-41d3-bb41-cb08564b2373"
+          }
+        ],
+        "url": {
+          "raw": "localhost:8301/test/pay?goodsId=1&goodsName=iPhone SE",
+          "host": [
+            "localhost"
+          ],
+          "port": "8301",
+          "path": [
+            "test",
+            "pay"
+          ],
+          "query": [
+            {
+              "key": "goodsId",
+              "value": "1",
+              "description": "商品ID"
+            },
+            {
+              "key": "goodsName",
+              "value": "iPhone SE",
+              "description": "商品名称"
+            }
+          ]
+        }
+      },
+      "response": []
+    }
+  ],
+  "protocolProfileBehavior": {}
 }

febs-common/febs-common-core/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>febs-common</artifactId>

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/DeptTree.java

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DeptTree extends Tree<Dept>{
+public class DeptTree extends Tree<Dept> {
 
     private Integer orderNum;
 }

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/MenuTree.java

@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class MenuTree extends Tree<Menu>{
+public class MenuTree extends Tree<Menu> {
 
     private String path;
     private String component;

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/Tree.java

@@ -25,7 +25,7 @@ public class Tree<T> {
 
     private boolean hasChildren = false;
 
-    public void initChildren(){
+    public void initChildren() {
         this.children = new ArrayList<>();
     }
 

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/auth/OauthCliendetails.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- *  Entity
+ * Entity
  *
  * @author MrBird
  * @date 2019-09-09 14:13:23
@@ -18,67 +18,67 @@ import lombok.Data;
 public class OauthCliendetails {
 
     /**
-     * 
+     *
      */
     @TableId(value = "client_id", type = IdType.AUTO)
     private String clientId;
 
     /**
-     * 
+     *
      */
     @TableField("resource_ids")
     private String resourceIds;
 
     /**
-     * 
+     *
      */
     @TableField("client_secret")
     private String clientSecret;
 
     /**
-     * 
+     *
      */
     @TableField("scope")
     private String scope;
 
     /**
-     * 
+     *
      */
     @TableField("authorized_grant_types")
     private String authorizedGrantTypes;
 
     /**
-     * 
+     *
      */
     @TableField("web_server_redirect_uri")
     private String webServerRedirectUri;
 
     /**
-     * 
+     *
      */
     @TableField("authorities")
     private String authorities;
 
     /**
-     * 
+     *
      */
     @TableField("access_token_validity")
     private Integer accessTokenValidity;
 
     /**
-     * 
+     *
      */
     @TableField("refresh_token_validity")
     private Integer refreshTokenValidity;
 
     /**
-     * 
+     *
      */
     @TableField("additional_information")
     private String additionalInformation;
 
     /**
-     * 
+     *
      */
     @TableField("autoapprove")
     private Byte autoapprove;

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/EndpointConstant.java

@@ -23,5 +23,5 @@ public class EndpointConstant {
 
     public static final String OAUTH_ERROR = "/oauth/error";
 
-    public static final String ACTUATOR_ALL= "/actuator/**";
+    public static final String ACTUATOR_ALL = "/actuator/**";
 }

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/router/VueRouter.java

@@ -39,7 +39,7 @@ public class VueRouter<T> implements Serializable {
     @JsonIgnore
     private Boolean hasChildren = false;
 
-    public void initChildren(){
+    public void initChildren() {
         this.children = new ArrayList<>();
     }
 

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/DataPermissionTest.java

@@ -1,12 +1,12 @@
 package cc.mrbird.febs.common.core.entity.system;
 
-import java.util.Date;
-
-import lombok.Data;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * @author MrBird

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java

@@ -22,10 +22,8 @@ import java.util.Date;
 @Excel("部门信息表")
 public class Dept implements Serializable {
 
-    private static final long serialVersionUID = -7790334862410409053L;
-
     public static final Long TOP_DEPT_ID = 0L;
-
+    private static final long serialVersionUID = -7790334862410409053L;
     @TableId(value = "DEPT_ID", type = IdType.AUTO)
     private Long deptId;
 

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Menu.java

@@ -22,8 +22,6 @@ import java.util.Date;
 @Excel("菜单信息表")
 public class Menu implements Serializable {
 
-    private static final long serialVersionUID = 7187628714679791771L;
-
     /**
      * 菜单
      */
@@ -32,9 +30,8 @@ public class Menu implements Serializable {
      * 按钮
      */
     public static final String TYPE_BUTTON = "1";
-
     public static final Long TOP_MENU_ID = 0L;
-
+    private static final long serialVersionUID = 7187628714679791771L;
     /**
      * 菜单/按钮ID
      */

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/RoleMenu.java

@@ -12,10 +12,10 @@ import java.io.Serializable;
 @TableName("t_role_menu")
 @Data
 public class RoleMenu implements Serializable {
-	
-	private static final long serialVersionUID = -7573904024872252113L;
 
-	@TableId(value = "ROLE_ID")
+    private static final long serialVersionUID = -7573904024872252113L;
+
+    @TableId(value = "ROLE_ID")
     private Long roleId;
     @TableId(value = "MENU_ID")
     private Long menuId;

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java

@@ -24,8 +24,6 @@ import java.util.Date;
 @Excel("用户信息表")
 public class SystemUser implements Serializable {
 
-    private static final long serialVersionUID = -4352868070794165001L;
-
     /**
      * 用户状态：有效
      */
@@ -54,7 +52,7 @@ public class SystemUser implements Serializable {
      * 性别保密
      */
     public static final String SEX_UNKNOW = "2";
-
+    private static final long serialVersionUID = -4352868070794165001L;
     /**
      * 用户 ID
      */

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/UserDataPermission.java

@@ -5,9 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
-*
-* @author MrBird
-*/
+ * @author MrBird
+ */
 @Data
 @TableName("t_user_data_permission")
 public class UserDataPermission {

febs-common/febs-common-datasource-starter/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>febs-common</artifactId>

febs-common/febs-common-datasource-starter/src/main/java/cc/mrbird/febs/common/datasource/starter/configure/FebsDataSourceAutoconfigure.java

@@ -22,7 +22,7 @@ public class FebsDataSourceAutoconfigure {
      */
     @Bean
     @Order(-1)
-    public DataPermissionInterceptor dataPermissionInterceptor(){
+    public DataPermissionInterceptor dataPermissionInterceptor() {
         return new DataPermissionInterceptor();
     }
 

febs-common/febs-common-datasource-starter/src/main/java/cc/mrbird/febs/common/datasource/starter/inteceptor/DataPermissionInterceptor.java

@@ -32,8 +32,6 @@ import java.util.Properties;
 @Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
 public class DataPermissionInterceptor extends AbstractSqlParserHandler implements Interceptor {
 
-    private Invocation invocation;
-
     @Override
     public Object intercept(Invocation invocation) throws Throwable {
         StatementHandler statementHandler = PluginUtils.realTarget(invocation.getTarget());
@@ -85,7 +83,7 @@ public class DataPermissionInterceptor extends AbstractSqlParserHandler implemen
             Table fromItem = (Table) plainSelect.getFromItem();
 
             String selectTableName = fromItem.getAlias() == null ? fromItem.getName() : fromItem.getAlias().getName();
-            String dataPermissionSql = String.format("%s.%s in (%s)", selectTableName, dataPermission.field(), StringUtils.defaultIfBlank(user.getDeptIds(),"'WITHOUT PERMISSIONS'"));
+            String dataPermissionSql = String.format("%s.%s in (%s)", selectTableName, dataPermission.field(), StringUtils.defaultIfBlank(user.getDeptIds(), "'WITHOUT PERMISSIONS'"));
 
             if (plainSelect.getWhere() == null) {
                 plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(dataPermissionSql));

febs-common/febs-common-doc-gateway-starter/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>febs-common</artifactId>

febs-common/febs-common-doc-gateway-starter/src/main/java/cc/mrbird/febs/common/doc/gateway/configure/FebsDocGatewayAutoConfigure.java

@@ -22,9 +22,9 @@ import springfox.documentation.swagger.web.UiConfiguration;
 @ConditionalOnProperty(value = "febs.doc.gateway.enable", havingValue = "true", matchIfMissing = true)
 public class FebsDocGatewayAutoConfigure {
 
+    private final FebsDocGatewayProperties febsDocGatewayProperties;
     private SecurityConfiguration securityConfiguration;
     private UiConfiguration uiConfiguration;
-    private final FebsDocGatewayProperties febsDocGatewayProperties;
 
     public FebsDocGatewayAutoConfigure(FebsDocGatewayProperties febsDocGatewayProperties) {
         this.febsDocGatewayProperties = febsDocGatewayProperties;

febs-common/febs-common-doc-starter/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

febs-common/febs-common-doc/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>febs-common</artifactId>

febs-common/febs-common-redis-starter/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>febs-common</artifactId>

febs-common/febs-common-security-starter/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

febs-common/febs-common-security-starter/src/main/java/cc/mrbird/febs/common/security/starter/interceptor/FebsServerProtectInterceptor.java

@@ -27,7 +27,7 @@ public class FebsServerProtectInterceptor implements HandlerInterceptor {
             return true;
         } else {
             FebsResponse febsResponse = new FebsResponse();
-            FebsUtil.makeResponse(response,MediaType.APPLICATION_JSON_VALUE,
+            FebsUtil.makeResponse(response, MediaType.APPLICATION_JSON_VALUE,
                     HttpServletResponse.SC_FORBIDDEN, febsResponse.message("请通过网关获取资源"));
             return false;
         }

febs-common/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

febs-gateway/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

febs-gateway/src/main/java/cc/mrbird/febs/gateway/common/controller/IndexController.java

@@ -11,7 +11,7 @@ import reactor.core.publisher.Mono;
 public class IndexController {
 
     @RequestMapping("/")
-    public Mono<String> index(){
+    public Mono<String> index() {
         return Mono.just("febs cloud gateway");
     }
 }

febs-gateway/src/main/java/cc/mrbird/febs/gateway/common/filter/FebsGatewayRequestFilter.java

@@ -25,12 +25,10 @@ import reactor.core.publisher.Mono;
 public class FebsGatewayRequestFilter implements GlobalFilter {
 
     private final RouteEnhanceService routeEnhanceService;
-
+    private final AntPathMatcher pathMatcher = new AntPathMatcher();
     @Value("${febs.gateway.enhance:false}")
     private Boolean routeEhance;
 
-    private final AntPathMatcher pathMatcher = new AntPathMatcher();
-
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         if (routeEhance) {

febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/BlackListServiceImpl.java

@@ -30,6 +30,7 @@ import java.util.Arrays;
 public class BlackListServiceImpl implements BlackListService {
 
 
+    private final RouteEnhanceCacheService routeEnhanceCacheService;
     private BlackListMapper blackListMapper;
     private ReactiveMongoTemplate template;
 
@@ -43,8 +44,6 @@ public class BlackListServiceImpl implements BlackListService {
         this.template = template;
     }
 
-    private final RouteEnhanceCacheService routeEnhanceCacheService;
-
     @Override
     public Flux<BlackList> findAll() {
         return blackListMapper.findAll();

febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RateLimitRuleServiceImpl.java

@@ -28,6 +28,7 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 public class RateLimitRuleServiceImpl implements RateLimitRuleService {
 
+    private final RouteEnhanceCacheService routeEnhanceCacheService;
     private RateLimitRuleMapper rateLimitRuleMapper;
     private ReactiveMongoTemplate template;
 
@@ -41,8 +42,6 @@ public class RateLimitRuleServiceImpl implements RateLimitRuleService {
         this.template = template;
     }
 
-    private final RouteEnhanceCacheService routeEnhanceCacheService;
-
     @Override
     public Flux<RateLimitRule> findAll() {
         return rateLimitRuleMapper.findAll();

febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RouteEnhanceServiceImpl.java

@@ -36,14 +36,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
 @RequiredArgsConstructor
 public class RouteEnhanceServiceImpl implements RouteEnhanceService {
 
+    private static final String METHOD_ALL = "ALL";
+    private static final String TOKEN_CHECK_URL = "/auth/user";
     private final RouteLogService routeLogService;
     private final BlockLogService blockLogService;
     private final RateLimitLogService rateLimitLogService;
     private final RouteEnhanceCacheService routeEnhanceCacheService;
-
     private final AntPathMatcher pathMatcher = new AntPathMatcher();
-    private static final String METHOD_ALL = "ALL";
-    private static final String TOKEN_CHECK_URL = "/auth/user";
 
     @Override
     public Mono<Void> filterBalckList(ServerWebExchange exchange) {

febs-gateway/src/main/resources/logback-spring.xml

@@ -3,7 +3,8 @@
     <springProperty scope="context" name="springAppName" source="spring.application.name"/>
     <property name="log.path" value="log/febs-gateway"/>
     <property name="log.maxHistory" value="15"/>
-    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.colorPattern"
+              value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
 
     <!--输出到控制台-->

febs-gateway/src/main/resources/static/index.html

@@ -5,6 +5,6 @@
     <title>FEBS Cloud Gateway</title>
 </head>
 <body>
-    FEBS Cloud网关
+FEBS Cloud网关
 </body>
 </html>

febs-server/febs-server-generator/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

febs-server/febs-server-generator/src/main/java/cc/mrbird/febs/server/generator/helper/GeneratorHelper.java

@@ -30,6 +30,20 @@ import java.util.Objects;
 @Helper
 public class GeneratorHelper {
 
+    private static String getFilePath(GeneratorConfig configure, String packagePath, String suffix, boolean serviceInterface) {
+        String filePath = GeneratorConstant.TEMP_PATH + configure.getJavaPath() +
+                packageConvertPath(configure.getBasePackage() + "." + packagePath);
+        if (serviceInterface) {
+            filePath += "I";
+        }
+        filePath += configure.getClassName() + suffix;
+        return filePath;
+    }
+
+    private static String packageConvertPath(String packageName) {
+        return String.format("/%s/", packageName.contains(".") ? packageName.replaceAll("\\.", "/") : packageName);
+    }
+
     public void generateEntityFile(List<Column> columns, GeneratorConfig configure) throws Exception {
         String suffix = GeneratorConstant.JAVA_FILE_SUFFIX;
         String path = getFilePath(configure, configure.getEntityPackage(), suffix, false);
@@ -108,20 +122,6 @@ public class GeneratorHelper {
         }
     }
 
-    private static String getFilePath(GeneratorConfig configure, String packagePath, String suffix, boolean serviceInterface) {
-        String filePath = GeneratorConstant.TEMP_PATH + configure.getJavaPath() +
-                packageConvertPath(configure.getBasePackage() + "." + packagePath);
-        if (serviceInterface) {
-            filePath += "I";
-        }
-        filePath += configure.getClassName() + suffix;
-        return filePath;
-    }
-
-    private static String packageConvertPath(String packageName) {
-        return String.format("/%s/", packageName.contains(".") ? packageName.replaceAll("\\.", "/") : packageName);
-    }
-
     private JSONObject toJsonObject(Object o) {
         return JSONObject.parseObject(JSONObject.toJSON(o).toString());
     }

febs-server/febs-server-generator/src/main/resources/logback-spring.xml

@@ -3,7 +3,8 @@
     <springProperty scope="context" name="springAppName" source="spring.application.name"/>
     <property name="log.path" value="log/febs-server-generator"/>
     <property name="log.maxHistory" value="15"/>
-    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.colorPattern"
+              value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
 
     <!--输出到控制台-->

febs-server/febs-server-job/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/FebsServerJobApplication.java

@@ -15,7 +15,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 public class FebsServerJobApplication {
 
     public static void main(String[] args) {
-         new SpringApplicationBuilder(FebsServerJobApplication.class)
+        new SpringApplicationBuilder(FebsServerJobApplication.class)
                 .web(WebApplicationType.SERVLET)
                 .run(args);
     }

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/controller/JobLogController.java

@@ -26,7 +26,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("log")
 @RequiredArgsConstructor
-public class JobLogController{
+public class JobLogController {
 
     private final IJobLogService jobLogService;
 

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/entity/Job.java

@@ -1,7 +1,6 @@
 package cc.mrbird.febs.server.job.entity;
 
 import cc.mrbird.febs.common.core.converter.TimeConverter;
-import cc.mrbird.febs.server.job.annotation.IsCron;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -23,73 +22,62 @@ import java.util.Date;
 @Excel("定时任务信息表")
 public class Job implements Serializable {
 
-    private static final long serialVersionUID = 400066840871805700L;
-
     /**
      * 任务调度参数 key
      */
     public static final String JOB_PARAM_KEY = "JOB_PARAM_KEY";
-
-    public enum ScheduleStatus {
-        /**
-         * 正常
-         */
-        NORMAL("0"),
-        /**
-         * 暂停
-         */
-        PAUSE("1");
-
-        private String value;
-
-        ScheduleStatus(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-    }
-
+    private static final long serialVersionUID = 400066840871805700L;
     @TableId(value = "JOB_ID", type = IdType.AUTO)
     private Long jobId;
-
     @TableField("bean_name")
     @NotBlank(message = "{required}")
     @Size(max = 50, message = "{noMoreThan}")
     @ExcelField(value = "Bean名称")
     private String beanName;
-
     @TableField("method_name")
     @NotBlank(message = "{required}")
     @Size(max = 50, message = "{noMoreThan}")
     @ExcelField(value = "方法名称")
     private String methodName;
-
     @TableField("params")
     @Size(max = 50, message = "{noMoreThan}")
     @ExcelField(value = "方法参数")
     private String params;
-
     @TableField("cron_expression")
     @NotBlank(message = "{required}")
     @ExcelField(value = "Cron表达式")
     private String cronExpression;
-
     @TableField("status")
     @ExcelField(value = "状态", writeConverterExp = "0=正常,1=暂停")
     private String status;
-
     @TableField("remark")
     @Size(max = 100, message = "{noMoreThan}")
     @ExcelField(value = "备注")
     private String remark;
-
     @TableField("create_time")
     @ExcelField(value = "创建时间", writeConverter = TimeConverter.class)
     private Date createTime;
-
     private transient String createTimeFrom;
     private transient String createTimeTo;
+    public enum ScheduleStatus {
+        /**
+         * 正常
+         */
+        NORMAL("0"),
+        /**
+         * 暂停
+         */
+        PAUSE("1");
+
+        private String value;
+
+        ScheduleStatus(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
 
 }

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/entity/JobLog.java

@@ -20,7 +20,6 @@ import java.util.Date;
 @Excel("调度日志信息表")
 public class JobLog implements Serializable {
 
-    private static final long serialVersionUID = -7114915445674333148L;
     /**
      * 任务执行成功
      */
@@ -29,7 +28,7 @@ public class JobLog implements Serializable {
      * 任务执行失败
      */
     public static final String JOB_FAIL = "1";
-
+    private static final long serialVersionUID = -7114915445674333148L;
     @TableId(value = "LOG_ID", type = IdType.AUTO)
     private Long logId;
 

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/helper/ScheduleUtils.java

@@ -1,8 +1,8 @@
 package cc.mrbird.febs.server.job.helper;
 
+import cc.mrbird.febs.server.job.entity.Job;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
-import cc.mrbird.febs.server.job.entity.Job;
 
 /**
  * 定时任务工具类

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/utils/SpringContextUtil.java

@@ -7,40 +7,40 @@ import org.springframework.stereotype.Component;
 
 /**
  * 用于从 IOC容器中获取 Bean
- * 
- * @author MrBird
  *
+ * @author MrBird
  */
 @Component
 public class SpringContextUtil implements ApplicationContextAware {
-	private static ApplicationContext applicationContext;
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		SpringContextUtil.applicationContext = applicationContext;
-	}
-
-	public static Object getBean(String name) {
-		return applicationContext.getBean(name);
-	}
-	public static <T> T getBean(Class<T> clazz){
-		return applicationContext.getBean(clazz);
-	}
-
-	public static <T> T getBean(String name, Class<T> requiredType) {
-		return applicationContext.getBean(name, requiredType);
-	}
-
-	public static boolean containsBean(String name) {
-		return applicationContext.containsBean(name);
-	}
-
-	public static boolean isSingleton(String name) {
-		return applicationContext.isSingleton(name);
-	}
-
-	public static Class<?> getType(String name) {
-		return applicationContext.getType(name);
-	}
+    private static ApplicationContext applicationContext;
+
+    public static Object getBean(String name) {
+        return applicationContext.getBean(name);
+    }
+
+    public static <T> T getBean(Class<T> clazz) {
+        return applicationContext.getBean(clazz);
+    }
+
+    public static <T> T getBean(String name, Class<T> requiredType) {
+        return applicationContext.getBean(name, requiredType);
+    }
+
+    public static boolean containsBean(String name) {
+        return applicationContext.containsBean(name);
+    }
+
+    public static boolean isSingleton(String name) {
+        return applicationContext.isSingleton(name);
+    }
+
+    public static Class<?> getType(String name) {
+        return applicationContext.getType(name);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        SpringContextUtil.applicationContext = applicationContext;
+    }
 
 }

febs-server/febs-server-job/src/main/resources/logback-spring.xml

@@ -3,7 +3,8 @@
     <springProperty scope="context" name="springAppName" source="spring.application.name"/>
     <property name="log.path" value="log/febs-server-job"/>
     <property name="log.maxHistory" value="15"/>
-    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.colorPattern"
+              value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
 
     <!--输出到控制台-->

febs-server/febs-server-system/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/annotation/ControllerEndpoint.java

@@ -13,5 +13,6 @@ import java.lang.annotation.Target;
 public @interface ControllerEndpoint {
 
     String operation() default "";
+
     String exceptionMessage() default "FEBS系统内部异常";
 }

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/EximportController.java

@@ -40,8 +40,8 @@ import java.util.stream.IntStream;
 @RequiredArgsConstructor
 public class EximportController {
 
-    private final IEximportService eximportService;
     private static final String XLSX = ".xlsx";
+    private final IEximportService eximportService;
 
     @GetMapping
     public FebsResponse findEximports(QueryRequest request) {

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/UserController.java

@@ -103,7 +103,7 @@ public class UserController {
 
     @GetMapping("/{userId}")
     @PreAuthorize("hasAuthority('user:update')")
-    public FebsResponse findUserDataPermissions(@NotBlank(message = "{required}") @PathVariable String userId){
+    public FebsResponse findUserDataPermissions(@NotBlank(message = "{required}") @PathVariable String userId) {
         String dataPermissions = this.userDataPermissionService.findByUserId(userId);
         return new FebsResponse().data(dataPermissions);
     }

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/DataPermissionTestMapper.java

@@ -5,7 +5,6 @@ import cc.mrbird.febs.common.datasource.starter.annotation.DataPermission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- *
  * @author MrBird
  */
 @DataPermission(methods = {"selectPage"})

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/UserDataPermissionMapper.java

@@ -4,7 +4,6 @@ import cc.mrbird.febs.common.core.entity.system.UserDataPermission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- *
  * @author MrBird
  */
 public interface UserDataPermissionMapper extends BaseMapper<UserDataPermission> {

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IDataPermissionTestService.java

@@ -7,14 +7,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 
 /**
- *
  * @author MrBird
  */
 public interface IDataPermissionTestService extends IService<DataPermissionTest> {
     /**
      * 查询（分页）
      *
-     * @param request QueryRequest
+     * @param request            QueryRequest
      * @param dataPermissionTest dataPermissionTest
      * @return IPage<DataPermissionTest>
      */

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DataPermissionTestServiceImpl.java

@@ -13,7 +13,6 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- *
  * @author MrBird
  */
 @Service

febs-server/febs-server-system/src/main/resources/logback-spring.xml

@@ -3,7 +3,8 @@
     <springProperty scope="context" name="springAppName" source="spring.application.name"/>
     <property name="log.path" value="log/febs-server-system"/>
     <property name="log.maxHistory" value="15"/>
-    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.colorPattern"
+              value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
 
     <!--输出到控制台-->

febs-server/febs-server-test/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

febs-server/febs-server-test/src/main/resources/logback-spring.xml

@@ -3,7 +3,8 @@
     <springProperty scope="context" name="springAppName" source="spring.application.name"/>
     <property name="log.path" value="log/febs-server-test"/>
     <property name="log.maxHistory" value="15"/>
-    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.colorPattern"
+              value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
 
     <!--输出到控制台-->

febs-server/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

febs-tx-manager/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

febs-tx-manager/src/main/java/cc/mrbird/febs/tx/manager/runner/StartedUpRunner.java

@@ -22,13 +22,6 @@ public class StartedUpRunner implements ApplicationRunner {
         this.environment = environment;
     }
 
-    @Override
-    public void run(ApplicationArguments args) {
-        if (context.isActive()) {
-            printSystemUpBanner(environment);
-        }
-    }
-
     private static void printSystemUpBanner(Environment environment) {
         String banner = "-----------------------------------------\n" +
                 "服务启动成功，时间：" + LocalDateTime.now() + "\n" +
@@ -37,4 +30,11 @@ public class StartedUpRunner implements ApplicationRunner {
                 "-----------------------------------------";
         System.out.println(banner);
     }
+
+    @Override
+    public void run(ApplicationArguments args) {
+        if (context.isActive()) {
+            printSystemUpBanner(environment);
+        }
+    }
 }

febs-tx-manager/src/main/resources/logback-spring.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <springProperty scope="context" name="springAppName" source="spring.application.name"/>
-    <property name="log.path" value="log/febs-tx-manager" />
-    <property name="log.maxHistory" value="15" />
-    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.path" value="log/febs-tx-manager"/>
+    <property name="log.maxHistory" value="15"/>
+    <property name="log.colorPattern"
+              value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan(${springAppName:-}) %yellow(%thread) %green(%logger) %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level ${springAppName:-} %thread %logger %msg%n"/>
 
     <!--输出到控制台-->
@@ -44,11 +45,11 @@
     </appender>
 
     <root level="debug">
-        <appender-ref ref="console" />
+        <appender-ref ref="console"/>
     </root>
 
     <root level="info">
-        <appender-ref ref="file_info" />
-        <appender-ref ref="file_error" />
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
     </root>
 </configuration>