Skip to content

Commit

Permalink
Update : .gitignore & application.properties
Browse files Browse the repository at this point in the history
  • Loading branch information
Suhun0331 committed Jul 23, 2024
1 parent 63c50fc commit 1a88453
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,3 @@ out/
.vscode/


# Ignore application.properties in main
src/main/resources/application.properties

# Ignore application.properties in test
src/test/resources/application.properties
7 changes: 4 additions & 3 deletions src/main/java/umc/kkijuk/server/member/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@

import jakarta.persistence.*;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.Setter;
import lombok.*;
import umc.kkijuk.server.member.converter.StringListConverter;

import java.time.LocalDate;
import java.util.List;
import java.util.ArrayList;

@Entity
@Builder
@Getter @Setter
@NoArgsConstructor
@AllArgsConstructor
public class Member {

@Id @GeneratedValue
Expand Down Expand Up @@ -43,7 +45,6 @@ public class Member {
@Enumerated(EnumType.STRING)
private State userState;


public Member(String email, String name, String phoneNumber, LocalDate birthDate, String password, Boolean marketingAgree, State userState) {
this.email = email;
this.name = name;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ spring.application.name=server
# spring data source
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://localhost:3306/kkijuk?characterEncoding=UTF-8&serverTimezone=Asia/Seoul
spring.datasource.username=root
spring.datasource.password=1234
spring.datasource.username=test
spring.datasource.password=testPW

# spring jpa
spring.jpa.database=mysql
Expand Down

0 comments on commit 1a88453

Please sign in to comment.