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

Merge branch 'devs/ums' into jenkins_with_weblogic

Browse Source 
# Conflicts:
#	src/main/java/com/eactive/apim/portal/apps/auth/service/MessageSender.java
#	src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java
#	src/main/java/com/eactive/apim/portal/apps/user/facade/UserRegisterFacadeImpl.java
This commit is contained in:
Rinjae
2025-11-05 19:06:00 +09:00
parent 51e171989a 8c4c9e4c32
commit 46eeda1d6a
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1
View File
@@ -27,6 +27,7 @@ dependencies {
implementation project(':elink-online-core-jpa')
implementation project(':elink-portal-common')
implementation project(':kjb-safedb')
implementation('org.springframework.boot:spring-boot-starter')
implementation 'org.springframework.boot:spring-boot-starter-jta-atomikos'
src/main/java/com/eactive/apim/portal/apps/auth/service/MessageSender.java
-1
View File
@@ -39,7 +39,6 @@ public class MessageSender {
} else {
throw new IllegalArgumentException("Unsupported message type: " + msgType);
}
messageHandlerService.publishEvent(code, recipient, params);
}
}
src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java
+2 -2
View File
@@ -19,8 +19,8 @@ import com.eactive.apim.portal.file.service.FileTypeContext;
import com.eactive.apim.portal.portalorg.entity.PortalOrg;
import com.eactive.apim.portal.portaluser.entity.PortalUser;
import com.eactive.apim.portal.portaluser.entity.PortalUserEnums;
import com.eactive.apim.portal.portaluser.event.UserVerificationEmailEvent;
import com.eactive.apim.portal.portaluser.repository.PortalUserRepository;
import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.apim.portal.template.service.MessageHandlerService;
import com.eactive.apim.portal.template.service.MessageRecipient;
import lombok.RequiredArgsConstructor;
@@ -206,7 +206,7 @@ public class OrgRegisterFacadeImpl implements OrgRegisterFacade {
try {
String encToken = encryptionUtil.encrypt(tokenValue);
params.put("token", Base64.encode(encToken.getBytes(StandardCharsets.UTF_8)));
messageHandlerService.publishEvent(UserVerificationEmailEvent.KEY, recipient, params);
messageHandlerService.publishEvent(MessageCode.USER_VERIFICATION_EMAIL, recipient, params);
} catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException e) {
throw new SystemException("암호화 모듈 오류");
}
src/main/java/com/eactive/apim/portal/apps/user/facade/UserRegisterFacadeImpl.java
+2 -2
View File
@@ -16,8 +16,8 @@ import com.eactive.apim.portal.invitation.entity.UserInvitation;
import com.eactive.apim.portal.invitation.entity.UserInvitationEnums;
import com.eactive.apim.portal.invitation.repository.UserInvitationRepository;
import com.eactive.apim.portal.portaluser.entity.PortalUser;
import com.eactive.apim.portal.portaluser.event.UserVerificationEmailEvent;
import com.eactive.apim.portal.portaluser.repository.PortalUserRepository;
import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.apim.portal.template.service.MessageHandlerService;
import com.eactive.apim.portal.template.service.MessageRecipient;
import lombok.RequiredArgsConstructor;
@@ -219,7 +219,7 @@ public class UserRegisterFacadeImpl implements UserRegisterFacade {
String tokenValue = String.valueOf(authNumberGenerator.generateAuthNumber());
// String tokenValue = registeredUser.getCreatedDate().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")) + ":" + registeredUser.getId();
params.put("token", tokenValue);
messageHandlerService.publishEvent(UserVerificationEmailEvent.KEY, recipient, params);
messageHandlerService.publishEvent(MessageCode.USER_VERIFICATION_EMAIL, recipient, params);
// try {
// String encToken = encryptionUtil.encrypt(tokenValue);
src/main/resources/logback-rinjae.xml
+20 -1
View File
@@ -47,13 +47,32 @@
<logger name="com.eactive.eapim" level="DEBUG" />
<!-- hibernate 로그 -->
<logger name="org.hibernate.SQL" level="DEBUG" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="org.hibernate.engine.jdbc.spi.SqlExceptionHelper" additivity="false">
<logger name="org.hibernate.engine.transaction.internal.TransactionImpl" level="DEBUG" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="org.hibernate.Transaction" level="DEBUG" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="org.hibernate.engine.jdbc.spi.SqlExceptionHelper" level="DEBUG" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="org.springframework.transaction" level="TRACE" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="org.springframework.transaction.interceptor" level="TRACE" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="org.springframework.orm.jpa.JpaTransactionManager" level="DEBUG" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="com.atomikos" level="DEBUG" additivity="false">
<appender-ref ref="FILE_HIBERNATE" />
</logger>
<logger name="com.eactive.apim.portal.spring.DatabaseSessionVerifier" level="debug">