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

Merge branch 'staging' into devs/safedb-password_encoder

Browse Source
This commit is contained in:
Rinjae
2025-09-29 14:44:20 +09:00
parent 67e6f6d59a 95e50edb55
commit ae01874223
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/WEB-INF/weblogic.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<container-descriptor> <container-descriptor>
<prefer-application-packages> <prefer-application-packages>
<packate-name>org.apach.ignite.*</packate-name> <package-name>org.apach.ignite.*</package-name>
<package-name>org.slf4j.*</package-name> <package-name>org.slf4j.*</package-name>
<package-name>ch.qos.logback.*</package-name> <package-name>ch.qos.logback.*</package-name>
</prefer-application-packages> </prefer-application-packages>
build.gradle
+1
View File
@@ -76,6 +76,7 @@ dependencies {
implementation project(':elink-online-common') implementation project(':elink-online-common')
implementation project(':elink-online-emsclient') implementation project(':elink-online-emsclient')
implementation project(':elink-portal-common') implementation project(':elink-portal-common')
implementation project(':kjb-safedb')
/* Custom Libs */ /* Custom Libs */
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
settings.gradle
+5 -1
View File
@@ -12,4 +12,8 @@ project (':elink-online-core').projectDir = new File(settingsDir, "../eapim-onli
project (':elink-online-transformer').projectDir = new File(settingsDir, "../eapim-online/elink-online-transformer") project (':elink-online-transformer').projectDir = new File(settingsDir, "../eapim-online/elink-online-transformer")
project (':elink-online-common').projectDir = new File(settingsDir, "../eapim-online/elink-online-common") project (':elink-online-common').projectDir = new File(settingsDir, "../eapim-online/elink-online-common")
project (':elink-online-emsclient').projectDir = new File(settingsDir, "../eapim-online/elink-online-emsclient") project (':elink-online-emsclient').projectDir = new File(settingsDir, "../eapim-online/elink-online-emsclient")
project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common") project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common")
include 'kjb-safedb'
project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb")
src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class PortalApprovalManService extends BaseService {
Optional<PortalUser> optUser = portalUserRepository.findById(approval.getTargetId()); Optional<PortalUser> optUser = portalUserRepository.findById(approval.getTargetId());
optUser.ifPresent(user -> { optUser.ifPresent(user -> {
PortalUserUI userUI = isMasked ? PortalUserUI userUI = isMasked ?
portalUserManService.selectDetail(user.getId()) : portalUserManService.selectDetail(user.getId(), true) :
portalUserManService.selectDetailUnmask(user.getId()); portalUserManService.selectDetailUnmask(user.getId());
// IP 마스킹 상태만 재설정 // IP 마스킹 상태만 재설정