Merge remote-tracking branch 'origin/master'

hzgzpt-admin/src/main/java/com/miaxis/system/controller/common/CaptchaController.java

@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
  * @author miaxis
  */
 @RestController
-@Api(tags={"【验证码操作处理】Controller"})
+@Api(tags={"【系统-验证码操作处理】"})
 public class CaptchaController
 {
     @Resource(name = "captchaProducer")

hzgzpt-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java

@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author miaxis
  */
 @RestController
-@Api(tags={"【通用请求处理】Controller"})
+@Api(tags={"【系统-通用请求处理】"})
 public class CommonController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);

hzgzpt-admin/src/main/java/com/miaxis/system/controller/monitor/ServerController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/monitor/server")
-@Api(tags={"【服务器监控】Controller"})
+@Api(tags={"【系统-服务器监控】"})
 public class ServerController extends BaseController
 {
     @PreAuthorize("@ss.hasPermi('monitor:server:list')")

hzgzpt-admin/src/main/java/com/miaxis/system/controller/monitor/SysLogininforController.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/monitor/logininfor")
-@Api(tags={"【系统访问记录】Controller"})
+@Api(tags={"【系统-系统访问记录】"})
 public class SysLogininforController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/monitor/SysOperlogController.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/monitor/operlog")
-@Api(tags={"【操作日志记录】Controller"})
+@Api(tags={"【系统-操作日志记录】"})
 public class SysOperlogController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/monitor/SysUserOnlineController.java

@@ -28,7 +28,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/monitor/online")
-@Api(tags={"【在线用户监控】Controller"})
+@Api(tags={"【系统-在线用户监控】"})
 public class SysUserOnlineController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysConfigController.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/config")
-@Api(tags={"【参数配置 信息操作处理】Controller"})
+@Api(tags={"【系统-参数配置 信息操作处理】"})
 public class SysConfigController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysDeptController.java

@@ -31,7 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/dept")
-@Api(tags={"【部门信息】Controller"})
+@Api(tags={"【系统-部门信息】"})
 public class SysDeptController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysDictDataController.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/dict/data")
-@Api(tags={"【数据字典信息】Controller"})
+@Api(tags={"【系统-数据字典信息】"})
 public class SysDictDataController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysDictTypeController.java

@@ -26,7 +26,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/dict/type")
-@Api(tags={"【数据字典类型信息】Controller"})
+@Api(tags={"【系统-数据字典类型信息】"})
 public class SysDictTypeController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -31,7 +31,7 @@ import java.util.Set;
  * @author miaxis
  */
 @RestController
-@Api(tags={"【登录验证】Controller"})
+@Api(tags={"【系统-登录验证】"})
 public class SysLoginController
 {
     @Autowired
@@ -53,7 +53,7 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    @ApiOperation("登录方法")
+    @ApiOperation("系统-登录方法")
     public Response<TokenDTO> login(@RequestBody LoginBody loginBody)
     {   TokenDTO tokenDTO = new TokenDTO();
         // 生成令牌

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysMenuController.java

@@ -33,7 +33,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/menu")
-@Api(tags={"【菜单信息】Controller"})
+@Api(tags={"【系统-菜单信息】"})
 public class SysMenuController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysNoticeController.java

@@ -23,7 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/notice")
-@Api(tags={"【公告信息操作处理】Controller"})
+@Api(tags={"【系统-公告信息操作处理】"})
 public class SysNoticeController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysPostController.java

@@ -26,7 +26,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/post")
-@Api(tags={"【岗位信息操作处理】Controller"})
+@Api(tags={"【系统-岗位信息操作处理】"})
 public class SysPostController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysProfileController.java

@@ -30,7 +30,7 @@ import java.io.IOException;
  */
 @RestController
 @RequestMapping("/system/user/profile")
-@Api(tags={"【个人信息业务处理】Controller"})
+@Api(tags={"【系统-个人信息业务处理】"})
 public class SysProfileController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysRoleController.java

@@ -32,7 +32,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/role")
-@Api(tags={"【角色信息】Controller"})
+@Api(tags={"【系统-角色信息】"})
 public class SysRoleController extends BaseController
 {
     @Autowired

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/system/user")
-@Api(tags={"【用户信息】Controller"})
+@Api(tags={"【系统-用户信息】"})
 public class SysUserController extends BaseController
 {
     @Autowired
@@ -56,7 +56,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    @ApiOperation("获取用户列表")
+    @ApiOperation("系统-获取用户列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),

hzgzpt-framework/src/main/java/com/miaxis/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 
 /**
  * token过滤器 验证token有效性
- * 
+ *
  * @author miaxis
  */
 @Component

hzgzpt-framework/src/main/java/com/miaxis/framework/web/service/UserDetailsServiceImpl.java

@@ -14,6 +14,8 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 用户验证处理
  *
@@ -33,6 +35,8 @@ public class UserDetailsServiceImpl implements UserDetailsService
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
+
+//        HttpServletRequest httpServletRequest = HttpContextUtil.getHttpServletRequest();
         SysUser user = userService.selectUserByUserName(username);
         if (StringUtils.isNull(user))
         {

hzgzpt-generator/src/main/java/com/miaxis/generator/controller/GenController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/tool/gen")
-@Api(tags={"【代码生成 操作处理】Controller"})
+@Api(tags={"【系统-代码生成 操作处理】"})
 public class GenController extends BaseController
 {
     @Autowired