diff --git a/pom.xml b/pom.xml index 3fb12e7..16d7aae 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.2 + 2.7.12 @@ -137,7 +137,7 @@ org.casbin casdoor-java-sdk - 1.22.0 + 1.22.1 @@ -155,7 +155,7 @@ com.fasterxml.jackson.core jackson-databind - 2.14.2 + 2.13.3 com.fasterxml.jackson.core @@ -177,14 +177,17 @@ junit junit test + 4.13.2 org.springframework spring-test + 5.3.8 org.projectlombok lombok + 1.18.20 diff --git a/src/main/java/org/casbin/casdoor/config/CasdoorAutoConfigure.java b/src/main/java/org/casbin/casdoor/config/CasdoorAutoConfigure.java index 0cc33c4..db5331d 100644 --- a/src/main/java/org/casbin/casdoor/config/CasdoorAutoConfigure.java +++ b/src/main/java/org/casbin/casdoor/config/CasdoorAutoConfigure.java @@ -15,63 +15,62 @@ public class CasdoorAutoConfigure { @Bean @ConditionalOnMissingBean - CasdoorUserService getCasdoorUserService(CasdoorConfiguration config) { - return new CasdoorUserService(config); + UserService getUserService(CasdoorConfiguration config) { + return new UserService(config); } @Bean @ConditionalOnMissingBean - CasdoorAuthService getCasdoorAuthService(CasdoorConfiguration config) { - return new CasdoorAuthService(config); + AuthService getAuthService(CasdoorConfiguration config) { + return new AuthService(config); } @Bean @ConditionalOnMissingBean - CasdoorSmsService getCasdoorSmsService(CasdoorConfiguration config) { - return new CasdoorSmsService(config); + SmsService getCasdoorSmsService(CasdoorConfiguration config) { + return new SmsService(config); } @Bean @ConditionalOnMissingBean - CasdoorEmailService getCasdoorEmailService(CasdoorConfiguration config) { - return new CasdoorEmailService(config); + EmailService getCasdoorEmailService(CasdoorConfiguration config) { + return new EmailService(config); } @Bean @ConditionalOnMissingBean - CasdoorResourceService getCasdoorResourceService(CasdoorConfiguration config) { - return new CasdoorResourceService(config); + ResourceService getCasdoorResourceService(CasdoorConfiguration config) { + return new ResourceService(config); } @Bean @ConditionalOnMissingBean - CasdoorAccountService getCasdoorAccountService(CasdoorConfiguration config) { - return new CasdoorAccountService(config); + AccountService getCasdoorAccountService(CasdoorConfiguration config) { + return new AccountService(config); } @Bean @ConditionalOnMissingBean - CasdoorEnforcerService getCasdoorEnforcerService(CasdoorConfiguration config) { - return new CasdoorEnforcerService(config); + EnforcerService getCasdoorEnforcerService(CasdoorConfiguration config) { + return new EnforcerService(config); } @Bean @ConditionalOnMissingBean - CasdoorPermissionService getCasdoorPermissionService(CasdoorConfiguration config) { - return new CasdoorPermissionService(config); + PermissionService getCasdoorPermissionService(CasdoorConfiguration config) { + return new PermissionService(config); } @Bean @ConditionalOnMissingBean - CasdoorRoleService getCasdoorRoleService(CasdoorConfiguration config) { - return new CasdoorRoleService(config); + RoleService getCasdoorRoleService(CasdoorConfiguration config) { + return new RoleService(config); } @Bean @ConditionalOnMissingBean - CasdoorTokenService getCasdoorTokenService(CasdoorConfiguration config) { - return new CasdoorTokenService(config); + TokenService getCasdoorTokenService(CasdoorConfiguration config) { + return new TokenService(config); } - } diff --git a/src/main/java/org/casbin/casdoor/config/CasdoorConfiguration.java b/src/main/java/org/casbin/casdoor/config/CasdoorConfiguration.java index 5585e27..56c28a9 100644 --- a/src/main/java/org/casbin/casdoor/config/CasdoorConfiguration.java +++ b/src/main/java/org/casbin/casdoor/config/CasdoorConfiguration.java @@ -10,4 +10,4 @@ @EqualsAndHashCode(callSuper = true) @Data @ConfigurationProperties(prefix = "casdoor") -public class CasdoorConfiguration extends CasdoorConfig{} +public class CasdoorConfiguration extends Config{} diff --git a/src/test/java/org/casbin/casdoor/CasdoorSpringBootStarterApplicationTest.java b/src/test/java/org/casbin/casdoor/CasdoorSpringBootStarterApplicationTest.java index 87c1c0b..2629a13 100644 --- a/src/test/java/org/casbin/casdoor/CasdoorSpringBootStarterApplicationTest.java +++ b/src/test/java/org/casbin/casdoor/CasdoorSpringBootStarterApplicationTest.java @@ -1,8 +1,8 @@ package org.casbin.casdoor; -import org.casbin.casdoor.entity.CasdoorUser; -import org.casbin.casdoor.service.CasdoorAuthService; -import org.casbin.casdoor.service.CasdoorUserService; +import org.casbin.casdoor.entity.User; +import org.casbin.casdoor.service.AuthService; +import org.casbin.casdoor.service.UserService; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -17,45 +17,45 @@ @TestPropertySource("classpath:test.properties") public class CasdoorSpringBootStarterApplicationTest { @Resource - CasdoorUserService casdoorUserService; + UserService userService; @Resource - CasdoorAuthService casdoorAuthService; + AuthService authService; @Test public void testInjection() { - Assert.assertNotNull(casdoorAuthService); - Assert.assertNotNull(casdoorUserService); + Assert.assertNotNull(authService); + Assert.assertNotNull(userService); } @Test public void testGetUser() throws Exception { - Assert.assertNotNull(casdoorUserService.getUser("admin")); + Assert.assertNotNull(userService.getUser("admin")); } @Test public void testGetUsers() throws Exception { - Assert.assertNotNull(casdoorUserService.getUsers()); + Assert.assertNotNull(userService.getUsers()); } @Test public void testAddUser() throws Exception { - CasdoorUser user = casdoorUserService.getUser("admin"); - user.setName("testAdmin"); - user.setId("qwertyuio"); - Assert.assertEquals("Affected", casdoorUserService.addUser(user).getData()); + User user = userService.getUser("admin"); + user.name = "testAdmin"; + user.id = "qwertyuio"; + Assert.assertEquals("Affected", userService.addUser(user).getData()); } @Test public void testUpdateUser() throws Exception { - CasdoorUser user = casdoorUserService.getUser("testAdmin"); - user.setDisplayName("testUpdateAdmin"); - Assert.assertEquals("Affected", casdoorUserService.updateUser(user).getData()); + User user = userService.getUser("testAdmin"); + user.displayName = "testUpdateAdmin"; + Assert.assertEquals("Affected", userService.updateUser(user).getData()); } @Test public void testDeleteUser() throws Exception { - CasdoorUser user = casdoorUserService.getUser("testAdmin"); - Assert.assertEquals("Affected", casdoorUserService.deleteUser(user).getData()); + User user = userService.getUser("testAdmin"); + Assert.assertEquals("Affected", userService.deleteUser(user).getData()); } } diff --git a/src/test/resources/test.properties b/src/test/resources/test.properties index 456a310..ab383fa 100644 --- a/src/test/resources/test.properties +++ b/src/test/resources/test.properties @@ -1,6 +1,6 @@ -casdoor.endpoint = http://localhost:8000 -casdoor.clientId = 874e3e05e58d50148c65 -casdoor.clientSecret = 41510b84c7267ad2e4d2b51096b7f11dc9c5fdc8 +casdoor.endpoint = https://demo.casdoor.com +casdoor.clientId = 294b09fbc17f95daf2fe +casdoor.clientSecret = dd8982f7046ccba1bbd7851d5c1ece4e52bf039d casdoor.jwtSecret = CasdoorSecret -casdoor.organizationName = built-in -casdoor.applicationName = app-built-in \ No newline at end of file +casdoor.organizationName = casbin +casdoor.applicationName = app-vue-python-example \ No newline at end of file