Merge remote-tracking branch 'origin/dev' into jrz_dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -10,6 +10,8 @@ import com.github.wxiaoqi.security.common.util.EntityUtils;
 import com.github.wxiaoqi.security.common.util.IpUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 
+@Api(tags = "用户登录")
 @RestController
 @RequestMapping("jwt")
 @Slf4j

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/BaseUserMemberController.java

@@ -38,7 +38,7 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
      * @return
      */
     @ApiOperation(value = "根据用户id获取用户会员信息")
-    @RequestMapping("/findOne/{userId}")
+    @GetMapping("/findOne/{userId}")
     public ObjectRestResponse<BaseUserMemberVO> findOneByUserId(@PathVariable Integer userId){
         return  ObjectRestResponse.succ(baseBiz.findOneByUserId(userId));
     }
@@ -49,7 +49,7 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
      * @return
      */
 
-    @RequestMapping("/getUserMember")
+    @GetMapping("app/getUserMember")
     @ApiOperation(value = "根据token获取用户会员信息")
     public ObjectRestResponse<BaseUserMemberVO> findOneByToken(){
         try {