Merge pull request #60 from geekidea/dev

🇨🇳 1.3.0.RELEASE shiro+jwt

Author: springboot-plus

.gitignore

@@ -31,3 +31,4 @@
 logs
 
 
+

CHANGELOG.md

@@ -1,5 +1,20 @@
 # 更新日志 CHANGELOG
 
+## [V1.3.0-RELEASE] 
+
+###  ⭐️  New Features
+
+### ⚡️ Optimization
+	
+### 📝 Added/Modified
+
+
+### 📔  Documentation
+
+### 🔨 Dependency Upgrades
+- Upgrade to `Fastjson` 1.2.61
+
+
 ## [V1.2.3-RELEASE] 2019.09.09 :computer: 
 > spring-boot-plusV1.2.3发布，CentOS快速安装环境/构建/部署/启动项目
 

README-zh.md

@@ -293,6 +293,7 @@ tail -f -n 1000 /root/spring-boot-plus-server/logs/spring-boot-plus.log
 ```
 
 ## spring-boot-plus 视频  :movie_camera:
+- [5分钟完成增删改查](https://www.bilibili.com/video/av67401204)
 - [CentOS 快速安装 JDK/Git/Maven/Redis/MySQL](https://www.bilibili.com/video/av67218836/)
 - [CentOS 快速部署/构建/打包/运行项目](https://www.bilibili.com/video/av67218970/)
 

README.md

@@ -298,17 +298,11 @@ tail -f -n 1000 /root/spring-boot-plus-server/logs/spring-boot-plus.log
 ```
 
 
