From c2d8465faade429e8b8f677864b0bc2da763e71c Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 23 十一月 2021 11:57:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/LoginService.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/LoginService.java b/pamapi/src/main/java/com/pollex/pam/service/LoginService.java
index c8ca009..0cd4b29 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/LoginService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/LoginService.java
@@ -1,28 +1,33 @@
package com.pollex.pam.service;
-import com.fasterxml.jackson.databind.ObjectMapper;;
-import com.pollex.pam.config.ApplicationProperties;
-import com.pollex.pam.service.dto.EServiceRequest;
-import com.pollex.pam.web.rest.vm.EServiceRequestVM;
-import com.pollex.pam.service.dto.EServiceResponse;
-import com.pollex.pam.web.rest.vm.OtpEmailLoginVM;
-import com.pollex.pam.web.rest.vm.OtpSMSLoginVM;
-import com.pollex.pam.web.rest.vm.VerifyOtpVM;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.SSLContext;
+
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContexts;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import javax.net.ssl.SSLContext;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.pollex.pam.config.ApplicationProperties;
+import com.pollex.pam.service.dto.EServiceRequest;
+import com.pollex.pam.service.dto.EServiceResponse;
+import com.pollex.pam.web.rest.vm.OtpEmailLoginVM;
+import com.pollex.pam.web.rest.vm.OtpSMSLoginVM;
+import com.pollex.pam.web.rest.vm.VerifyOtpVM;
@Service
@@ -48,12 +53,12 @@
// ��身�����B��Ⅱ隤�
}
- public ResponseEntity<EServiceResponse> loginByEService(EServiceRequestVM param) throws Exception{
+ public ResponseEntity<EServiceResponse> loginByEService(String account, String paxxword) throws Exception{
EServiceRequest dto = new EServiceRequest();
dto.setFunc("ValidateUserLogin");
- dto.setId(param.getUsername());
- dto.setPin(param.getPassword());
- dto.setPwd(param.getPassword());
+ dto.setId(account);
+ dto.setPin(paxxword);
+ dto.setPwd(paxxword);
dto.setSys("epos");
String dtoJson = new ObjectMapper().writeValueAsString(dto);
--
Gitblit v1.8.0