🎨 规范统一代码格式

binarywang · Oct 5, 2020 · 5d01138 · 5d01138
1 parent a58e8a0
commit 5d01138
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,3 +12,6 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-github: [binarywang]
+github: [ binarywang ]
 custom: https://github.com/Wechat-Group/WxJava/blob/master/images/qrcodes/wepay.jpg?raw=true
diff --git a/src/main/java/com/github/binarywang/demo/wx/mp/error/ErrorController.java b/src/main/java/com/github/binarywang/demo/wx/mp/error/ErrorController.java
@@ -16,14 +16,14 @@
 @RequestMapping("/error")
 public class ErrorController {
 
-  @GetMapping(value = "/404")
-  public String error404() {
-    return "error";
-  }
+    @GetMapping(value = "/404")
+    public String error404() {
+        return "error";
+    }
 
-  @GetMapping(value = "/500")
-  public String error500() {
-    return "error";
-  }
+    @GetMapping(value = "/500")
+    public String error500() {
+        return "error";
+    }
 
 }
diff --git a/src/main/java/com/github/binarywang/demo/wx/mp/error/ErrorPageConfiguration.java b/src/main/java/com/github/binarywang/demo/wx/mp/error/ErrorPageConfiguration.java
@@ -16,12 +16,12 @@
  */
 @Component
 public class ErrorPageConfiguration implements ErrorPageRegistrar {
-  @Override
-  public void registerErrorPages(ErrorPageRegistry errorPageRegistry) {
-    errorPageRegistry.addErrorPages(
-        new ErrorPage(HttpStatus.NOT_FOUND, "/error/404"),
-        new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/error/500")
-    );
-  }
+    @Override
+    public void registerErrorPages(ErrorPageRegistry errorPageRegistry) {
+        errorPageRegistry.addErrorPages(
+            new ErrorPage(HttpStatus.NOT_FOUND, "/error/404"),
+            new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/error/500")
+        );
+    }
 
 }
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
@@ -2,15 +2,15 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
     <title>出错啦！</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-    <p th:text="'Url:' + ${URL}" />
-    <p th:text="'Error:' + ${error}" />
-    <p th:text="'Message:' + ${message}" />
-    <p th:text="'Exception:' + ${exception}" />
-    <p th:text="'Path:' + ${path}" />
-    <p th:text="'Status:' + ${status}" />
-    <p th:text="'Timestamp:' + ${timestamp}" />
+<p th:text="'Url:' + ${URL}"/>
+<p th:text="'Error:' + ${error}"/>
+<p th:text="'Message:' + ${message}"/>
+<p th:text="'Exception:' + ${exception}"/>
+<p th:text="'Path:' + ${path}"/>
+<p th:text="'Status:' + ${status}"/>
+<p th:text="'Timestamp:' + ${timestamp}"/>
 </body>
-</html>
+</html>
diff --git a/src/test/java/com/github/binarywang/demo/wx/mp/controller/BaseControllerTest.java b/src/test/java/com/github/binarywang/demo/wx/mp/controller/BaseControllerTest.java
@@ -14,11 +14,11 @@
  * @date 2019-06-14
  */
 public abstract class BaseControllerTest {
-	private static final String ROOT_URL = "http://127.0.0.1:8080/";
+    private static final String ROOT_URL = "http://127.0.0.1:8080/";
 
-	@BeforeTest
-	public void setup() {
-		RestAssured.baseURI = ROOT_URL;
-	}
+    @BeforeTest
+    public void setup() {
+        RestAssured.baseURI = ROOT_URL;
+    }
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,6 @@ insert_final_newline = true @@
     [*.md]
     trim_trailing_whitespace = false
+    [*.yml]
+    indent_size = 2