Merge branch 'first_open_fetch' into 'dev'

# Conflicts:
#   core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java
This commit is contained in:
이강선 매니저/ST
2025-07-31 23:44:53 +00:00
612 changed files with 93550 additions and 902 deletions

View File

@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>app.module</groupId>
<artifactId>app.module</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>admin</artifactId>
<build>
<plugins>
<plugin>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
<groupId>org.springframework.boot</groupId>
<version>3.4.0</version>
</plugin>
</plugins>
</build>
<version>0.0.1-SNAPSHOT</version>
<name>admin</name>
<description>Admin project</description>
<packaging>war</packaging>
<dependencies>
<dependency>
<artifactId>core</artifactId>
<groupId>app.module</groupId>
<artifactId>core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<description>Admin project</description>
<modelVersion>4.0.0</modelVersion>
<name>admin</name>
<packaging>${packaging.type}</packaging>
<parent>
<artifactId>app.module</artifactId>
<groupId>app.module</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<version>0.0.1-SNAPSHOT</version>
</project>
<build>
<finalName>ROOT</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1,7 +1,5 @@
package app.module.admin.config.application.security;
import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.enums.OperationLogType;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.status.ports.AdminUpdateAccountLockPortIn;

View File

@@ -18,14 +18,14 @@ spring:
datasource:
kri:
driver-class-name: org.postgresql.Driver
jdbc-url: ENC(SH5G+4mdOrW3PpVEmVyNXIFyV7eFC6uLTa0e18qa+7ueQeWrduIeGVJLrQP3mUw86dzqLK7AUHjTRuex4ud+rTt026L7csDLFYzLWGkGCTEqfFBOwHng3uQ7n+qmkKiW)
username: ENC(37ccHxlpbsEz8vVcZUZA/j6azKYhP3eHwhOYVjYGf+zKC3u/qc+khKcKuBuE8+Ck)
password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg)
jdbc-url: ENC(mF3Z0fgCagFruOk/F2Z2PYzXhwGedE1secfYDgci+ke9z8xFEZ/GWbgXA4XeSq5D+k9/oRLOxzwx/D24tswdoHdQugHmGb0UqrW4vGBa7YFJvcnWylOpd5ppUeEIUJGv)
username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM)
password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI)
mms:
driver-class-name: org.postgresql.Driver
jdbc-url: ENC(SH5G+4mdOrW3PpVEmVyNXIFyV7eFC6uLTa0e18qa+7ueQeWrduIeGVJLrQP3mUw86dzqLK7AUHjTRuex4ud+rTt026L7csDLFYzLWGkGCTEqfFBOwHng3uQ7n+qmkKiW)
username: ENC(37ccHxlpbsEz8vVcZUZA/j6azKYhP3eHwhOYVjYGf+zKC3u/qc+khKcKuBuE8+Ck)
password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg)
jdbc-url: ENC(TZ7H8DIFZDbsNp3PRWbz3bkJbjsx3580ljmELMJInASgpiEH66Lb8adpjt5WGXoIdZbHetlgtEFo8F+U8XUa9fjYWNOpiZ+D99XoXJUOP3s=)
username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM)
password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI)
maximum-pool-size: 2
minimum-idle: 1

View File

