Merge remote-tracking branch 'origin/master'

doum

昨天 2f3221b7c90d5663fdb312653a2d188bc4628370

 server/services/src/main/java/com/doumee/api/system/SystemController.java

@@ -8,9 +8,11 @@
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.system.dto.DingLoginDTO;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.system.SystemLoginService;
import com.taobao.api.ApiException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.Map;

/**
 * @author  dm
@@ -48,9 +51,23 @@
        return ApiResponse.success(systemLoginService.loginByPassword(dto, request));
    }



    @PreventRepeat(limit = 10, lockTime = 10000)
    @ApiOperation("钉钉授权登录")
//    @EncryptionReq
//    @EncryptionResp
    @PostMapping("/loginByDingTalk")
    public ApiResponse<Map<String,Object>> loginByDingTalk (@Validated @RequestBody DingLoginDTO dto, HttpServletRequest request) throws ApiException {
        return ApiResponse.success(systemLoginService.loginByDingTalk(dto, request));
    }



    @ApiOperation("退出登录")
    @PostMapping("/logout")
    public ApiResponse logout () {
        systemUserBiz.cleanUnionId(this.getLoginUser().getId());
        Subject subject = SecurityUtils.getSubject();
        subject.logout();
        return ApiResponse.success(null);