From abe852d66bb13f2aa8bf79725933bed4e56d8588 Mon Sep 17 00:00:00 2001
From: SimonSun <simon.sun.dev@hotmail.com>
Date: Tue, 21 Aug 2018 10:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5material=20design=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 31 ++++++++++++++++---
 .../common/code/FreeMarkerGeneratorUtil.java  |  2 +-
 .../com/simon/common/code/TypeTranslator.java | 11 +++++--
 .../controller/TokenErrorController.java      |  1 +
 src/main/resources/templates/login.html       | 26 ++++++++++------
 5 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a4e728..952e292 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,21 +275,44 @@
 			<version>1.10</version>
 		</dependency>
 
+		<!-- webjars start -->
 		<dependency>
-			<groupId>org.webjars</groupId>
+			<groupId>org.webjars.bower</groupId>
 			<artifactId>jquery</artifactId>
-			<version>3.3.1</version>
+			<version>3.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars.npm</groupId>
 			<artifactId>popper.js</artifactId>
-			<version>1.14.3</version>
+			<version>1.12.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>bootstrap</artifactId>
-			<version>4.1.2</version>
+			<version>4.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.npm</groupId>
+			<artifactId>bootstrap-material-design</artifactId>
+			<version>4.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>bootstrap-material-design</artifactId>
+			<version>4.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>mdbootstrap-bootstrap-material-design</artifactId>
+			<version>4.5.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>fontawesome</artifactId>
+			<version>4.7.0</version>
 		</dependency>
+		<!-- webjars end -->
 
 		<!-- 七牛云 start -->
 		<dependency>
diff --git a/src/main/java/com/simon/common/code/FreeMarkerGeneratorUtil.java b/src/main/java/com/simon/common/code/FreeMarkerGeneratorUtil.java
index 8187c2e..a926d35 100644
--- a/src/main/java/com/simon/common/code/FreeMarkerGeneratorUtil.java
+++ b/src/main/java/com/simon/common/code/FreeMarkerGeneratorUtil.java
@@ -153,7 +153,7 @@ public class FreeMarkerGeneratorUtil {
             }
 
             String annotation = null;
-            if ("id".equals(name)) {
+            if ("id".equalsIgnoreCase(name)) {
                 if (propertyType.equalsIgnoreCase("Long")) {
                     annotation = "@Id\n" +
                             "    @KeySql(genId = SnowflakeGenId.class)\n" +
diff --git a/src/main/java/com/simon/common/code/TypeTranslator.java b/src/main/java/com/simon/common/code/TypeTranslator.java
index a5d7960..8766dfc 100644
--- a/src/main/java/com/simon/common/code/TypeTranslator.java
+++ b/src/main/java/com/simon/common/code/TypeTranslator.java
@@ -26,7 +26,10 @@ public class TypeTranslator {
                 return "Integer";
             }
         }
-        if(dataType.equals("SMALLINT") || dataType.equals("MEDIUMINT") || dataType.equals("YEAR") || dataType.equals("INT")){
+        if(dataType.equals("SMALLINT")){
+            return "Short";
+        }
+        if(dataType.equals("MEDIUMINT") || dataType.equals("YEAR") || dataType.equals("INT")){
             return "Integer";
         }
         if(dataType.contains("INTEGER")){
@@ -75,8 +78,10 @@ public class TypeTranslator {
                 return "Byte[]";
             }
         }
-
-        if(dataType.equals("INTEGER") || dataType.equals("SMALLINT") || dataType.equals("SERIAL")){
+        if(dataType.equals("SMALLINT")){
+            return "Short";
+        }
+        if(dataType.equals("INTEGER") || dataType.equals("SERIAL")){
             return "Integer";
         }
         if(dataType.equals("BIGINT") || dataType.equals("BIGSERIAL")){
diff --git a/src/main/java/com/simon/controller/TokenErrorController.java b/src/main/java/com/simon/controller/TokenErrorController.java
index 2f39bf8..b510fd3 100644
--- a/src/main/java/com/simon/controller/TokenErrorController.java
+++ b/src/main/java/com/simon/controller/TokenErrorController.java
@@ -47,6 +47,7 @@ public class TokenErrorController extends BasicErrorController {
         HttpStatus status = getStatus(request);
         resultMap.put(AppConfig.CODE, status.value());
         resultMap.put(AppConfig.MESSAGE, body.get("message"));
+        log.error(body.toString());
         log.error(body.get("message").toString());
         resultMap.put(AppConfig.DATA, null);
         return new ResponseEntity<>(resultMap, status);
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 9ac6521..33bc221 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -2,20 +2,21 @@
 <html lang="en" 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 name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="stylesheet" th:href="@{/webjars/bootstrap/4.1.2/css/bootstrap.min.css}">
+    <link rel="stylesheet" th:href="@{/webjars/bootstrap-material-design/4.1.1/dist/css/bootstrap-material-design.min.css}">
     <title th:text="#{login}"></title>
     <style>
-        body,html {
+        body, html {
             height: 100%;
             background-color: #F1F3F4;
         }
+
         body {
-            display:flex;
-            align-items:center;
+            display: flex;
+            align-items: center;
         }
+
         form {
             background-color: white;
             padding: 6px;
@@ -35,12 +36,17 @@
                 <label for="password"></label>
                 <input type="password" class="form-control" id="password" name="password" th:placeholder="#{password}">
             </div>
-            <button type="submit" name="submit" class="btn btn-primary col-12" th:text="#{login}"></button>
+            <button type="submit" name="submit" class="btn btn-raised btn-primary col-12" th:text="#{login}"></button>
         </form>
     </div>
 </div>
-<script th:src="@{/webjars/jquery/3.3.1/jquery.min.js}"></script>
-<script th:src="@{/webjars/popper.js/1.14.3/dist/popper.min.js}"></script>
-<script th:src="@{/webjars/bootstrap/4.1.2/js/bootstrap.min.js}"></script>
+<script th:src="@{/webjars/jquery/3.2.1/dist/jquery.slim.min.js}"></script>
+<script th:src="@{/webjars/popper.js/1.12.5/dist/umd/popper.min.js}"></script>
+<script th:src="@{/webjars/bootstrap-material-design/4.1.1/dist/js/bootstrap-material-design.min.js}"></script>
+<script>
+    $(document).ready(function () {
+        $('body').bootstrapMaterialDesign();
+    });
+</script>
 </body>
 </html>
\ No newline at end of file
-- 
Gitee