Merge branch 'pollex-dev' into sit

wayne

2022-03-11 242fad1691917c4fd82c7f04b6190a7113628e93

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

@@ -2,10 +2,9 @@

import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.security.jwt.TokenProvider;
import com.pollex.pam.service.LoginRecordService;
import com.pollex.pam.service.OtpWebService;
import com.pollex.pam.service.dto.EServiceResponse;
import com.pollex.pam.service.dto.OtpResponseDTO;
import com.pollex.pam.business.service.dto.EServiceResponse;
import com.pollex.pam.business.service.dto.OtpResponseDTO;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -41,9 +40,6 @@
public class TestLoginResource {

    private final static Logger log = LoggerFactory.getLogger(TestLoginResource.class);

    @Autowired
    LoginRecordService loginRecordService;

    @Autowired
    ApplicationProperties applicationProperty;