Skip to content

Commit df9944a

Browse files
committed
work
1 parent 68731aa commit df9944a

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

src/main/java/org/woehlke/simpleworklist/config/SimpleworklistProperties.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ public static class WebSecurity {
125125

126126
//@NotNull
127127
//private Integer strengthBCryptPasswordEncoder;
128-
129-
@NotBlank
130-
private String secret;
131-
128+
132129
@NotNull
133130
private Integer iterations;
134131

135132
@NotNull
136133
private Integer hashWidth;
134+
135+
@NotBlank
136+
private String secret;
137137
}
138138

139139
}

src/main/resources/application.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ spring:
2323
username: simpleworklist
2424
password: simpleworklistpwd
2525
driverClassName: org.postgresql.Driver
26-
platform: postgresql
27-
continue-on-error: true
2826
jpa:
2927
show-sql: true
3028
open-in-view: true
@@ -47,6 +45,10 @@ spring:
4745
cache: false
4846
main:
4947
allow-bean-definition-overriding: true
48+
sql:
49+
init:
50+
platform: postgresql
51+
continue-on-error: true
5052
org:
5153
woehlke:
5254
simpleworklist:
@@ -81,7 +83,7 @@ org:
8183
cookieNamesToClear:
8284
- "JSESSIONID"
8385
invalidateHttpSession: true
84-
defaultSuccessUrl: "/"
86+
# defaultSuccessUrl: "/"
8587
failureForwardUrl: "/user/login?login_error=1"
8688
usernameParameter: "j_username"
8789
passwordParameter: "j_password"

src/main/resources/liquibase.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
changeLogFile: db/changelog/dbchangelog.xml
2+
driver: org.postgresql.Driver
3+
url: jdbc:postgresql://${SIMPLEWORKLIST_DS_HOST}:/${SIMPLEWORKLIST_DS_PORT}/${SIMPLEWORKLIST_DS_DB}
4+
username: ${SIMPLEWORKLIST_DS_USR}
5+
password: ${SIMPLEWORKLIST_DS_PWD}
6+
referenceDriver: org.postgresql.Driver
7+
referenceUrl: jdbc:postgresql://${SIMPLEWORKLIST_DSREF_HOST}:/${SIMPLEWORKLIST_DSREF_PORT}/${SIMPLEWORKLIST_DSREF_DB}
8+
referenceUsername: ${SIMPLEWORKLIST_DSREF_USR}
9+
referencePassword: ${SIMPLEWORKLIST_DSREF_PWD}
10+
classpath: postgresql-42.2.10.jar

0 commit comments

Comments
 (0)