Commit @f2aa50bfff70645528101740a13307c9013c9969

6172101

f2aa50b

src/main/java/com/example/educatback/model/entity/CountryElement.java

--- src/main/java/com/example/educatback/model/entity/CountryElement.java

+++ src/main/java/com/example/educatback/model/entity/CountryElement.java


     private Study study;
 
     @OneToMany(mappedBy = "countryElement")
-    private List<CountryThree> countryThrees = new ArrayList<>();
+    private final List<CountryThree> countryThrees = new ArrayList<>();
     @OneToMany(mappedBy = "countryElement")
-    private List<CountryTwoFiles> countryTwoFiles = new ArrayList<>();
+    private final List<CountryTwoFiles> countryTwoFiles = new ArrayList<>();
 }

6172101

f2aa50b

src/main/java/com/example/educatback/model/entity/GrammarFairy.java

--- src/main/java/com/example/educatback/model/entity/GrammarFairy.java

+++ src/main/java/com/example/educatback/model/entity/GrammarFairy.java


     private int level;
 
     @OneToMany(mappedBy = "grammarFairy")
-    private List<GrammarFairyTwo> GrammarFairyTwo = new ArrayList<>();
+    private final List<GrammarFairyTwo> GrammarFairyTwo = new ArrayList<>();
 
     @ManyToOne
     private Study study;

6172101

f2aa50b

src/main/java/com/example/educatback/model/entity/Member.java

--- src/main/java/com/example/educatback/model/entity/Member.java

+++ src/main/java/com/example/educatback/model/entity/Member.java


     @Column(name = "grade")
     private int grade;
     @Column
-    private String role = "student";
+    private final String role = "student";
 
     @Column(name = "focus")
     private int focus;

6172101

f2aa50b

src/main/java/com/example/educatback/model/entity/SentenceAbsorb.java

--- src/main/java/com/example/educatback/model/entity/SentenceAbsorb.java

+++ src/main/java/com/example/educatback/model/entity/SentenceAbsorb.java


     private Study study;
 
     @OneToMany(mappedBy = "SentenceAbsorb")
-    private List<SentenceAbsorbThree> sentenceAbsorbThree = new ArrayList<>();
+    private final List<SentenceAbsorbThree> sentenceAbsorbThree = new ArrayList<>();
 }

6172101

f2aa50b

src/main/java/com/example/educatback/model/entity/Travel.java

--- src/main/java/com/example/educatback/model/entity/Travel.java

+++ src/main/java/com/example/educatback/model/entity/Travel.java


 
 
     @OneToMany(mappedBy = "travel")
-    private List<TravelSlide> travelSlides = new ArrayList<>();
+    private final List<TravelSlide> travelSlides = new ArrayList<>();
 
     @OneToMany(mappedBy = "travel")
-    private List<TravelThree> travelThrees = new ArrayList<>();
+    private final List<TravelThree> travelThrees = new ArrayList<>();
 }

6172101

f2aa50b

src/main/java/com/example/educatback/model/entity/WordAbsorb.java

--- src/main/java/com/example/educatback/model/entity/WordAbsorb.java

+++ src/main/java/com/example/educatback/model/entity/WordAbsorb.java


     private Study study;
 
     @OneToMany(mappedBy = "wordAbsorb")
-    private List<WordAbsorbThree> wordAbsorbThrees = new ArrayList<>();
+    private final List<WordAbsorbThree> wordAbsorbThrees = new ArrayList<>();
 }

6172101

f2aa50b

src/main/java/com/example/educatback/model/entity/World.java

--- src/main/java/com/example/educatback/model/entity/World.java

+++ src/main/java/com/example/educatback/model/entity/World.java


     private Study study;
 
     @OneToMany(mappedBy = "world")
-    private List<WorldThree> worldThrees = new ArrayList<>();
+    private final List<WorldThree> worldThrees = new ArrayList<>();
 }

6172101

f2aa50b

src/main/resources/application.properties

--- src/main/resources/application.properties

+++ src/main/resources/application.properties


 spring.application.name=educatBack
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
 # db??
