Skip to content

Commit 7b38fc5

Browse files
committed
work
1 parent 66c86b4 commit 7b38fc5

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

src/main/java/org/woehlke/greenshop/conf/GreenshopWebSecurityConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
1818
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
1919
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
20-
import org.woehlke.greenshop.oodm.admin.service.AdministratorService;
2120

2221

2322
@SuppressWarnings("deprecation")
@@ -34,7 +33,7 @@ public class GreenshopWebSecurityConfig extends WebSecurityConfigurerAdapter {
3433
@Autowired
3534
public GreenshopWebSecurityConfig(
3635
AuthenticationManagerBuilder auth,
37-
AdministratorService administratorService,
36+
UserDetailsService administratorService,
3837
GreenshopProperties greenshopProperties
3938
) {
4039
this.authenticationManagerBuilder = auth;

src/main/resources/application.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spring:
3333
jpa:
3434
open-in-view: true
3535
show-sql: true
36-
database-platform: MARIADB
36+
database-platform: MYSQL
3737
hibernate:
3838
#ddl-auto: create-drop update
3939
ddl-auto: validate
@@ -66,10 +66,10 @@ org:
6666
greenshop:
6767
testDataHowManyTestData: 10
6868
devTesting: true
69-
#userConfig:
70-
#userEmail: ${GREENSHOP_USER_EMAIL}
71-
#userPassword: ${GREENSHOP_USER_PASSWORD}
72-
#userFullname: ${GREENSHOP_USER_FULLNAME}
69+
userConfig:
70+
userEmail: 'thomas.woehlke@gmail.com'
71+
userPassword: 'UHkIifHN3iXbZtoHhiPvPzeKFBpthm0eBXdvm+Q3xNrWyXRheGDLCw=='
72+
userFullname: 'Thomas Wöhlke'
7373
webConfig:
7474
exportFilename: "measurements.csv"
7575
exportFilenameSeparator: ";"
@@ -113,9 +113,9 @@ org:
113113
- "/fehler*"
114114
usernameParameter: "userEmail"
115115
passwordParameter: "userPassword"
116-
#secret: ${GREENSHOP_USER_SECRET}
117-
#iterations: ${GREENSHO_USER_ITERATIONS}
118-
#hashWidth: ${GREENSHO_USER_HASH_WIDTH}
116+
secret: '25D8484AB208F08C59FFAFE57DB9FF87'
117+
iterations: 4096
118+
hashWidth: 256
119119
logging:
120120
level:
121121
root: INFO

0 commit comments

Comments
 (0)