更新 admin 模块

mgr/src/main/java/cn/reghao/devops/mgr/admin/db/repository/SiteOptionRepository.java

@@ -1,12 +0,0 @@
-package cn.reghao.devops.mgr.admin.db.repository;
-
-import cn.reghao.devops.mgr.admin.model.po.SiteOption;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * @author reghao
- * @date 2025-06-19 09:34:28
- */
-public interface SiteOptionRepository extends JpaRepository<SiteOption, Integer> {
-    SiteOption findByPropKey(String propKey);
-}

mgr/src/main/java/cn/reghao/devops/mgr/admin/model/po/SiteOption.java

@@ -1,26 +0,0 @@
-package cn.reghao.devops.mgr.admin.model.po;
-
-import cn.reghao.devops.mgr.util.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * 站点配置项
- *
- * @author reghao
- * @date 2023-04-18 08:31:24
- */
-@Setter
-@Getter
-@Table(name = "sys_site_option")
-@Entity
-public class SiteOption extends BaseEntity {
-    @Column(nullable = false, unique = true)
-    private String propKey;
-    @Column(nullable = false)
-    private String propValue;
-}

mgr/src/main/java/cn/reghao/devops/mgr/admin/model/po/SysMessage.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.persistence.Entity;
+import javax.persistence.Table;
 
 /**
  * @author reghao
@@ -17,6 +18,7 @@ import javax.persistence.Entity;
 @Setter
 @Getter
 @Entity
+@Table(name = "sys1_message")
 public class SysMessage extends BaseEntity {
     private String title;
     private Boolean unread;

mgr/src/main/java/cn/reghao/devops/mgr/admin/model/po/Webhook.java

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotBlank;
 @Setter
 @Getter
 @Entity
-@Table(name = "sys_notify_receiver")
+@Table(name = "sys1_notify_receiver")
 public class Webhook extends BaseEntity {
     @Column(nullable = false, unique = true)
     private String name;

mgr/src/main/java/cn/reghao/devops/mgr/admin/service/DefaultSetting.java

@@ -1,9 +1,6 @@
 package cn.reghao.devops.mgr.admin.service;
 
-import cn.reghao.devops.mgr.admin.db.repository.SiteOptionRepository;
 import cn.reghao.devops.mgr.admin.model.constant.RoleType;
-import cn.reghao.devops.mgr.admin.model.po.SiteOption;
-import cn.reghao.devops.mgr.admin.service.UserContext;
 import cn.reghao.devops.mgr.app.model.constant.AppType;
 import cn.reghao.devops.mgr.builder.model.constant.EnvType;
 import org.springframework.stereotype.Service;
@@ -16,31 +13,13 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DefaultSetting {
-    private final SiteOptionRepository siteOptionRepository;
-
-    public DefaultSetting(SiteOptionRepository siteOptionRepository) {
-        this.siteOptionRepository = siteOptionRepository;
-    }
-
     public String getDefaultEnv() {
-        SiteOption siteOption = siteOptionRepository.findByPropKey("site.env");
-        /*Set<String> roles = UserContext.getUserRoles();
-        if (roles.contains(RoleType.ROLE_DEVOPS.name())) {
-            return EnvType.test.name();
-        } else if (roles.contains(RoleType.ROLE_BACKEND.name())
-                || roles.contains(RoleType.ROLE_FRONTEND.name())) {
-            return EnvType.test.name();
-        }*/
-        //return EnvType.test.name();
-        return siteOption.getPropValue();
+        return EnvType.test.name();
     }
 
     public String getDefaultAppType() {
         String defaultAppType = AppType.dotnet.getName();
         String role = UserContext.getUserRole();
-        String roleName = role.replace("ROLE_", "").toLowerCase();
-        String propKey = String.format("site.appType.%s", roleName);
-        SiteOption siteOption = siteOptionRepository.findByPropKey(propKey);
         if (role.equals(RoleType.ROLE_JAVA.name())) {
             defaultAppType = AppType.java.getName();
         } else if (role.equals(RoleType.ROLE_DOTNET.name())) {
@@ -49,7 +28,6 @@ public class DefaultSetting {
             defaultAppType = AppType.npm.getName();
         }
 
-        //return defaultAppType;
-        return siteOption.getPropValue();
+        return defaultAppType;
     }
 }