Commit 16337496 authored by s7_aigars_v's avatar s7_aigars_v
Browse files

Merge branch 'spring-security' into 'master'

Comment update

See merge request s7_spruge_k/calendar!9
parents 60483f52 86aa3a2c
No preview for this file type
HELP.md
/target/
!.mvn/wrapper/maven-wrapper.jar
db.h2.db
db.lock.db
### STS ###
.apt_generated
......@@ -27,3 +29,6 @@ HELP.md
### VS Code ###
.vscode/
### MAC files ###
.DS_Store
\ No newline at end of file
No preview for this file type
#FileLock
#Tue Jun 11 13:24:29 EEST 2019
id=16b461154a882bdf9b529981acc46ca421ea9ffbeb0
method=file
......@@ -17,7 +17,6 @@ import org.springframework.data.annotation.Transient;
@Table(name = "UserTable")
public class User {
//TODO spring secure auth
@Column(name = "Username")
private String username;
@Column(name = "Password")
......@@ -32,7 +31,7 @@ public class User {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "ID_u")
private int user_ID; //Auto generated w/ jpa
private int user_ID;
@OneToOne(mappedBy = "user")
private Calendar calendar;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment