djb-eapim/eapim-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/eactive/workspaces/eapim-bundle/bundles/251211/eapim-portal_incremental_2025-11-15.bundle into jenkins_with_weblogic

Browse Source
This commit is contained in:
Rinjae
2025-12-11 16:54:57 +09:00
parent 1dae5f5697 f19d674311
commit e4a2a6305c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/apim/portal/apps/user/facade/UserManFacade.java
+11 -2
View File
@@ -30,6 +30,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.sound.midi.Receiver;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.time.Duration; import java.time.Duration;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -121,8 +122,8 @@ public class UserManFacade {
String token = createInvitation(sender, emailAddr); String token = createInvitation(sender, emailAddr);
// {"CRPT_NM":"%corpName%", "MNGR_NM":"%managerName%", "CUST_ID":"%loginId%", "AUTH_NO": "%authNumber%", "NAME": "%loginId%"} // {"CRPT_NM":"%corpName%", "MNGR_NM":"%managerName%", "CUST_ID":"%loginId%", "AUTH_NO": "%authNumber%", "NAME": "%loginId%"}
MessageRecipient recipient = new MessageRecipient(); MessageRecipient recipient;
recipient.setUserId(emailAddr);
HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> params = new HashMap<>();
params.put("managerName", sender.getUserName()); params.put("managerName", sender.getUserName());
params.put("corpName", sender.getPortalOrg().getOrgName()); params.put("corpName", sender.getPortalOrg().getOrgName());
@@ -134,10 +135,18 @@ public class UserManFacade {
params.put("loginId", user.getUserName()); params.put("loginId", user.getUserName());
params.put("NAME", user.getUserName()); params.put("NAME", user.getUserName());
params.put("url", "signup/decision?invitation=" + token); params.put("url", "signup/decision?invitation=" + token);
recipient = MessageRecipient.of(user);
} else { } else {
params.put("loginId", emailAddr); params.put("loginId", emailAddr);
params.put("NAME", emailAddr); params.put("NAME", emailAddr);
params.put("url", "signup/portalUser?invitation=" + token); params.put("url", "signup/portalUser?invitation=" + token);
String emailUsername = emailAddr.contains("@") ? emailAddr.substring(0, emailAddr.indexOf("@")) : emailAddr;
recipient = MessageRecipient.builder()
.userId(emailAddr)
.username(emailUsername)
.build();
} }
messageHandlerService.publishEvent(UserInvitationEvent.KEY, recipient, params); messageHandlerService.publishEvent(UserInvitationEvent.KEY, recipient, params);