From 1d42aacd6eb26495cf98fc45acdb0efeb715e031 Mon Sep 17 00:00:00 2001 From: "sungjin.choi" Date: Thu, 28 May 2026 14:32:11 +0900 Subject: [PATCH] =?UTF-8?q?feat=20-=20=EC=A0=84=EB=B0=98=EC=A0=81=EC=9D=B8?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yml | 5 ++- gradle/wrapper/gradle-wrapper.properties | 5 ++- .../specialsource/config/JasyptConfig.java | 33 ------------------- src/main/resources/application.yaml | 6 +++- 4 files changed, 11 insertions(+), 38 deletions(-) delete mode 100644 src/main/java/company/specialsource/config/JasyptConfig.java diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index b5afe76..5ce2c74 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -32,9 +32,12 @@ jobs: docker stop ss-backend-container || true docker rm ss-backend-container || true - # 3) 비어있는 18080 포트와 지정하신 app 폴더 경로를 연결하여 실행 + # 3) [★핵심 변경] 환경 변수, 볼륨 마운트, 자동 재시작 옵션을 적용하여 컨테이너 실행 docker run -d \ --name ss-backend-container \ -p 18080:8080 \ + -e JASYPT_ENCRYPTOR_PASSWORD=${{ secrets.JASYPT_PASSWORD }} \ + -e DB_URL=jdbc:postgresql://172.17.0.1:5435/mydb?sslmode=disable \ -v /volume1/docker/app/specialsource-backend/logs:/app/logs \ + --restart always \ ss-backend-image \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f2..d5e86cd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ +#Thu May 28 11:00:03 KST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip -networkTimeout=10000 -validateDistributionUrl=true +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/company/specialsource/config/JasyptConfig.java b/src/main/java/company/specialsource/config/JasyptConfig.java deleted file mode 100644 index 5551c76..0000000 --- a/src/main/java/company/specialsource/config/JasyptConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package company.specialsource.config; - -import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; -import org.jasypt.encryption.StringEncryptor; -import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; -import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableEncryptableProperties -public class JasyptConfig { - - @Value("${jasypt.encryptor.password}") - private String password; - - @Bean("jasyptStringEncryptor") - public StringEncryptor stringEncryptor() { - PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); - SimpleStringPBEConfig config = new SimpleStringPBEConfig(); - config.setPassword(password); // 암호화 키 (절대 외부에 유출 금지!) - config.setAlgorithm("PBEWithMD5AndDES"); - config.setKeyObtentionIterations("1000"); - config.setPoolSize("1"); - config.setProviderName("SunJCE"); - config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); - config.setIvGeneratorClassName("org.jasypt.iv.NoIvGenerator"); - config.setStringOutputType("base64"); - encryptor.setConfig(config); - return encryptor; - } -} \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 9640b51..92a7ff2 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:postgresql://192.168.0.215:5435/mydb + url: jdbc:postgresql://localhost:5435/mydb username: headporter password: ENC(Gg03NzjjcVOrFSXoBrPEusNgDNbYOPO4) driver-class-name: org.postgresql.Driver @@ -16,6 +16,10 @@ spring: jasypt: encryptor: password: 81sungjin1015 + algorithm: PBEWithMD5AndDES + iv-generator-classname: org.jasypt.iv.NoIvGenerator + key-obtention-iterations: 1000 + pool-size: 1 jwt: # 256비트 이상이어야 하므로 영문+숫자 (최소 32글자 이상)