@@ -16,14 +16,14 @@ spring:
datasource:
kri:
driver-class-name: org.postgresql.Driver
jdbc-url: ENC(SH5G+4mdOrW3PpVEmVyNXIFyV7eFC6uLTa0e18qa+7ueQeWrduIeGVJLrQP3mUw86dzqLK7AUHjTRuex4ud+rTt026L7csDLFYzLWGkGCTEqfFBOwHng3uQ7n+qmkKiW)
username: ENC(37ccHxlpbsEz8vVcZUZA/j6azKYhP3eHwhOYVjYGf+zKC3u/qc+khKcKuBuE8+Ck)
password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg)
jdbc-url: ENC(mF3Z0fgCagFruOk/F2Z2PYzXhwGedE1secfYDgci+ke9z8xFEZ/GWbgXA4XeSq5D+k9/oRLOxzwx/D24tswdoHdQugHmGb0UqrW4vGBa7YFJvcnWylOpd5ppUeEIUJGv)
username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM)
password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI)
mms:
driver-class-name: org.postgresql.Driver
jdbc-url: jdbc:postgresql://15.165.180.203:5432/ko_research_hyunjoo
username: hyunjoo
password: hyunjoo1@#4
jdbc-url: ENC(TZ7H8DIFZDbsNp3PRWbz3bkJbjsx3580ljmELMJInASgpiEH66Lb8adpjt5WGXoIdZbHetlgtEFo8F+U8XUa9fjYWNOpiZ+D99XoXJUOP3s=)
username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM)
password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI)
maximum-pool-size: 2
minimum-idle: 1
@@ -44,7 +44,7 @@ logging:
# ==============================================
jasypt:
encryptor:
password: etribe
password: ko-research
algorithm: PBEWITHHMACSHA512ANDAES_256
# ==============================================

View File

@@ -23,14 +23,7 @@ spring:
maximum-pool-size: 2
minimum-idle: 1
# ==============================================
# 세션 설정
# ==============================================
server:
servlet:
session:
cookie:
domain: fhes.kric.com
path: /
http-only: true
secure: true
jasypt:
encryptor:
password: ko-research
algorithm: PBEWITHHMACSHA512ANDAES_256

View File

@@ -79,7 +79,7 @@ app:
seconds: -1
maximum:
# 최대 세션 갯수 (1일 경우 중복 로그인 불가)
num: 10
num: 1
# ==============================================
# 로깅 설정

View File

@@ -0,0 +1,3 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.0001 2.375C10.4143 2.375 10.7501 2.71079 10.7501 3.125V15.0645L15.0948 10.7197L15.1514 10.668C15.446 10.4277 15.8807 10.4452 16.1553 10.7197C16.4299 10.9943 16.4474 11.4291 16.2071 11.7236L16.1553 11.7803L10.5303 17.4053C10.4848 17.4508 10.432 17.4879 10.376 17.5205C10.3492 17.5361 10.3231 17.5524 10.295 17.5645C10.2828 17.5697 10.2694 17.5716 10.2569 17.5762C10.2246 17.588 10.1926 17.5992 10.1592 17.6064C10.122 17.6145 10.084 17.6198 10.045 17.6221C10.0385 17.6225 10.032 17.6228 10.0255 17.623C10.017 17.6233 10.0085 17.625 10.0001 17.625C9.97097 17.625 9.94236 17.6224 9.91413 17.6191C9.90263 17.6178 9.89139 17.6151 9.87995 17.6133C9.85931 17.6099 9.83944 17.6046 9.8194 17.5996C9.79097 17.5926 9.76302 17.5846 9.73542 17.5742C9.71646 17.567 9.69794 17.5594 9.67975 17.5508C9.65466 17.5389 9.63042 17.5256 9.60651 17.5107C9.59009 17.5006 9.5742 17.4899 9.55866 17.4785C9.54833 17.4709 9.53645 17.4652 9.52643 17.457L9.46979 17.4053L3.84479 11.7803L3.79303 11.7236C3.55279 11.4291 3.57026 10.9943 3.84479 10.7197C4.11937 10.4451 4.55412 10.4277 4.8487 10.668L4.90534 10.7197L9.25006 15.0645V3.125C9.25006 2.71083 9.58591 2.37506 10.0001 2.375Z" fill="#212529"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.19922 4.40039L9.79922 8.00039L6.19922 11.6004" stroke="#ADB5BD" stroke-linecap="square"/>
</svg>

After

Width:  |  Height:  |  Size: 205 B

Some files were not shown because too many files have changed in this diff Show More