-## spring-boot-plus Video  :movie_camera: 
+## spring-boot-plus Videos  :movie_camera: 
+- [5-Minutes-Finish-CRUD](https://www.bilibili.com/video/av67401204)
 - [CentOS Quick Installation JDK/Git/Maven/Redis/MySQL](https://www.bilibili.com/video/av67218836/)
 - [CentOS Quick Build / Deploy / Launch Spring-boot-plus Project](https://www.bilibili.com/video/av67218970/)
 
 
-## Contact
-- Email: [springbootplus@aliyun.com](mailto:springbootplus@aliyun.com)
-- QQ Group
-
-![spring-boot-plus QQ Group](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/img/spring-boot-plus-qq-group.png)
-
-
 ## License
 spring-boot-plus is under the Apache 2.0 license. See the [LICENSE](https://github.com/geekidea/spring-boot-plus/blob/master/LICENSE) file for details.

pom.xml

@@ -21,7 +21,7 @@
 
     <groupId>io.geekidea</groupId>
     <artifactId>spring-boot-plus</artifactId>
-    <version>1.2.3.RELEASE</version>
+    <version>1.3.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-plus</name>
@@ -47,7 +47,7 @@
         <project.reporting.outputEncoding>${utf8}</project.reporting.outputEncoding>
         <project-parent.version>${parent.version}</project-parent.version>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.1.8.RELEASE</spring-boot.version>
+        <spring-boot.version>2.1.0.RELEASE</spring-boot.version>
         <mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
         <fastjson.version>1.2.60</fastjson.version>
         <swagger2.version>2.6.1</swagger2.version>
@@ -67,6 +67,7 @@
         <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
         <hutool.version>4.6.4</hutool.version>
         <junit.version>4.12</junit.version>
+        <mapstruct.version>1.3.0.Final</mapstruct.version>
 
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
@@ -239,12 +240,6 @@
             <artifactId>snakeyaml</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>${jwt.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
@@ -256,6 +251,12 @@
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
             <version>${spring-boot-admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>de.codecentric</groupId>
+                    <artifactId>spring-boot-admin-server-cloud</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -265,12 +266,44 @@
         <!-- spring boot admin end -->
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
+            <groupId>org.ini4j</groupId>
+            <artifactId>ini4j</artifactId>
+            <version>0.5.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${mapstruct.version}</version>
+            <scope>provided</scope>
         </dependency>
 
+        <!-- Shiro JWT start -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring-boot-web-starter</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.8.3</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>io.jsonwebtoken</groupId>-->
+<!--            <artifactId>jjwt</artifactId>-->
+<!--            <version>${jwt.version}</version>-->
+<!--        </dependency>-->
+
+        <!-- Spring Security JWT start -->
+
     </dependencies>
 
     <build>
@@ -387,7 +420,6 @@
                 </executions>
             </plugin>
 
-
         </plugins>
 
     </build>

src/bin/startup.sh

@@ -116,7 +116,7 @@ STARTUP_LOG="${STARTUP_LOG}application JAVA_OPT : ${JAVA_OPT}\n"
 
 
 # 打印启动命令
-STARTUP_LOG="${STARTUP_LOG}application background startup command: nohup java ${JAVA_OPT} -jar ${BASE_PATH}/lib/${APPLICATION_JAR} --spring.config.location=${CONFIG_DIR} > ${LOG_PATH} 2>&1 &\n"
+STARTUP_LOG="${STARTUP_LOG}application background startup command: nohup java ${JAVA_OPT} -jar ${BASE_PATH}/lib/${APPLICATION_JAR} --spring.config.location=${CONFIG_DIR} --logging.config=${CONFIG_DIR}logback.xml > ${LOG_PATH} 2>&1 &\n"
 
 
 #======================================================================

src/main/java/io/geekidea/springbootplus/common/api/ApiCode.java

@@ -32,10 +32,14 @@ public enum ApiCode {
 
     NOT_PERMISSION(403, "没有权限"),
 
-    NOT_FOUND(404, "你请求的路径不存在"),
+    NOT_FOUND(404, "你请求的资源不存在"),
 
     FAIL(500, "操作失败"),
 
+
+    LOGIN_EXCEPTION(4000,"登陆失败"),
+
+
     SYSTEM_EXCEPTION(5000,"系统异常!"),
 
     PARAMETER_EXCEPTION(5001,"请求参数校验异常"),
@@ -44,7 +48,6 @@ public enum ApiCode {
 
     HTTP_MEDIA_TYPE_EXCEPTION(5003,"HTTP Media 类型异常"),
 
-    SYSTEM_LOGIN_EXCEPTION(5005,"系统登录异常")
 
     ;
 

src/main/java/io/geekidea/springbootplus/common/api/ApiResult.java

@@ -93,7 +93,11 @@ public static ApiResult ok(Object data){
         return result(ApiCode.SUCCESS,data);
     }
 
-    public static ApiResult ok(String key,Object value){
+    public static ApiResult ok(Object data,String msg){
+        return result(ApiCode.SUCCESS,msg,data);
+    }
+
+    public static ApiResult okMap(String key,Object value){
         Map<String,Object> map = new HashMap<>();
         map.put(key,value);
         return ok(map);
@@ -122,4 +126,7 @@ public static ApiResult fail(String key,Object value){
         return result(ApiCode.FAIL,map);
     }
 
+    public static ApiResult fail() {
+        return fail(ApiCode.FAIL);
+    }
 }

src/main/java/io/geekidea/springbootplus/common/constant/CommonConstant.java

@@ -41,11 +41,25 @@ public interface CommonConstant {
     /**
      * 登陆token
      */
-    String TOKEN = "token";
+    String JWT_TOKEN_NAME = "token";
+
+    /**
+     * JWT用户名
+     */
+    String JWT_USERNAME = "username";
+
+
     /**
-     * 刷新token
+     * JWT刷新新token响应状态码
      */
-    String REFRESH_TOKEN = "refresh_token";
+    int JWT_REFRESH_TOKEN_CODE = 460;
+
+    /**
+     * JWT刷新新token响应状态码，
+     * Redis中不存在，但jwt未过期，不生成新的token，返回361状态码
+     */
+    int JWT_INVALID_TOKEN_CODE = 461;
+
 
     /**
      * 初始密码

src/main/java/io/geekidea/springbootplus/common/constant/CommonRedisKey.java

@@ -26,12 +26,23 @@
 public interface CommonRedisKey {
 
     /**
-     * 系统登录用户
+     * 登陆用户token信息key
      */
-    String LOGIN_SYS_USER = "login:sys:user:%s";
+    String LOGIN_TOKEN = "login:token:%s";
+
+    /**
+     * 登陆用户信息key
+     */
+    String LOGIN_USER = "login:user:%s";
+
+    /**
+     * 登陆用户盐值信息key
+     */
+    String LOGIN_SALT= "login:salt:%s";
+
     /**
-     * 系统登录token
+     * 登陆user hash key
      */
-    String LOGIN_TOKEN = "login:token";
+    String LOGIN_USER_HASH = "login:user:hash";
 
 }