修改ci配置流程

src/main/java/com/bestsch/openapi/UserSysRole.java

@@ -1,37 +0,0 @@
-package com.bestsch.openapi;
-
-/**
- * 迁移兼容 shim：原 bestsch 开放接口的"当前角色"载体。
- * 仅保留 {@code Operator.of(...)} 所需的访问器，避免批量改动业务代码。
- * 后续可替换为 UserBase 自有角色模型。
- */
-public class UserSysRole {
-
-    private Integer userId;
-    private Integer schId;
-    private Integer roleId;
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getSchId() {
-        return schId;
-    }
-
-    public void setSchId(Integer schId) {
-        this.schId = schId;
-    }
-
-    public Integer getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Integer roleId) {
-        this.roleId = roleId;
-    }
-}

src/main/java/com/bestsch/utils/DException.java

@@ -1,22 +0,0 @@
-package com.bestsch.utils;
-
-/**
- * 迁移兼容 shim：原 bestsch 框架的业务异常类。
- * UserBase 大量业务代码依赖此异常，迁移到基础平台期间保留原包名与常用构造签名，避免批量改动。
- * 后续可统一替换为 UserBase 自有异常类型。
- */
-public class DException extends RuntimeException {
-
-    public DException(String message) {
-        super(message);
-    }
-
-    public DException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /** 兼容历史调用方携带错误码的场景 */
-    public DException(String message, int code) {
-        super(message);
-    }
-}

src/main/java/com/yunhai/userbase/controller/api/AppSettingsController.java

@@ -2,15 +2,11 @@ package com.yunhai.userbase.controller.api;
 
 import com.bestsch.utils.DException;
 import com.yunhai.userbase.common.annotation.OperationLog;
-import com.yunhai.userbase.common.context.UserContext;
 import com.yunhai.userbase.common.validation.ValidationGroups;
 import com.yunhai.userbase.config.Config;
 import com.yunhai.userbase.entity.ApplicationInfo;
-import com.yunhai.userbase.enums.BookType;
-import com.yunhai.userbase.model.BaseDict;
 import com.yunhai.userbase.model.BasePageQuery;
 import com.yunhai.userbase.model.BasePageResult;
-import com.yunhai.userbase.model.Operator;
 import com.yunhai.userbase.model.appauthz.AppAuthzCategoryVo;
 import com.yunhai.userbase.model.appcategory.AppCategoryQuery;
 import com.yunhai.userbase.model.appcategory.AppCategoryRequest;
@@ -26,27 +22,13 @@ import com.yunhai.userbase.service.IAppCategoryService;
 import com.yunhai.userbase.service.IApplicationInfoService;
 import com.yunhai.userbase.service.IAppModuleService;
 import com.yunhai.userbase.service.SignKeyCacheService;
-import com.yunhai.userbase.utils.DicUtil;
 import com.yunhai.userbase.utils.PageUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.http.fileupload.util.Streams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.SortDefault;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.BufferedOutputStream;
-import java.io.InputStream;
-import java.net.URLEncoder;
-import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/yunhai/userbase/model/Operator.java

@@ -1,29 +0,0 @@
-package com.yunhai.userbase.model;
-
-import com.bestsch.openapi.UserSysRole;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- *功能描述 :操作人信息
- * @author chenx
- * @date 2026/1/5 13:31
- * @description
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-public class Operator {
-    private Integer userId;
-    private Integer schoolSid;
-    private Integer roleId;
-    private Date createTime=new Date();
-
-    public static Operator of(UserSysRole curRole){
-        return new Operator(curRole.getUserId(),curRole.getSchId(),curRole.getRoleId(),new Date());
-    }
-
-}

src/main/resources/bootstrap.yml

@@ -15,8 +15,8 @@ spring:
         # 默认指向 prod namespace UUID，避免本地误开时连到空的 dev 命名空间
         # CI 用 SPRING_CLOUD_NACOS_CONFIG_NAMESPACE 覆盖（注意：NACOS_NAMESPACE 这个 env 名不生效，必须用 SPRING_CLOUD_NACOS_CONFIG_NAMESPACE）
         namespace: ${SPRING_CLOUD_NACOS_CONFIG_NAMESPACE:6196f0de-a28d-4894-8f10-e2982b57c6bc}
-        # 主配置 group：userbase.yaml / application-infra.yaml 同组
-        group: DEFAULT_GROUP
+        # 主配置 group：userbase.yaml 在 USERBASE group（与下方 shared-configs 的 DEFAULT_GROUP 不同组，各自指定）
+        group: USERBASE
         # 配置文件格式；最终主配置 dataId = ${spring.application.name}.${file-extension} = userbase.yaml
         file-extension: yaml
         encode: UTF-8