From ef72667117e0cb0569479e00900274fc84afecc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B0=80=EC=98=81?= Date: Tue, 22 Oct 2024 21:24:28 +0900 Subject: [PATCH 1/2] chore: gradle --- build.gradle | 18 +++++++-------- .../global/properties/NeisProperties.java | 20 ++++++++--------- src/main/resources/application.yml | 22 +++++-------------- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/build.gradle b/build.gradle index 1d0c16b..2a4ab33 100644 --- a/build.gradle +++ b/build.gradle @@ -97,15 +97,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' //neis - implementation 'org.springframework:spring-context:6.0.6' - implementation 'org.springframework:spring-web:6.0.6' - implementation 'org.springframework:spring-tx:6.0.6' - - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.2' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' - - implementation 'com.googlecode.json-simple:json-simple:1.1.1' +// implementation 'org.springframework:spring-context:6.0.6' +// implementation 'org.springframework:spring-web:6.0.6' +// implementation 'org.springframework:spring-tx:6.0.6' +// +// implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.2' +// implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2' +// implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' +// +// implementation 'com.googlecode.json-simple:json-simple:1.1.1' } diff --git a/src/main/java/com/dear/global/properties/NeisProperties.java b/src/main/java/com/dear/global/properties/NeisProperties.java index 4856d56..fc586db 100644 --- a/src/main/java/com/dear/global/properties/NeisProperties.java +++ b/src/main/java/com/dear/global/properties/NeisProperties.java @@ -5,13 +5,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; -@Getter -@Setter -@Configuration -@ConfigurationProperties("neis") -public class NeisProperties { - - private String url; - private String key; - -} +//@Getter +//@Setter +//@Configuration +//@ConfigurationProperties("neis") +//public class NeisProperties { +// +// private String url; +// private String key; +// +//} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ca3cb3a..3f2c164 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,13 +1,9 @@ spring: datasource: - # url: ENC(s/PjxYpqkq7UpUtC4Rem8M6TzO9oijVI2X18jxNP6u6e48OfB1uYXb2LLDXzT3Ka) - # driver-class-name: com.mysql.cj.jdbc.Driver - # username: ENC(B2z7wQM8Cy5yoEYmCLkjOQ==) - # password: ENC(/obOB0fFdJNlUWEjvmq910nHremT7t+r) - url: jdbc:mysql://localhost:3306/DearTest - driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: 12345678 + url: ENC(s/PjxYpqkq7UpUtC4Rem8M6TzO9oijVI2X18jxNP6u6e48OfB1uYXb2LLDXzT3Ka) + driver-class-name: com.mysql.cj.jdbc.Driver + username: ENC(B2z7wQM8Cy5yoEYmCLkjOQ==) + password: ENC(/obOB0fFdJNlUWEjvmq910nHremT7t+r) batch: jdbc: @@ -68,8 +64,8 @@ spring: host: localhost port: 6379 slaves: - host: localhost - port: 6479 + - host: localhost + port: 6479 application: jwt: @@ -131,9 +127,3 @@ spring: on-profile: set2 server: port: 8082 - -jasypt: - encryptor: - password: dear - - From 8b1890701eac6e068165aa8f51046cc33e353e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B0=80=EC=98=81?= Date: Tue, 22 Oct 2024 21:33:10 +0900 Subject: [PATCH 2/2] chore: error --- .../java/com/dear/domain/food/enums/Food.java | 26 +++--- .../dear/domain/food/enums/FoodDetail.java | 26 +++--- .../java/com/dear/domain/food/enums/Meal.java | 86 +++++++++---------- src/main/resources/application.yml | 14 +-- 4 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/main/java/com/dear/domain/food/enums/Food.java b/src/main/java/com/dear/domain/food/enums/Food.java index def1720..b9ac0bb 100644 --- a/src/main/java/com/dear/domain/food/enums/Food.java +++ b/src/main/java/com/dear/domain/food/enums/Food.java @@ -1,15 +1,15 @@ package com.dear.domain.food.enums; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.io.Serializable; -import java.util.List; - -@Getter -@AllArgsConstructor -public class Food implements Serializable { - - private List details; - private Float calorie; -} +//import lombok.AllArgsConstructor; +//import lombok.Getter; +// +//import java.io.Serializable; +//import java.util.List; + +//@Getter +//@AllArgsConstructor +//public class Food implements Serializable { +// +// private List details; +// private Float calorie; +//} diff --git a/src/main/java/com/dear/domain/food/enums/FoodDetail.java b/src/main/java/com/dear/domain/food/enums/FoodDetail.java index a309173..46b5ca7 100644 --- a/src/main/java/com/dear/domain/food/enums/FoodDetail.java +++ b/src/main/java/com/dear/domain/food/enums/FoodDetail.java @@ -1,15 +1,15 @@ package com.dear.domain.food.enums; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.io.Serializable; -import java.util.List; - -@Getter -@AllArgsConstructor -public class FoodDetail implements Serializable { - - private String name; - private List allergies; -} +//import lombok.AllArgsConstructor; +//import lombok.Getter; +// +//import java.io.Serializable; +//import java.util.List; +// +//@Getter +//@AllArgsConstructor +//public class FoodDetail implements Serializable { +// +// private String name; +// private List allergies; +//} diff --git a/src/main/java/com/dear/domain/food/enums/Meal.java b/src/main/java/com/dear/domain/food/enums/Meal.java index 9372677..b1318ed 100644 --- a/src/main/java/com/dear/domain/food/enums/Meal.java +++ b/src/main/java/com/dear/domain/food/enums/Meal.java @@ -1,43 +1,43 @@ -package com.dear.domain.food.enums; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; -import lombok.*; - -import java.io.Serializable; -import java.time.LocalDate; - -@Getter -@Builder -@AllArgsConstructor -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Meal implements Serializable { - - private boolean exists; - - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonSerialize(using = LocalDateSerializer.class) - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate date; - - private Food breakfast; - - private Food lunch; - - private Food dinner; - - public void setBreakfast(Food breakfast) { - this.breakfast = breakfast; - } - public void setLunch(Food lunch) { - this.lunch = lunch; - } - public void setDinner(Food dinner) { - this.dinner = dinner; - } - -} \ No newline at end of file +//package com.dear.domain.food.enums; +// +// +//import com.fasterxml.jackson.annotation.JsonFormat; +//import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +//import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; +//import lombok.*; +// +//import java.io.Serializable; +//import java.time.LocalDate; +// +//@Getter +//@Builder +//@AllArgsConstructor +//@NoArgsConstructor(access = AccessLevel.PROTECTED) +//public class Meal implements Serializable { +// +// private boolean exists; +// +// @JsonDeserialize(using = LocalDateDeserializer.class) +// @JsonSerialize(using = LocalDateSerializer.class) +// @JsonFormat(pattern = "yyyy-MM-dd") +// private LocalDate date; +// +// private Food breakfast; +// +// private Food lunch; +// +// private Food dinner; +// +// public void setBreakfast(Food breakfast) { +// this.breakfast = breakfast; +// } +// public void setLunch(Food lunch) { +// this.lunch = lunch; +// } +// public void setDinner(Food dinner) { +// this.dinner = dinner; +// } +// +//} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3f2c164..78b1a53 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,9 +1,9 @@ spring: datasource: - url: ENC(s/PjxYpqkq7UpUtC4Rem8M6TzO9oijVI2X18jxNP6u6e48OfB1uYXb2LLDXzT3Ka) - driver-class-name: com.mysql.cj.jdbc.Driver - username: ENC(B2z7wQM8Cy5yoEYmCLkjOQ==) - password: ENC(/obOB0fFdJNlUWEjvmq910nHremT7t+r) + url: ENC(s/PjxYpqkq7UpUtC4Rem8M6TzO9oijVI2X18jxNP6u6e48OfB1uYXb2LLDXzT3Ka) + driver-class-name: com.mysql.cj.jdbc.Driver + username: ENC(B2z7wQM8Cy5yoEYmCLkjOQ==) + password: ENC(/obOB0fFdJNlUWEjvmq910nHremT7t+r) batch: jdbc: @@ -73,9 +73,9 @@ application: expiration: ENC(bQ0w2og7PUQebEMgCW04PFePaL+0aCeH) refreshExpiration: ENC(9BEfcg1e7aiWdKK1vIBMaNYDelGheHSa) # 7일 -career: - url: https://www.career.go.kr/cnet/openapi/getOpenApi - key: 26bd62f0cc75d4b2b3feb9c0f1849ff1 + career: + base-url: https://www.career.go.kr/cnet/openapi/getOpenApi + api-key: 26bd62f0cc75d4b2b3feb9c0f1849ff1 cloud: gcp: