be

getrebuild · Dec 29, 2024 · e8214b0 · e8214b0
1 parent fd70925
commit e8214b0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/main/java/com/rebuild/web/admin/rbstore/RBStoreController.java b/src/main/java/com/rebuild/web/admin/rbstore/RBStoreController.java
@@ -29,12 +29,10 @@
 @RestController
 public class RBStoreController extends BaseController {
 
-    @GetMapping("/admin/rbstore/load-index")
+    @GetMapping({"/admin/rbstore/load-index", "/setup/load-index"})
     public JSONAware loadDataIndex(HttpServletRequest request) {
         String type = getParameterNotNull(request, "type");
-        if (CommonsUtils.isExternalUrl(type)) {
-            return RespBody.error();
-        }
+        if (CommonsUtils.isExternalUrl(type)) return RespBody.error();
 
         JSON index = null;
         try {

diff --git a/src/main/java/com/rebuild/web/admin/setup/InstallController.java b/src/main/java/com/rebuild/web/admin/setup/InstallController.java
@@ -13,7 +13,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.rebuild.api.RespBody;
 import com.rebuild.core.Application;
-import com.rebuild.core.RebuildException;
+import com.rebuild.core.DefinedException;
 import com.rebuild.core.support.License;
 import com.rebuild.core.support.i18n.Language;
 import com.rebuild.core.support.setup.InstallState;
@@ -53,7 +53,7 @@ public class InstallController extends BaseController implements InstallState {
     @Override
     public boolean checkInstalled() {
         if (InstallState.super.checkInstalled() && Application.isReady()) {
-            throw new RebuildException("NOT ALLOWED");
+            throw new DefinedException("NOT ALLOWED");
         }
         return false;
     }

diff --git a/src/main/java/com/rebuild/web/admin/setup/RbSystemController.java b/src/main/java/com/rebuild/web/admin/setup/RbSystemController.java
@@ -8,6 +8,7 @@
 package com.rebuild.web.admin.setup;
 
 import com.rebuild.api.RespBody;
+import com.rebuild.core.DefinedException;
 import com.rebuild.core.RebuildException;
 import com.rebuild.core.rbstore.RbSystemImporter;
 import com.rebuild.core.support.setup.InstallState;
@@ -35,8 +36,8 @@ public class RbSystemController extends BaseController implements InstallState {
     public ModelAndView index(HttpServletRequest request) throws IOException {
         try {
             RbAssert.isSuperAdmin(getRequestUser(request));
-        } catch (Exception error404) {
-            throw new RebuildException("NOT ALLOWED");
+        } catch (Exception error403) {
+            throw new DefinedException("NOT ALLOWED");
         }
         return createModelAndView("/admin/setup/rbsystem");
     }

diff --git a/src/main/resources/web/assets/js/admin/setup-rbsystem.js b/src/main/resources/web/assets/js/admin/setup-rbsystem.js
@@ -107,7 +107,7 @@ class Setup extends React.Component {
 }
 
 $(document).ready(() => {
-  $.get('/admin/rbstore/load-index?type=rbsystems', (res) => {
+  $.get('/setup/load-index?type=rbsystems', (res) => {
     if ((res.data || []).length > 0) {
       renderRbcomp(<Setup data={res.data} />, $('.card-body'))
     } else {