Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-10-11 4d0d9fa2c0231543ddb9145c09790ae323cef309

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java

@@ -2,6 +2,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.interfaces.OperLog;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

@@ -30,6 +31,7 @@

    @ApiOperation(value = "登录")
    @PostMapping("login")
    @OperLog(operModul = "运营后台登录",operType = 0,businessType = "登录")
    public R login(@RequestBody LoginBody loginBody) {
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
@@ -44,6 +46,7 @@

    @ApiOperation(value = "登出")
    @PostMapping("logout")
    @OperLog(operModul = "运营后台登录",operType = 0,businessType = "登出")
    public R login() {
        String token = this.getToken();
        if (ObjectUtils.isEmpty(token)) {