-spring.datasource.url=jdbc:mysql://210.180.118.83/edu_tech_test
+spring.datasource.url=jdbc:mysql://210.180.118.83/edu_tech_test?autoReconnect=true
 spring.datasource.username=takensoft
 spring.datasource.password=tts96314728!@
 `
 # Hibernate ???? ??? ? ???? ????? ?? ????.
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
+
+spring.datasource.hikari.max-lifetime=300000
+spring.datasource.hikari.idle-timeout=300000
+spring.datasource.hikari.validation-timeout=5000
 
 # ???? sql? ??
 spring.jpa.show-sql=true

 
 #server
 
-server.address=192.168.0.195
+#server.address=192.168.0.195
 server.port=38888
 server.servlet.session.timeout=30m
 server.servlet.session.cookie.max-age=30m

...	...	@@ -37,7 +37,7 @@
37	37	private Study study;
38	38
39	39	@OneToMany(mappedBy = "countryElement")
40		- private List<CountryThree> countryThrees = new ArrayList<>();
	40	+ private final List<CountryThree> countryThrees = new ArrayList<>();
41	41	@OneToMany(mappedBy = "countryElement")
42		- private List<CountryTwoFiles> countryTwoFiles = new ArrayList<>();
	42	+ private final List<CountryTwoFiles> countryTwoFiles = new ArrayList<>();
43	43	}

...	...	@@ -39,7 +39,7 @@
39	39	private int level;
40	40
41	41	@OneToMany(mappedBy = "grammarFairy")
42		- private List<GrammarFairyTwo> GrammarFairyTwo = new ArrayList<>();
	42	+ private final List<GrammarFairyTwo> GrammarFairyTwo = new ArrayList<>();
43	43
44	44	@ManyToOne
45	45	private Study study;

...	...	@@ -32,7 +32,7 @@
32	32	@Column(name = "grade")
33	33	private int grade;
34	34	@Column
35		- private String role = "student";
	35	+ private final String role = "student";
36	36
37	37	@Column(name = "focus")
38	38	private int focus;

...	...	@@ -47,5 +47,5 @@
47	47	private Study study;
48	48
49	49	@OneToMany(mappedBy = "SentenceAbsorb")
50		- private List<SentenceAbsorbThree> sentenceAbsorbThree = new ArrayList<>();
	50	+ private final List<SentenceAbsorbThree> sentenceAbsorbThree = new ArrayList<>();
51	51	}

...	...	@@ -37,8 +37,8 @@
37	37
38	38
39	39	@OneToMany(mappedBy = "travel")
40		- private List<TravelSlide> travelSlides = new ArrayList<>();
	40	+ private final List<TravelSlide> travelSlides = new ArrayList<>();
41	41
42	42	@OneToMany(mappedBy = "travel")
43		- private List<TravelThree> travelThrees = new ArrayList<>();
	43	+ private final List<TravelThree> travelThrees = new ArrayList<>();
44	44	}

...	...	@@ -38,5 +38,5 @@
38	38	private Study study;
39	39
40	40	@OneToMany(mappedBy = "wordAbsorb")
41		- private List<WordAbsorbThree> wordAbsorbThrees = new ArrayList<>();
	41	+ private final List<WordAbsorbThree> wordAbsorbThrees = new ArrayList<>();
42	42	}

...	...	@@ -42,5 +42,5 @@
42	42	private Study study;
43	43
44	44	@OneToMany(mappedBy = "world")
45		- private List<WorldThree> worldThrees = new ArrayList<>();
	45	+ private final List<WorldThree> worldThrees = new ArrayList<>();
46	46	}

...	...	@@ -1,12 +1,18 @@
1	1	spring.application.name=educatBack
	2	+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
	3	+
2	4	# db??
3		-spring.datasource.url=jdbc:mysql://210.180.118.83/edu_tech_test
	5	+spring.datasource.url=jdbc:mysql://210.180.118.83/edu_tech_test?autoReconnect=true
4	6	spring.datasource.username=takensoft
5	7	spring.datasource.password=tts96314728!@
6	8	`
7	9	# Hibernate ???? ??? ? ???? ????? ?? ????.
8	10	spring.jpa.hibernate.ddl-auto=update
9	11	spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
	12	+
	13	+spring.datasource.hikari.max-lifetime=300000
	14	+spring.datasource.hikari.idle-timeout=300000
	15	+spring.datasource.hikari.validation-timeout=5000
10	16
11	17	# ???? sql? ??
12	18	spring.jpa.show-sql=true
...	...	@@ -17,7 +23,7 @@
17	23
18	24	#server
19	25
20		-server.address=192.168.0.195
	26	+#server.address=192.168.0.195
21	27	server.port=38888
22	28	server.servlet.session.timeout=30m
23	29	server.servlet.session.cookie.max-age=30m (파일 끝에 줄바꿈 문자 없음)

Delete comment