feat-UserInfoController-项目启动时会判断是否存在管理员账号，不存在就自动创建

ximatai · Oct 8, 2024 · 2522cbe · 2522cbe
1 parent 4a84af6
commit 2522cbe
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/core/TestBasicCURD.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/core/TestBasicCURD.java
@@ -11,7 +11,6 @@
 import net.ximatai.muyun.database.IDatabaseOperations;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
-import net.ximatai.muyun.database.exception.MyDatabaseException;
 import net.ximatai.muyun.model.PageResult;
 import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.BeforeEach;
@@ -210,9 +209,9 @@ void testDelete() {
             .then()
             .statusCode(200);
 
-        assertThrows(MyDatabaseException.class, () -> {
-            databaseOperations.row("select * from %s where id = :id ".formatted(tableName), Map.of("id", id));
-        });
+        assertNull(
+            databaseOperations.row("select * from %s where id = :id ".formatted(tableName), Map.of("id", id))
+        );
     }
 
     @Test

diff --git a/muyun-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java b/muyun-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java
@@ -13,6 +13,7 @@
 import net.ximatai.muyun.ability.ISortAbility;
 import net.ximatai.muyun.core.exception.QueryException;
 import net.ximatai.muyun.database.builder.TableBase;
+import net.ximatai.muyun.database.exception.MyDatabaseException;
 import net.ximatai.muyun.database.tool.DateTool;
 import net.ximatai.muyun.model.PageResult;
 import net.ximatai.muyun.model.QueryItem;
@@ -98,6 +99,11 @@ referenceTableTempName, getMainTable(), info.getRelationColumn(),
     @Operation(summary = "查看指定的数据")
     default Map<String, ?> view(@PathParam("id") String id) {
         Map<String, Object> row = getDB().row(getSelectOneRowSql(), Map.of("id", id));
+
+        if (row == null) {
+            throw new MyDatabaseException(null, MyDatabaseException.Type.DATA_NOT_FOUND);
+        }
+
         if (this instanceof ISecurityAbility securityAbility) {
             securityAbility.decrypt(row);
             securityAbility.checkSign(row);

diff --git a/muyun-database-std/src/main/java/net/ximatai/muyun/database/std/DataAccessStd.java b/muyun-database-std/src/main/java/net/ximatai/muyun/database/std/DataAccessStd.java
@@ -107,16 +107,10 @@ public <T> T insert(String sql, Map<String, ?> params, String pk, Class<T> idTyp
 
     @Override
     public Map<String, Object> row(String sql, Map<String, ?> params) {
-        var row = getJdbi().withHandle(handle -> handle.createQuery(sql)
+        return getJdbi().withHandle(handle -> handle.createQuery(sql)
             .bindMap(params)
             .map(new MyPgMapMapper())
             .findOne().orElse(null));
-
-        if (row == null) {
-            throw new MyDatabaseException(null, MyDatabaseException.Type.DATA_NOT_FOUND);
-        }
-
-        return row;
     }
 
     @Override

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,9 +12,11 @@
 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.exception.MyException;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
+import net.ximatai.muyun.database.exception.MyDatabaseException;
 import net.ximatai.muyun.model.QueryItem;
 import net.ximatai.muyun.model.ReferenceInfo;
 import net.ximatai.muyun.platform.ScaffoldForPlatform;
@@ -50,6 +52,9 @@ public class UserInfoController extends ScaffoldForPlatform implements IReferabl
     @Inject
     IAuthorizationService authorizationService;
 
+    @Inject
+    MuYunConfig config;
+
     @Override
     public String getMainTable() {
         return "auth_userinfo";
@@ -82,6 +87,22 @@ protected void afterInit() {
                 new Dict("1", "男"),
                 new Dict("2", "女")
             ), false);
+
+        String superUserId = config.superUserId();
+
+        try {
+            this.view(superUserId);
+        } catch (MyDatabaseException e) {
+            this.create(Map.of(
+                "id", superUserId,
+                "v_name", "超级管理员"
+            ));
+            this.setUser(superUserId, Map.of(
+                "v_username", "admin",
+                "v_password", "admin@bsy",
+                "v_password2", "admin@bsy"
+            ));
+        }
     }
 
     @Override