Merge branch 'Phase3' into pollex-dev

wayne

2022-03-04 472fd20c108714b28be49d4fedee5bbabe1b2358

 pamapi/src/main/java/com/pollex/pam/web/rest/EServiceResource.java

@@ -1,9 +1,10 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.security.jwt.JWTFilter;
import com.pollex.pam.security.jwt.TokenProvider;
import com.pollex.pam.security.token.EServiceAuthenticationToken;
import com.pollex.pam.web.rest.vm.EServiceLoginVM;
import com.pollex.pam.business.security.token.EServiceAuthenticationToken;
import com.pollex.pam.business.web.vm.EServiceLoginVM;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -16,6 +17,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CONSULTANT_LOGIN;

@RestController
@RequestMapping("/api/eService")
public class EServiceResource {
@@ -26,11 +29,9 @@
    @Autowired
    TokenProvider tokenProvider;

    @AuditLoggingInject(type = CONSULTANT_LOGIN)
    @PostMapping("/authenticate")
    public ResponseEntity<UserJWTController.JWTToken> authorize(@RequestBody EServiceLoginVM eServiceLoginVM) {
        // todo 驗證碼認證


        EServiceAuthenticationToken authenticationToken = new EServiceAuthenticationToken(
            eServiceLoginVM.getUsername(),
            eServiceLoginVM.getPassword()