Skip to content

Commit

Permalink
Merge branch 'BE_develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Henry-Cha committed Apr 24, 2024
2 parents ad5e27c + 7da816b commit c4020e6
Show file tree
Hide file tree
Showing 7 changed files with 123 additions and 18 deletions.
2 changes: 2 additions & 0 deletions backEnd/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ out/

### VS Code ###
.vscode/

application-key.yml
33 changes: 19 additions & 14 deletions backEnd/build.gradle
Original file line number Diff line number Diff line change
@@ -1,34 +1,39 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.2.5'
id 'io.spring.dependency-management' version '1.1.4'
id 'java'
id 'org.springframework.boot' version '3.2.5'
id 'io.spring.dependency-management' version '1.1.4'
}

group = 'com.6quiz'
version = '0.0.1-SNAPSHOT'

java {
sourceCompatibility = '21'
sourceCompatibility = '21'
}

configurations {
compileOnly {
extendsFrom annotationProcessor
}
compileOnly {
extendsFrom annotationProcessor
}
}

repositories {
mavenCentral()
mavenCentral()
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
implementation 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.5'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
runtimeOnly 'com.mysql:mysql-connector-j'
}

tasks.named('test') {
useJUnitPlatform()
useJUnitPlatform()
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
@SpringBootApplication
public class OurClassApplication {

public static void main(String[] args) {
SpringApplication.run(OurClassApplication.class, args);
}
public static void main(String[] args) {
SpringApplication app = new SpringApplication(OurClassApplication.class);
app.setAdditionalProfiles("dev");
app.run(args);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.quiz.ourClass.global.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.key}")
String key;

@Bean(name = "jasyptStringEncryptor")
public StringEncryptor stringEncryptor() {

PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
SimpleStringPBEConfig config = new SimpleStringPBEConfig();
config.setPassword(key);
config.setAlgorithm("PBEWithMD5AndDES");
config.setKeyObtentionIterations("1000");
config.setPoolSize("1");
config.setProviderName("SunJCE");
config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
config.setStringOutputType("base64");
encryptor.setConfig(config);
return encryptor;
}
}
45 changes: 45 additions & 0 deletions backEnd/src/main/resources/application-db.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
spring:
config:
activate:
on-profile: db-dev
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: ENC(BK5guqCyFgcXz9XYMj6Ih6kXS/4ruxW1RVYIUxX1KXRFMmrja/o4MSck/tEjIzvhUGvAQPlX8Upj1TScOYre4LVrulpuc2AlanWUEpCRmJ1Bv6aJniivvQ==)
username: ENC(MYQ3aT1VJAbQINjDNwI63SdAy0klZQNS)
password: ENC(hubtzmA3yjR5UR4QidrFMhpzpZC3r4/q)
data:
mongodb:
host: ENC(RlbaApSBGOY9aZpoa/Q+8uahT22Cg02g)
port: ENC(HwQDnCJWUUC+uws46h5EQA==)
database: ENC(cSzOXYx2Vpfz+c7GMEPdLg==)
username: ENC(AmV/z9JTFSh4og1r4s4nKL4gwCOotshL)
password: ENC(V0DO82Nf0nvfjfFyQwzRfXABg1qBF3rGAwmGQacDLGA=)
authentication-database: ENC(z33qIA0NJs/P0DdjUma0gA==)
redis:
host: ENC(tCytoj2btfmkEuW78BEnFZAa1DZdT8lp)
port: ENC(knTIBM9PALqlEPofKSdVTQ==)
password: ENC(5tNR7TfRtIj69kmaPS/JC7P9oqwfW/ooTu9MD/GK6E4=)
---
spring:
config:
activate:
on-profile: db-prod
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: ENC(Y+5AD5d380frx9HYUEyichTve4p/yUn8NtmNW2/4NQJogsrnIXUgBTuHn/lMNbovctNVRjti0p+gkyEJwPMgMHwCGgaopQ5oLZjMiQf0MUvvIKDqQywZ/Q==)
username: ENC(fVboFO5wpKzKNThGbtQLLkv2ziEk4Gra)
password: ENC(Kc3wHJBq99bC2b2BGILzyROMvdqxv6I+)
data:
mongodb:
host: ENC(UWHLjm0A12FTs4ZO6zEZ50x/C8q8tcHp)
port: ENC(hZDOVAQPdwQV4IcmgI4vrw==)
database: ENC(xZFJK/ae+pvLIA0sWntWBw==)
username: ENC(naBYQwC7jh6BkjGPvBxZvlnof82aw0ZP)
password: ENC(fZpGZe/l//EQWi3vdI4e923/k9oyfGFHzuHvUDUAHBI=)
authentication-database: ENC(U862aAGiOT9PZDT3e8nnHA==)
redis:
host: ENC(tCytoj2btfmkEuW78BEnFZAa1DZdT8lp)
port: ENC(knTIBM9PALqlEPofKSdVTQ==)
password: ENC(OjP5uzhau4FAOvF31CrSrfCCLxY6gRK9IELgunCEwBY=)
---
1 change: 0 additions & 1 deletion backEnd/src/main/resources/application.properties

This file was deleted.

19 changes: 19 additions & 0 deletions backEnd/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
server:
port: 8080
servlet:
encoding:
charset: UTF-8
enabled: true
force: true
context-path: /api
---
spring:
profiles:
group:
dev:
- db-dev
prod:
- db-prod
include:
- key
- db

0 comments on commit c4020e6

Please sign in to comment.