From 4e5136bd4ab797bf1ad5f3332de86848e7db0c3d Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期二, 30 十一月 2021 10:55:40 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java | 3 ++-
pamapi/src/main/java/com/pollex/pam/domain/LoginRecord.java | 2 ++
pamapi/src/main/java/com/pollex/pam/service/dto/EServiceResponse.java | 11 ++++++++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/domain/LoginRecord.java b/pamapi/src/main/java/com/pollex/pam/domain/LoginRecord.java
index e74556b..42bce49 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/LoginRecord.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/LoginRecord.java
@@ -11,6 +11,8 @@
@Table(name = "login_record")
public class LoginRecord implements Serializable {
+ private static final long serialVersionUID = 1L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
diff --git a/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java b/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
index 0a3db3b..9a90c5e 100644
--- a/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
+++ b/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
@@ -68,6 +68,7 @@
ResponseEntity<EServiceResponse> responseEntity = loginByEService(account, credentials);
if(HttpStatus.OK.equals(responseEntity.getStatusCode())) {
EServiceResponse eServiceResponse = responseEntity.getBody();
+ log.debug("eService response = {}", eServiceResponse);
if(E_SERVICE_LOGIN_SUCCESS_CODE.equals(eServiceResponse.getCode())){
loginRecordService.saveEServiceLoginSuccessRecord(account);
@@ -88,7 +89,7 @@
}
private UsernamePasswordAuthenticationToken getConsultantToken(String account, String credential) {
- Consultant consultant = consultantRepository.findOneByAgentNo(account).orElseThrow(() -> new UsernameNotFoundException("consultant is not in db, consultant agentNo = " + account));
+ Consultant consultant = consultantRepository.findOneByAgentNo(account).orElseThrow(() -> new UsernameNotFoundException("閰脤“����蒂銝��慦�像�蝟餌絞銝�"));
List<GrantedAuthority> grantedAuths = Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"));
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(account, credential, grantedAuths);
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/EServiceResponse.java b/pamapi/src/main/java/com/pollex/pam/service/dto/EServiceResponse.java
index 8b06043..a04681d 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/EServiceResponse.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/EServiceResponse.java
@@ -6,7 +6,7 @@
private String issuccess;
private String code;
private String msg;
- List<EServiceData> data;
+ private List<EServiceData> data;
public String getIssuccess() {
return issuccess;
@@ -39,6 +39,15 @@
public void setData(List<EServiceData> data) {
this.data = data;
}
+
+ @Override
+ public String toString() {
+ return "EServiceResponse{" +
+ "issuccess='" + issuccess + '\'' +
+ ", code='" + code + '\'' +
+ ", msg='" + msg + '\'' +
+ '}';
+ }
}
class EServiceData {
--
Gitblit v1.8.0