From 81bd7c186bc4a7de025681f4e6035cf0bb235d3d Mon Sep 17 00:00:00 2001 From: naah69 Date: Fri, 21 Oct 2022 16:28:02 +0800 Subject: [PATCH] fix build probelm --- .github/project.yml | 2 +- README.md | 4 +- .../resteasy/it/integrate/LoginResource.java | 3 +- .../satoken/resteasy/it/BasicTest.java | 40 +++++----- .../resteasy/SaRequestForResteasy.java | 4 +- .../quarkus-satoken-vertx/pom.xml | 0 .../deployment/pom.xml | 2 +- ...uarkusSatokenDaoAloneRedisDevModeTest.java | 23 ------ .../test/QuarkusSatokenDaoAloneRedisTest.java | 23 ------ .../integration-tests/pom.xml | 2 +- .../quarkus-satoken-dao-alone-redis/pom.xml | 79 ++++--------------- .../runtime/pom.xml | 7 +- .../config/adapter/SaOAuth2ConfigAdapter.java | 15 ++-- .../satoken/sso/SsoServerController.java | 12 +-- .../sso/config/SaSsoConfigForQuarkus.java | 2 - .../config/adapter/SaSsoConfigAdapter.java | 8 +- 16 files changed, 63 insertions(+), 163 deletions(-) delete mode 100644 quarkus-satoken-main/quarkus-satoken-vertx/pom.xml delete mode 100644 quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/src/test/java/io/quarkus/satoken/dao/alone/redis/test/QuarkusSatokenDaoAloneRedisDevModeTest.java delete mode 100644 quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/src/test/java/io/quarkus/satoken/dao/alone/redis/test/QuarkusSatokenDaoAloneRedisTest.java diff --git a/.github/project.yml b/.github/project.yml index 640609f..dbd5093 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ release: - current-version: 1.30.0 + current-version: 1.30.1-SNAPSHOT next-version: 1.30.1-SNAPSHOT diff --git a/README.md b/README.md index 519e382..b05617f 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,6 @@ There are some demo in every `integration-tests` module. ### Main -- [x] quarkus-satoken-vertx - [x] quarkus-satoken-resteasy - [ ] quarkus-satoken-resteasy-reactive @@ -54,8 +53,8 @@ There are some demo in every `integration-tests` module. - [x] quarkus-satoken-sso - [x] quarkus-satoken-aop(in quarkus-satoken-resteasy) - [x] quarkus-satoken-dao-redis-jackson(based on quarkus-redisson) +- [x] quarkus-satoken-alone-redis(based on quarkus-redisson) - [x] quarkus-satoken-context-dubbo -- [x] quarkus-satoken-alone-redis - [ ] quarkus-satoken-dao-redis - [ ] quarkus-satoken-dialect-thymeleaf - [ ] quarkus-satoken-jwt @@ -65,7 +64,6 @@ There are some demo in every `integration-tests` module. It has not been tested in native mode yet. -- [ ] quarkus-satoken-vertx - [ ] quarkus-satoken-resteasy - [ ] quarkus-satoken-resteasy-reactive - [ ] quarkus-satoken-oauth2 diff --git a/quarkus-satoken-main/quarkus-satoken-resteasy/integration-tests/src/main/java/io/quarkiverse/satoken/resteasy/it/integrate/LoginResource.java b/quarkus-satoken-main/quarkus-satoken-resteasy/integration-tests/src/main/java/io/quarkiverse/satoken/resteasy/it/integrate/LoginResource.java index a225dc7..ed4fbee 100644 --- a/quarkus-satoken-main/quarkus-satoken-resteasy/integration-tests/src/main/java/io/quarkiverse/satoken/resteasy/it/integrate/LoginResource.java +++ b/quarkus-satoken-main/quarkus-satoken-resteasy/integration-tests/src/main/java/io/quarkiverse/satoken/resteasy/it/integrate/LoginResource.java @@ -17,7 +17,6 @@ package io.quarkiverse.satoken.resteasy.it.integrate; import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; @@ -33,7 +32,7 @@ public class LoginResource { // 测试登录 ---- http://localhost:8081/acc/doLogin?name=zhang&pwd=123456 @POST @Path("doLogin") - public SaResult doLogin(@FormParam("name") String name, @QueryParam("pwd") String pwd) { + public SaResult doLogin(@QueryParam("name") String name, @QueryParam("pwd") String pwd) { // 此处仅作模拟示例，真实项目需要从数据库中查询数据进行比对 if ("zhang".equals(name) && "123456".equals(pwd)) { StpUtil.login(10001); diff --git a/quarkus-satoken-main/quarkus-satoken-resteasy/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/it/BasicTest.java b/quarkus-satoken-main/quarkus-satoken-resteasy/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/it/BasicTest.java index 264bf37..ceb5ba4 100644 --- a/quarkus-satoken-main/quarkus-satoken-resteasy/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/it/BasicTest.java +++ b/quarkus-satoken-main/quarkus-satoken-resteasy/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/it/BasicTest.java @@ -56,6 +56,7 @@ public static void afterClass() { public void clear() { MockResteasyReactiveRequestContext.remove(); } + // 测试：基础API @Test public void testBasicsApi() { @@ -93,13 +94,13 @@ public void testDoLogin() { // API 验证 Assertions.assertTrue(StpUtil.isLogin()); Assertions.assertDoesNotThrow(() -> StpUtil.checkLogin()); - Assertions.assertNotNull(token); // token不为null - Assertions.assertEquals(StpUtil.getLoginIdAsLong(), 10001); // loginId=10001 - Assertions.assertEquals(StpUtil.getLoginIdAsInt(), 10001); // loginId=10001 - Assertions.assertEquals(StpUtil.getLoginIdAsString(), "10001"); // loginId=10001 - Assertions.assertEquals(StpUtil.getLoginId(), "10001"); // loginId=10001 - Assertions.assertEquals(StpUtil.getLoginIdDefaultNull(), "10001"); // loginId=10001 - Assertions.assertEquals(StpUtil.getLoginDevice(), SaTokenConsts.DEFAULT_LOGIN_DEVICE); // 登录设备类型 + Assertions.assertNotNull(token); // token不为null + Assertions.assertEquals(StpUtil.getLoginIdAsLong(), 10001); // loginId=10001 + Assertions.assertEquals(StpUtil.getLoginIdAsInt(), 10001); // loginId=10001 + Assertions.assertEquals(StpUtil.getLoginIdAsString(), "10001"); // loginId=10001 + Assertions.assertEquals(StpUtil.getLoginId(), "10001"); // loginId=10001 + Assertions.assertEquals(StpUtil.getLoginIdDefaultNull(), "10001"); // loginId=10001 + Assertions.assertEquals(StpUtil.getLoginDevice(), SaTokenConsts.DEFAULT_LOGIN_DEVICE); // 登录设备类型 // db数据 验证 // token存在 @@ -155,10 +156,10 @@ public void testSession() { session.set("age", "18"); Assertions.assertEquals(session.get("name"), "zhang"); Assertions.assertEquals(session.getInt("age"), 18); - Assertions.assertEquals((int)session.getModel("age", int.class), 18); - Assertions.assertEquals((int)session.get("age", 20), 18); - Assertions.assertEquals((int)session.get("name2", 20), 20); - Assertions.assertEquals((int)session.get("name2", () -> 30), 30); + Assertions.assertEquals((int) session.getModel("age", int.class), 18); + Assertions.assertEquals((int) session.get("age", 20), 18); + Assertions.assertEquals((int) session.get("name2", 20), 20); + Assertions.assertEquals((int) session.get("name2", () -> 30), 30); session.clear(); Assertions.assertEquals(session.get("name"), null); } @@ -346,7 +347,8 @@ public void testDisable() { // 封号 StpUtil.disable(10007, 200); Assertions.assertTrue(StpUtil.isDisable(10007)); - Assertions.assertEquals(dao.get("satoken:login:disable:login:" + 10007), String.valueOf(SaTokenConsts.DEFAULT_DISABLE_LEVEL)); + Assertions.assertEquals(dao.get("satoken:login:disable:login:" + 10007), + String.valueOf(SaTokenConsts.DEFAULT_DISABLE_LEVEL)); // 封号后检测一下 (会抛出 DisableLoginException 异常) Assertions.assertThrows(DisableServiceException.class, () -> StpUtil.checkDisable(10007)); @@ -368,7 +370,8 @@ public void testDisableService() { // 封掉评论功能 StpUtil.disable(10008, "comment", 200); Assertions.assertTrue(StpUtil.isDisable(10008, "comment")); - Assertions.assertEquals(dao.get("satoken:login:disable:comment:" + 10008), String.valueOf(SaTokenConsts.DEFAULT_DISABLE_LEVEL)); + Assertions.assertEquals(dao.get("satoken:login:disable:comment:" + 10008), + String.valueOf(SaTokenConsts.DEFAULT_DISABLE_LEVEL)); Assertions.assertNull(dao.get("satoken:login:disable:login:" + 10008)); // 封号后检测一下 @@ -547,11 +550,11 @@ public void testSafe() { StpUtil.checkSafe(); // 自然结束 -// Thread.sleep(2500); -// Assertions.assertFalse(StpUtil.isSafe()); + // Thread.sleep(2500); + // Assertions.assertFalse(StpUtil.isSafe()); // 手动结束 -// StpUtil.openSafe(2); + // StpUtil.openSafe(2); StpUtil.closeSafe(); Assertions.assertFalse(StpUtil.isSafe()); @@ -559,7 +562,6 @@ public void testSafe() { Assertions.assertThrows(NotSafeException.class, () -> StpUtil.checkSafe()); } - // ------------- 复杂点的 // 测试：指定设备登录 @@ -615,7 +617,6 @@ public void testDoLoginByTimeout() { timeout = StpUtil.getTokenSessionTimeout(); Assertions.assertTrue(timeout >= 299); - // 注销后，就是-2 StpUtil.logout(); timeout = StpUtil.getTokenTimeout(); @@ -692,13 +693,12 @@ public void testActivityTimeout() { // 默认跟随全局 timeout StpUtil.updateLastActivityToNow(); long activityTimeout = StpUtil.getTokenActivityTimeout(); - Assertions.assertTrue(activityTimeout <=180 || activityTimeout >=179); + Assertions.assertTrue(activityTimeout <= 180 || activityTimeout >= 179); // 不会抛出异常 Assertions.assertDoesNotThrow(() -> StpUtil.checkActivityTimeout()); } - // 测试，上下文 API @Test public void testSaTokenContext() { diff --git a/quarkus-satoken-main/quarkus-satoken-resteasy/runtime/src/main/java/io/quarkiverse/satoken/resteasy/SaRequestForResteasy.java b/quarkus-satoken-main/quarkus-satoken-resteasy/runtime/src/main/java/io/quarkiverse/satoken/resteasy/SaRequestForResteasy.java index ee2cd4c..ee7b832 100644 --- a/quarkus-satoken-main/quarkus-satoken-resteasy/runtime/src/main/java/io/quarkiverse/satoken/resteasy/SaRequestForResteasy.java +++ b/quarkus-satoken-main/quarkus-satoken-resteasy/runtime/src/main/java/io/quarkiverse/satoken/resteasy/SaRequestForResteasy.java @@ -44,8 +44,10 @@ public Object getSource() { /** * if there is not @FormParam in Endpoint,the form data will not parsing. + * * @see RESTEasy Reactive - get all form data - * @see RESTEasy Reactive: make body-reading filters force reading the body + * @see RESTEasy Reactive: make body-reading filters force + * reading the body * @param name param name * @return param value */ diff --git a/quarkus-satoken-main/quarkus-satoken-vertx/pom.xml b/quarkus-satoken-main/quarkus-satoken-vertx/pom.xml deleted file mode 100644 index e69de29..0000000 diff --git a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/pom.xml b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/pom.xml index 7ff073c..53b2da0 100644 --- a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/pom.xml +++ b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.satoken quarkus-satoken-dao-alone-redis-parent - 1.30.0 + 1.30.1-SNAPSHOT quarkus-satoken-dao-alone-redis-deployment Quarkus Satoken Dao Alone Redis - Deployment diff --git a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/src/test/java/io/quarkus/satoken/dao/alone/redis/test/QuarkusSatokenDaoAloneRedisDevModeTest.java b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/src/test/java/io/quarkus/satoken/dao/alone/redis/test/QuarkusSatokenDaoAloneRedisDevModeTest.java deleted file mode 100644 index 0a3b8a6..0000000 --- a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/src/test/java/io/quarkus/satoken/dao/alone/redis/test/QuarkusSatokenDaoAloneRedisDevModeTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.quarkus.satoken.dao.alone.redis.test; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import io.quarkus.test.QuarkusDevModeTest; - -public class QuarkusSatokenDaoAloneRedisDevModeTest { - - // Start hot reload (DevMode) test with your extension loaded - @RegisterExtension - static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); - - @Test - public void writeYourOwnDevModeTest() { - // Write your dev mode tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information - Assertions.assertTrue(true, "Add dev mode assertions to " + getClass().getName()); - } -} diff --git a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/src/test/java/io/quarkus/satoken/dao/alone/redis/test/QuarkusSatokenDaoAloneRedisTest.java b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/src/test/java/io/quarkus/satoken/dao/alone/redis/test/QuarkusSatokenDaoAloneRedisTest.java deleted file mode 100644 index 9c08361..0000000 --- a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/deployment/src/test/java/io/quarkus/satoken/dao/alone/redis/test/QuarkusSatokenDaoAloneRedisTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.quarkus.satoken.dao.alone.redis.test; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import io.quarkus.test.QuarkusUnitTest; - -public class QuarkusSatokenDaoAloneRedisTest { - - // Start unit test with your extension loaded - @RegisterExtension - static final QuarkusUnitTest unitTest = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); - - @Test - public void writeYourOwnUnitTest() { - // Write your unit tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information - Assertions.assertTrue(true, "Add some assertions to " + getClass().getName()); - } -} diff --git a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/integration-tests/pom.xml b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/integration-tests/pom.xml index 51dde04..eb0e8ad 100644 --- a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/integration-tests/pom.xml +++ b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/integration-tests/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.satoken quarkus-satoken-dao-alone-redis-parent - 1.30.0 + 1.30.1-SNAPSHOT quarkus-satoken-dao-alone-redis-integration-tests Quarkus Satoken Dao Alone Redis - Integration Tests diff --git a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/pom.xml b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/pom.xml index e8e1cba..a77c977 100644 --- a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/pom.xml +++ b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/pom.xml @@ -5,7 +5,7 @@ quarkus-satoken-plugins io.quarkiverse.satoken - 1.30.0 + 1.30.1-SNAPSHOT quarkus-satoken-dao-alone-redis-parent pom @@ -15,66 +15,19 @@ integration-tests runtime - - 3.8.1 - ${surefire-plugin.version} - 11 - UTF-8 - UTF-8 - 2.10.1.Final - 3.0.0-M7 - - - - - io.quarkus - quarkus-bom - ${quarkus.version} - pom - import - - - - - - - - io.quarkus - quarkus-maven-plugin - ${quarkus.version} - - - maven-surefire-plugin - ${surefire-plugin.version} - - - org.jboss.logmanager.LogManager - ${maven.home} - ${settings.localRepository} - - - - - maven-failsafe-plugin - ${failsafe-plugin.version} - - - org.jboss.logmanager.LogManager - ${maven.home} - ${settings.localRepository} - - - - - maven-compiler-plugin - ${compiler-plugin.version} - - - -parameters - - - - - - + + + + it + + + performRelease + !true + + + + integration-tests + + + diff --git a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/runtime/pom.xml b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/runtime/pom.xml index 6204d85..cac9564 100644 --- a/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/runtime/pom.xml +++ b/quarkus-satoken-plugins/quarkus-satoken-dao-alone-redis/runtime/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.satoken quarkus-satoken-dao-alone-redis-parent - 1.30.0 + 1.30.1-SNAPSHOT quarkus-satoken-dao-alone-redis Quarkus Satoken Dao Alone Redis - Runtime @@ -24,7 +24,7 @@ io.quarkus - quarkus-extension-maven-plugin + quarkus-bootstrap-maven-plugin ${quarkus.version} @@ -33,7 +33,8 @@ extension-descriptor - ${project.groupId}:${project.artifactId}-deployment:${project.version} + ${project.groupId}:${project.artifactId}-deployment:${project.version} + diff --git a/quarkus-satoken-plugins/quarkus-satoken-oauth2/runtime/src/main/java/io/quarkiverse/satoken/oauth2/config/adapter/SaOAuth2ConfigAdapter.java b/quarkus-satoken-plugins/quarkus-satoken-oauth2/runtime/src/main/java/io/quarkiverse/satoken/oauth2/config/adapter/SaOAuth2ConfigAdapter.java index 47772b5..84e8382 100644 --- a/quarkus-satoken-plugins/quarkus-satoken-oauth2/runtime/src/main/java/io/quarkiverse/satoken/oauth2/config/adapter/SaOAuth2ConfigAdapter.java +++ b/quarkus-satoken-plugins/quarkus-satoken-oauth2/runtime/src/main/java/io/quarkiverse/satoken/oauth2/config/adapter/SaOAuth2ConfigAdapter.java @@ -68,7 +68,6 @@ public long getPastClientTokenTimeout() { return Objects.nonNull(config) ? config.pastClientTokenTimeout : super.getPastClientTokenTimeout(); } - @Override public void setIsCode(Boolean isCode) { config.isCode = isCode; @@ -76,27 +75,27 @@ public void setIsCode(Boolean isCode) { @Override public void setIsImplicit(Boolean isImplicit) { - config.isImplicit=isImplicit; + config.isImplicit = isImplicit; } @Override public void setIsPassword(Boolean isPassword) { - config.isPassword=isPassword; + config.isPassword = isPassword; } @Override public void setIsClient(Boolean isClient) { - config.isClient=isClient; + config.isClient = isClient; } @Override public void setIsNewRefresh(Boolean isNewRefresh) { - config.isNewRefresh=isNewRefresh; + config.isNewRefresh = isNewRefresh; } @Override public SaOAuth2Config setCodeTimeout(long codeTimeout) { - config.codeTimeout=codeTimeout; + config.codeTimeout = codeTimeout; return this; } @@ -108,7 +107,7 @@ public SaOAuth2Config setAccessTokenTimeout(long accessTokenTimeout) { @Override public SaOAuth2Config setRefreshTokenTimeout(long refreshTokenTimeout) { - config.refreshTokenTimeout=refreshTokenTimeout; + config.refreshTokenTimeout = refreshTokenTimeout; return this; } @@ -120,7 +119,7 @@ public SaOAuth2Config setClientTokenTimeout(long clientTokenTimeout) { @Override public SaOAuth2Config setPastClientTokenTimeout(long pastClientTokenTimeout) { - config.pastClientTokenTimeout=pastClientTokenTimeout; + config.pastClientTokenTimeout = pastClientTokenTimeout; return this; } diff --git a/quarkus-satoken-plugins/quarkus-satoken-sso/integration-tests/quarkus-satoken-sso-server/src/main/java/io/quarkiverse/satoken/sso/SsoServerController.java b/quarkus-satoken-plugins/quarkus-satoken-sso/integration-tests/quarkus-satoken-sso-server/src/main/java/io/quarkiverse/satoken/sso/SsoServerController.java index fc392d5..7e8be78 100644 --- a/quarkus-satoken-plugins/quarkus-satoken-sso/integration-tests/quarkus-satoken-sso-server/src/main/java/io/quarkiverse/satoken/sso/SsoServerController.java +++ b/quarkus-satoken-plugins/quarkus-satoken-sso/integration-tests/quarkus-satoken-sso-server/src/main/java/io/quarkiverse/satoken/sso/SsoServerController.java @@ -3,14 +3,11 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.FormParam; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; import com.ejlchina.okhttps.OkHttps; @@ -20,9 +17,8 @@ import cn.dev33.satoken.sso.SaSsoUtil; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.util.SaResult; -//import io.quarkus.qute.Template; +// import io.quarkus.qute.Template; import io.quarkus.runtime.StartupEvent; -import org.jboss.resteasy.reactive.RestForm; /** * SsoServerController @@ -34,8 +30,8 @@ @ApplicationScoped public class SsoServerController { -// @Inject -// Template login; + // @Inject + // Template login; /** * SSO-Server端：处理所有SSO相关请求 @@ -83,7 +79,7 @@ void init(@Observes StartupEvent startupEvent, SaSsoConfig sso) { final Client CLIENT = ClientBuilder.newClient(); // 配置：未登录时返回的View sso.setNotLoginView(() -> { - return CLIENT.target("http://127.0.0.1:9000/sa-res/login.html").request() + return CLIENT.target("http://127.0.0.1:9000/sa-res/login.html").request() .get(); }); diff --git a/quarkus-satoken-plugins/quarkus-satoken-sso/runtime/src/main/java/io/quarkiverse/satoken/sso/config/SaSsoConfigForQuarkus.java b/quarkus-satoken-plugins/quarkus-satoken-sso/runtime/src/main/java/io/quarkiverse/satoken/sso/config/SaSsoConfigForQuarkus.java index d2f195d..dc35727 100644 --- a/quarkus-satoken-plugins/quarkus-satoken-sso/runtime/src/main/java/io/quarkiverse/satoken/sso/config/SaSsoConfigForQuarkus.java +++ b/quarkus-satoken-plugins/quarkus-satoken-sso/runtime/src/main/java/io/quarkiverse/satoken/sso/config/SaSsoConfigForQuarkus.java @@ -76,13 +76,11 @@ public class SaSsoConfigForQuarkus implements Serializable { */ public Optional ssoLogoutCall; - /** * 配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、userinfoUrl、sloUrl 属性前面，用以简化各种 url 配置 */ public Optional serverUrl; - // -------------------- 其他 -------------------- /** diff --git a/quarkus-satoken-plugins/quarkus-satoken-sso/runtime/src/main/java/io/quarkiverse/satoken/sso/config/adapter/SaSsoConfigAdapter.java b/quarkus-satoken-plugins/quarkus-satoken-sso/runtime/src/main/java/io/quarkiverse/satoken/sso/config/adapter/SaSsoConfigAdapter.java index d48749a..00dbb4e 100644 --- a/quarkus-satoken-plugins/quarkus-satoken-sso/runtime/src/main/java/io/quarkiverse/satoken/sso/config/adapter/SaSsoConfigAdapter.java +++ b/quarkus-satoken-plugins/quarkus-satoken-sso/runtime/src/main/java/io/quarkiverse/satoken/sso/config/adapter/SaSsoConfigAdapter.java @@ -1,14 +1,14 @@ package io.quarkiverse.satoken.sso.config.adapter; -import cn.dev33.satoken.config.SaSsoConfig; -import cn.dev33.satoken.util.SaFoxUtil; -import io.quarkiverse.satoken.sso.config.SaSsoConfigForQuarkus; - import java.util.Optional; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; +import cn.dev33.satoken.config.SaSsoConfig; +import cn.dev33.satoken.util.SaFoxUtil; +import io.quarkiverse.satoken.sso.config.SaSsoConfigForQuarkus; + /** * SaSsoConfigAdapter *