From 242fad1691917c4fd82c7f04b6190a7113628e93 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 11 三月 2022 15:31:04 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java b/pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java
index 04f116a..e7d394c 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java
@@ -15,12 +15,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.pollex.pam.domain.Customer;
-import com.pollex.pam.enums.CustomerDetailEnum;
-import com.pollex.pam.repository.CustomerRepository;
+import com.pollex.pam.business.domain.Customer;
+import com.pollex.pam.business.enums.CustomerDetailEnum;
+import com.pollex.pam.business.repository.CustomerRepository;
import com.pollex.pam.security.jwt.TokenProvider;
import com.pollex.pam.security.token.OtpAuthenticationToken;
-import com.pollex.pam.web.rest.vm.OtpAccount;
+import com.pollex.pam.business.web.vm.OtpAccount;
@Service
@Transactional
@@ -59,9 +59,7 @@
new UsernamePasswordAuthenticationToken(account, otpCode, grantedAuths);
Map<String, String> details = new HashMap<>();
- details.put(CustomerDetailEnum.ID.getValue(), customer.getId().toString());
- details.put(CustomerDetailEnum.NAME.getValue(), customer.getName());
-
+ details.put(CustomerDetailEnum.DB_ID.getValue(), customer.getId().toString());
authenticationToken.setDetails(details);
return authenticationToken;
--
Gitblit v1.8.0