Merge pull request #359 from kkkapuq/main

stage merge into main

.github/workflows/bepo.yml

@@ -5,7 +5,6 @@ env:
   BUCKET_NAME: orury-bepo-bucket
   CODE_DEPLOY_APP_NAME: orury-code-deploy
   DEPLOYMENT_GROUP_NAME: orury-code-deploy-group
-  DOCKER_ENV: .env
 
 on:
   push:
@@ -30,16 +29,8 @@ jobs:
         run: |
           touch ./orury-client/src/main/resources/application-secret.properties
           touch ./orury-batch/src/main/resources/application-secret.properties
-          echo "${{ secrets.APPLICATION_SECRET }}" > ./orury-client/src/main/resources/application-secret.properties
-          echo "${{ secrets.APPLICATION_SECRET }}" > ./orury-batch/src/main/resources/application-secret.properties
-          cat ./orury-client/src/main/resources/application-secret.properties
-          cat ./orury-batch/src/main/resources/application-secret.properties
-
-      - name: Make env file
-        run: |
-          touch ./.env
-          echo "${{ secrets.DOCKER_ENV }}" >> ./.env
-          cat ./.env
+          echo "${{ secrets.JASYPT_PASSWORD }}" > ./orury-client/src/main/resources/application-secret.properties
+          echo "${{ secrets.JASYPT_PASSWORD }}" > ./orury-batch/src/main/resources/application-secret.properties
 
       - name: Run chmod to make gradlew executable
         run: chmod +x ./gradlew

.gitignore

@@ -20,6 +20,11 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+# Code Style
+.idea/**/codeStyles
+.idea/**/codeStyleConfig.xml
+.idea/**/Project.xml
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml

orury-admin/build.gradle

@@ -1,18 +1,19 @@
 //build.gradle 파일
 dependencies {
-    implementation project(':orury-common')
     implementation project(':orury-domain')
+    implementation project(':orury-common')
+
+    //devtools
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
 
     //Security
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     testImplementation 'org.springframework.security:spring-security-test'
 
-    //security jwt
-    implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
-    runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
-    runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
-
     //jakarta.xml.bind
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api-parent:4.0.0'
     compileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.0.0'
@@ -23,6 +24,12 @@ dependencies {
     compileOnly 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.2.0'
     compileOnly 'org.springdoc:springdoc-openapi-starter-webflux-api:2.2.0'
 
+    //mysql
+    runtimeOnly 'com.mysql:mysql-connector-j'
+
+    //json
+    implementation 'org.json:json:20231013'
+
     testImplementation 'io.projectreactor:reactor-test'
     testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
 }