Merge branch 'master' into test

README.md

@@ -3,6 +3,9 @@
 ## 介绍
 ## 介绍
 Guns基于SpringBoot 2，致力于做更简洁的后台管理系统，完美整合springmvc + shiro + mybatis-plus + beetl!Guns项目代码简洁，注释丰富，上手容易，同时Guns包含许多基础模块(用户管理，角色管理，部门管理，字典管理等10个模块)，可以直接作为一个后台管理系统的脚手架! 2018目标 `更简洁`，`更规范`!
 Guns基于SpringBoot 2，致力于做更简洁的后台管理系统，完美整合springmvc + shiro + mybatis-plus + beetl!Guns项目代码简洁，注释丰富，上手容易，同时Guns包含许多基础模块(用户管理，角色管理，部门管理，字典管理等10个模块)，可以直接作为一个后台管理系统的脚手架! 2018目标 `更简洁`，`更规范`!
 
 
+## 云服务器全网最低 Guns专属优惠
+1核2G 99/年，298/3年，2核4G 500/1年，1227/3年，2核8G 5M带宽 2000/3年，仅限阿里云新用户，想买的老用户可以注册一个哦，点击链接购买[https://m.aliyun.com/act/team1111/#/share?params=N.lqp2rk5ITB.p4kqz45e](https://m.aliyun.com/act/team1111/#/share?params=N.lqp2rk5ITB.p4kqz45e) 
+
 ### Guns v5.1更新内容
 ### Guns v5.1更新内容
 
 
 > * 框架整体的包名变为cn开头，和域名stylefeng.cn保持一致！
 > * 框架整体的包名变为cn开头，和域名stylefeng.cn保持一致！

src/main/java/cn/stylefeng/guns/core/interceptor/RestApiInteceptor.java

@@ -21,7 +21,6 @@ import cn.stylefeng.guns.core.util.JwtTokenUtil;
 import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import cn.stylefeng.roses.core.util.RenderUtil;
 import cn.stylefeng.roses.core.util.RenderUtil;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.JwtException;
-import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -41,11 +40,10 @@ public class RestApiInteceptor extends HandlerInterceptorAdapter {
         if (handler instanceof org.springframework.web.servlet.resource.ResourceHttpRequestHandler) {
         if (handler instanceof org.springframework.web.servlet.resource.ResourceHttpRequestHandler) {
             return true;
             return true;
         }
         }
-        HandlerMethod handlerMethod = (HandlerMethod) handler;
-        return check(request, response, handlerMethod);
+        return check(request, response);
     }
     }
 
 
-    private boolean check(HttpServletRequest request, HttpServletResponse response, HandlerMethod handlerMethod) {
+    private boolean check(HttpServletRequest request, HttpServletResponse response) {
         if (request.getServletPath().equals(JwtConstants.AUTH_PATH)) {
         if (request.getServletPath().equals(JwtConstants.AUTH_PATH)) {
             return true;
             return true;
         }
         }

src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml

@@ -16,14 +16,14 @@
 		id, num, pid, name,code,tips
 		id, num, pid, name,code,tips
 	</sql>
 	</sql>
 
 
-    <select id="selectByCode" resultType="dict">
+    <select id="selectByCode" resultType="cn.stylefeng.guns.modular.system.model.Dict">
         select
         select
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         from sys_dict
         from sys_dict
         where code = #{code}
         where code = #{code}
     </select>
     </select>
 
 
-    <select id="selectByParentCode" resultType="dict">
+    <select id="selectByParentCode" resultType="cn.stylefeng.guns.modular.system.model.Dict">
         select
         select
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         from sys_dict
         from sys_dict

src/main/java/cn/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml

@@ -68,7 +68,7 @@
 		#{userId}
 		#{userId}
 	</update>
 	</update>
 
 
-	<select id="getByAccount" resultType="user">
+	<select id="getByAccount" resultType="cn.stylefeng.guns.modular.system.model.User">
 		select
 		select
 		<include refid="Base_Column_List_With_Pwd" />
 		<include refid="Base_Column_List_With_Pwd" />
 		from sys_user where account = #{account} and status != 3
 		from sys_user where account = #{account} and status != 3

src/test/java/cn/stylefeng/guns/system/DictTest.java

@@ -35,7 +35,7 @@ public class DictTest extends BaseJunit {
 
 
     @Test
     @Test
     public void editTest() {
     public void editTest() {
-        dictService.editDict(16, "tes", "测试", "备注", "1:测试1;2:测试2");
+        dictService.editDict(16, "tes", "测试", "备注", "1:测试1:1;2:测试2:2");
     }
     }
 
 
     @Test
     @Test