Merge branch 'm33' into 'master'

修改注销接口

See merge request !27

license/src/main/java/iot/sixiang/license/controller/LoginController.java

@@ -8,6 +8,7 @@ import iot.sixiang.license.jwt.JwtUtil;
 import iot.sixiang.license.jwt.LoginUser;
 import iot.sixiang.license.log.BusinessType;
 import iot.sixiang.license.log.MyLog;
+import iot.sixiang.license.model.BaseResult;
 import iot.sixiang.license.model.ResResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -62,12 +63,8 @@ public class LoginController {
 
     @ApiOperation(value = "注销接口", notes = "注销接口")
     @GetMapping("logout")
-    @MyLog(title = "注销", optParam = "#{userName},#{password}", businessType = BusinessType.OTHER)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "userName",value = "用户名",required = true),
-            @ApiImplicitParam(name = "password",value = "密码",required = true)
-    })
-    public ResResult logout(@RequestParam("userName") String userName, @RequestParam("password") String password) {
-        return ResResult.fail().msg("用户名或密码错误");
+    @MyLog(title = "注销", businessType = BusinessType.OTHER)
+    public BaseResult logout() {
+        return BaseResult.success();
     }
 }