feat-加入redirect重定向支持

ximatai · Oct 17, 2024 · 0b9c7a3 · 0b9c7a3
1 parent 4cedfc9
commit 0b9c7a3
Show file tree

Hide file tree

Showing 27 changed files with 77 additions and 28 deletions.
diff --git a/muyun-authorization/src/main/java/net/ximatai/muyun/authorization/AuthorizationService.java b/muyun-authorization/src/main/java/net/ximatai/muyun/authorization/AuthorizationService.java
@@ -5,7 +5,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.exception.MyException;
 import net.ximatai.muyun.database.IDatabaseOperationsStd;
 import net.ximatai.muyun.model.ApiRequest;

diff --git a/muyun-boot/src/main/java/net/ximatai/muyun/config/ConfigDemo.java b/muyun-boot/src/main/java/net/ximatai/muyun/config/ConfigDemo.java
@@ -4,7 +4,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/muyun-boot/src/main/resources/application.yml b/muyun-boot/src/main/resources/application.yml
@@ -1,11 +1,18 @@
 muyun:
   debug: true
   super-user-id: 1
+web:
+  redirects:
+    - from: /
+      to: /web/
+frontend:
+  resources:
+    - prefix: /web/
+      path: /Users/liurui/develop/workspace-bsy/unicom_xinan_project/dist
 proxy:
   upstreams:
-    - prefix: /web/
+    - prefix: /web1/
       url: http://localhost:3000/
-
 quarkus:
   http:
     port: 8080
@@ -17,10 +24,10 @@ quarkus:
     db-kind: postgresql
     username: postgres
     password: muyun2024
-#    password: Muyun20&24
+    #    password: Muyun20&24
     jdbc:
       url: jdbc:postgresql://localhost:54324/muyun
-#      url: jdbc:postgresql://192.168.6.205:32128/uni_antifraud
+    #      url: jdbc:postgresql://192.168.6.205:32128/uni_antifraud
     #      enabled: true
     # reactive:
     #   url: vertx-reactive:postgresql://localhost:54324/muyun

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/core/TestAuthAbility.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/core/TestAuthAbility.java
@@ -6,7 +6,7 @@
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Path;
 import net.ximatai.muyun.base.BaseScaffold;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
 import net.ximatai.muyun.platform.controller.ModuleController;

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestDictController.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestDictController.java
@@ -4,7 +4,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.model.TreeNode;
 import net.ximatai.muyun.platform.PlatformConst;
 import net.ximatai.muyun.platform.model.DictTreeNode;

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestMenu.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestMenu.java
@@ -4,7 +4,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.model.TreeNode;
 import net.ximatai.muyun.platform.PlatformConst;
 import net.ximatai.muyun.test.testcontainers.PostgresTestResource;

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestModuleAndAction.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestModuleAndAction.java
@@ -4,7 +4,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.platform.PlatformConst;
 import net.ximatai.muyun.platform.model.ModuleAction;
 import net.ximatai.muyun.test.testcontainers.PostgresTestResource;

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestOrgAndDept.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestOrgAndDept.java
@@ -4,7 +4,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.model.TreeNode;
 import net.ximatai.muyun.platform.PlatformConst;
 import net.ximatai.muyun.platform.model.DictTreeNode;

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestRegionController.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestRegionController.java
@@ -3,7 +3,7 @@
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.exception.MyException;
 import net.ximatai.muyun.platform.controller.RegionController;
 import net.ximatai.muyun.test.testcontainers.PostgresTestResource;

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestUser.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestUser.java
@@ -5,7 +5,7 @@
 import io.restassured.common.mapper.TypeRef;
 import io.restassured.response.Response;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.platform.PlatformConst;
 import net.ximatai.muyun.platform.controller.RoleController;
 import net.ximatai.muyun.platform.model.RuntimeUser;

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestUserAndMenu.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestUserAndMenu.java
@@ -4,7 +4,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.model.TreeNode;
 import net.ximatai.muyun.platform.PlatformConst;
 import net.ximatai.muyun.platform.controller.MenuController;

diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestUserAndRole.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestUserAndRole.java
@@ -4,7 +4,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.platform.PlatformConst;
 import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.Assertions;

diff --git a/...t/ximatai/muyun/model/FrontendConfig.java → ...tai/muyun/core/config/FrontendConfig.java b/...t/ximatai/muyun/model/FrontendConfig.java → ...tai/muyun/core/config/FrontendConfig.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.model;
+package net.ximatai.muyun.core.config;
 
 import io.smallrye.config.ConfigMapping;
 

diff --git a/...net/ximatai/muyun/model/FrontendItem.java → ...matai/muyun/core/config/FrontendItem.java b/...net/ximatai/muyun/model/FrontendItem.java → ...matai/muyun/core/config/FrontendItem.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.model;
+package net.ximatai.muyun.core.config;
 
 public interface FrontendItem {
     String prefix();

diff --git a/...a/net/ximatai/muyun/core/MuYunConfig.java → ...imatai/muyun/core/config/MuYunConfig.java b/...a/net/ximatai/muyun/core/MuYunConfig.java → ...imatai/muyun/core/config/MuYunConfig.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.core.config;
 
 import io.smallrye.config.ConfigMapping;
 
@@ -11,7 +11,7 @@ public interface MuYunConfig {
     String superUserId();
 
     default boolean isSuperUser(String userID) {
-        Objects.requireNonNull(userID);
+        Objects.requireNonNull(userID, "请提供测试用户ID");
         return userID.equals(superUserId());
     }
 }
diff --git a/muyun-core/src/main/java/net/ximatai/muyun/core/config/Redirect.java b/muyun-core/src/main/java/net/ximatai/muyun/core/config/Redirect.java
@@ -0,0 +1,7 @@
+package net.ximatai.muyun.core.config;
+
+public interface Redirect {
+    String from();
+
+    String to();
+}
diff --git a/muyun-core/src/main/java/net/ximatai/muyun/core/config/WebConfig.java b/muyun-core/src/main/java/net/ximatai/muyun/core/config/WebConfig.java
@@ -0,0 +1,10 @@
+package net.ximatai.muyun.core.config;
+
+import io.smallrye.config.ConfigMapping;
+
+import java.util.List;
+
+@ConfigMapping(prefix = "web")
+public interface WebConfig {
+    List<Redirect> redirects();
+}
diff --git a/muyun-core/src/main/java/net/ximatai/muyun/core/global/GlobalExceptionHandler.java b/muyun-core/src/main/java/net/ximatai/muyun/core/global/GlobalExceptionHandler.java
@@ -6,7 +6,7 @@
 import jakarta.ws.rs.core.UriInfo;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.exception.MyException;
 import net.ximatai.muyun.core.exception.PermsException;
 import net.ximatai.muyun.database.exception.MyDatabaseException;

diff --git a/muyun-core/src/main/java/net/ximatai/muyun/http/RedirectRouter.java b/muyun-core/src/main/java/net/ximatai/muyun/http/RedirectRouter.java
@@ -0,0 +1,26 @@
+package net.ximatai.muyun.http;
+
+import io.quarkus.runtime.StartupEvent;
+import io.vertx.ext.web.Router;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import net.ximatai.muyun.core.config.WebConfig;
+
+public class RedirectRouter {
+
+    @Inject
+    WebConfig webConfig;
+
+    void installRoute(@Observes StartupEvent startupEvent, Router router) {
+        webConfig.redirects().forEach(r -> {
+            router.route(r.from())
+                .handler(rc -> {
+                    rc.response().setStatusCode(301)
+                        .putHeader("Location", r.to())
+                        .end();
+                });
+
+        });
+    }
+
+}
diff --git a/muyun-core/src/main/java/net/ximatai/muyun/http/StaticResources.java b/muyun-core/src/main/java/net/ximatai/muyun/http/StaticResources.java
@@ -6,7 +6,7 @@
 import io.vertx.ext.web.handler.StaticHandler;
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
-import net.ximatai.muyun.model.FrontendConfig;
+import net.ximatai.muyun.core.config.FrontendConfig;
 
 public class StaticResources {
 

diff --git a/muyun-core/src/main/java/net/ximatai/muyun/model/log/LogBaseItem.java b/muyun-core/src/main/java/net/ximatai/muyun/model/log/LogBaseItem.java
@@ -114,5 +114,4 @@ public LogBaseItem setError(String error) {
         return this;
     }
 
-
 }
diff --git a/...platform/src/main/java/net/ximatai/muyun/platform/controller/AuthorizationController.java b/...platform/src/main/java/net/ximatai/muyun/platform/controller/AuthorizationController.java
@@ -11,7 +11,7 @@
 import jakarta.ws.rs.QueryParam;
 import net.ximatai.muyun.ability.IDatabaseAbilityStd;
 import net.ximatai.muyun.authorization.AuthorizationService;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.core.exception.MyException;
 import net.ximatai.muyun.platform.ability.IModuleRegisterAbility;

diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/MenuSchemaController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/MenuSchemaController.java
@@ -7,7 +7,7 @@
 import jakarta.ws.rs.QueryParam;
 import net.ximatai.muyun.ability.IChildrenAbility;
 import net.ximatai.muyun.ability.ISortAbility;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.exception.MyException;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;

diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java
@@ -11,7 +11,7 @@
 import net.ximatai.muyun.ability.curd.std.IDataCheckAbility;
 import net.ximatai.muyun.ability.curd.std.IQueryAbility;
 import net.ximatai.muyun.base.BaseBusinessTable;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.exception.MyException;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;

diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/RuntimeController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/RuntimeController.java
@@ -6,7 +6,7 @@
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.QueryParam;
 import net.ximatai.muyun.ability.IRuntimeAbility;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.exception.PermsException;
 import net.ximatai.muyun.database.IDatabaseOperationsStd;
 import net.ximatai.muyun.model.IRuntimeUser;

diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/SsoController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/SsoController.java
@@ -13,7 +13,7 @@
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.Response;
 import net.ximatai.muyun.ability.IRuntimeAbility;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.exception.MyException;
 import net.ximatai.muyun.model.IRuntimeUser;
 import net.ximatai.muyun.model.PageResult;

diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/UserInfoController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/UserInfoController.java
@@ -12,7 +12,7 @@
 import net.ximatai.muyun.ability.ISoftDeleteAbility;
 import net.ximatai.muyun.ability.curd.std.IQueryAbility;
 import net.ximatai.muyun.base.BaseBusinessTable;
-import net.ximatai.muyun.core.MuYunConfig;
+import net.ximatai.muyun.core.config.MuYunConfig;
 import net.ximatai.muyun.core.exception.MyException;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;