Bean冲突修复，定时任务重复代码修复，多模块引用fs-saas-admin和多余的profile修复，配置文件修复

docs/Quartz重复类收敛说明.md

@@ -0,0 +1,95 @@
+# Quartz 重复类收敛说明
+
+> 修复日期：2026-05-27  
+> 范围：`JobInvokeUtil`、`TenantJobDispatcherJob`、`QuartzSaaSConfig` 及 `fs-service` 内重复的 `com.fs.quartz.*` 拷贝
+
+---
+
+## 一、问题原因
+
+SaaS 改造时，定时任务相关代码被拷贝到多个模块，且包名完全相同，导致：
+
+| 现象 | 说明 |
+|------|------|
+| IDE 中看到多个同名类 | 实际来自不同模块源码 |
+| 运行时只加载一份 | Fat Jar 按 classpath 顺序覆盖，行为不确定 |
+| 改一处漏一处 | 例如 `isInvokeTargetAvailable` 曾需改两个 `JobInvokeUtil` |
+
+### 重复分布（修复前）
+
+| 类 | 修复前位置 |
+|----|------------|
+| `JobInvokeUtil` | `fs-quartz`、`fs-service` |
+| `TenantJobDispatcherJob` | `fs-service`、`fs-admin-saas`、`fs-agent` |
+| `QuartzSaaSConfig` | `fs-service`、`fs-admin-saas`、`fs-agent` |
+| `SysJob` / `SysJobMapper` / `CronUtils` 等 | `fs-quartz`、`fs-service`（内容一致，纯重复） |
+
+**为何 SaaS 类在 fs-service？**  
+`TenantJobDispatcherJob` 依赖租户切库（`TenantInfoService`、`TenantDataSourceManager`），这些在 `fs-service`；`fs-quartz` 不能反向依赖 `fs-service`。
+
+**为何应用模块又拷一份？**  
+`fs-admin-saas`、`fs-agent` 拆模块时把 SaaS Quartz 配置再次拷贝到本模块 `src`。
+
+---
+
+## 二、收敛策略（修复后）
+
+| 类型 | 唯一归属模块 | 说明 |
+|------|--------------|------|
+| 通用 Quartz 工具与领域 | **fs-quartz** | `JobInvokeUtil`、`SysJob`、`SysJobMapper`、`CronUtils` 等 |
+| SaaS 租户任务分发 | **fs-service** | `TenantJobDispatcherJob`、`QuartzSaaSConfig` |
+| 应用入口 | **fs-admin-saas / fs-agent** | 不再包含上述类的源码拷贝 |
+
+---
+
+## 三、修改文件清单
+
+### 3.1 修改（1）
+
+| 文件 | 操作 | 原因 |
+|------|------|------|
+| `fs-service/pom.xml` | 将 `quartz` 依赖改为 `com.fs:fs-quartz` | 编译期使用 fs-quartz 中的工具类，删除重复源码 |
+
+### 3.2 删除 — fs-service 中与 fs-quartz 重复的 11 个文件
+
+- `fs-service/.../quartz/util/JobInvokeUtil.java`
+- `fs-service/.../quartz/util/ScheduleUtils.java`
+- `fs-service/.../quartz/util/QuartzJobExecution.java`
+- `fs-service/.../quartz/util/QuartzDisallowConcurrentExecution.java`
+- `fs-service/.../quartz/util/CronUtils.java`
+- `fs-service/.../quartz/util/AbstractQuartzJob.java`
+- `fs-service/.../quartz/service/ISysJobService.java`
+- `fs-service/.../quartz/service/ISysJobLogService.java`
+- `fs-service/.../quartz/mapper/SysJobMapper.java`
+- `fs-service/.../quartz/domain/SysJob.java`
+- `fs-service/.../quartz/domain/SysJobLog.java`
+
+### 3.3 保留 — fs-service（2）
+
+- `fs-service/.../quartz/saas/TenantJobDispatcherJob.java`
+- `fs-service/.../quartz/saas/QuartzSaaSConfig.java`
+
+### 3.4 删除 — fs-admin-saas（2）
+
+- `fs-admin-saas/.../quartz/saas/TenantJobDispatcherJob.java`
+- `fs-admin-saas/.../quartz/saas/QuartzSaaSConfig.java`
+
+### 3.5 删除 — fs-agent（2）
+
+- `fs-agent/.../quartz/saas/TenantJobDispatcherJob.java`
+- `fs-agent/.../quartz/saas/QuartzSaaSConfig.java`
+
+### 3.6 其他
+
+- `CompanyWorkflowLobsterEdgeMapper` / `VariableMapper`：`updateById` 重命名为 `updateSelectiveById`，消除 MyBatis-Plus 启动提示
+
+---
+
+## 四、验证
+
+```bash
+mvn -f ylrz_saas_his_scrm/pom.xml -pl fs-admin-saas -am compile -DskipTests
+java -jar fs-admin-saas/target/fs-saasadmin-exec.jar
+```
+
+启动后确认：`[SaaS Quartz] 租户任务分发器已注册`，且无 `qwTask` Bean 缺失刷屏。

fs-admin-saas/pom.xml

@@ -196,8 +196,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <source>17</source>
+                    <target>17</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <annotationProcessorPaths>
                         <path>
@@ -223,6 +223,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.7.18</version>
                 <configuration>
+                    <mainClass>com.fs.FsSaasAdminApplication</mainClass>
                     <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                     <excludes>
                         <exclude>

fs-admin-saas/src/main/java/com/fs/FsSaasAdminApplication.java

@@ -11,42 +11,29 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- * 启动程序
+ * 租户总后台启动程序（saasadminui → 8004）
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, RedissonAutoConfiguration.class})
 @ComponentScan(
     basePackages = "com.fs",
-    excludeFilters = {
-        @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
-            "com\\.fs\\.framework\\.service\\.PermissionService",
-            "com\\.fs\\.framework\\.service\\.UserDetailsServiceImpl",
-            // com.fs.company.controller 中与 admin 端同名 @RequestMapping 冲突的子包，保留排除
-            "com\\.fs\\.company\\.controller\\.chat\\..*",
-            "com\\.fs\\.company\\.controller\\.company\\..*",
-            "com\\.fs\\.company\\.controller\\.course\\..*",
-            "com\\.fs\\.company\\.controller\\.crm\\..*",
-            "com\\.fs\\.company\\.controller\\.fastGpt\\..*",
-            "com\\.fs\\.company\\.controller\\.live\\..*",
-            "com\\.fs\\.company\\.controller\\.newAdv\\..*",
-            "com\\.fs\\.company\\.controller\\.qw\\..*",
-            "com\\.fs\\.company\\.controller\\.stats\\..*",
-            "com\\.fs\\.company\\.controller\\.transfer\\..*",
-            // pay: AliPayBean/WxPayBean 与 fs-common 同名 bean 冲突
-            "com\\.fs\\.company\\.controller\\.pay\\..*",
-            // com.fs.company.aspectj: LiveControllerAspect 与 fs-live 同名 bean 冲突
-            "com\\.fs\\.company\\.aspectj\\..*",
-            // hisStore: fs-admin-saas 已有带 @Profile 的副本，排除 fs-company 的无 @Profile 版本
-            "com\\.fs\\.hisStore\\.controller\\..*",
-            "com\\.fs\\.his\\.controller\\.FsAiWorkflowController"
-        })
-    }
+    excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
+        "com\\.fs\\.framework\\.service\\.PermissionService",
+        "com\\.fs\\.framework\\.service\\.UserDetailsServiceImpl",
+        // 销售端 Controller 留在 fs-company，租户总后台不扫描
+        "com\\.fs\\.company\\.controller\\..*",
+        // his / hisStore 同名 Controller（如 FsIntegralGoodsController）只保留 his
+        "com\\.fs\\.hisStore\\.controller\\..*",
+        // pay: AliPayBean/WxPayBean 与 fs-common 同名 bean 冲突
+        "com\\.fs\\.company\\.controller\\.pay\\..*",
+        "com\\.fs\\.company\\.aspectj\\..*",
+        "com\\.fs\\.his\\.controller\\.FsAiWorkflowController"
+    })
 )
 @Transactional
 @EnableAsync
 @EnableScheduling
 public class FsSaasAdminApplication {
     public static void main(String[] args) {
-        // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(FsSaasAdminApplication.class, args);
         System.out.println("SaaSAdmin API启动成功");
     }

fs-admin-saas/src/main/java/com/fs/ad/controller/AdAccountController.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.context.annotation.Profile;
 
 /**
  * 站点管理Controller
@@ -15,7 +14,6 @@ import org.springframework.context.annotation.Profile;
  * @author fs
  * @date 2025-03-04
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/adAccount")
 public class AdAccountController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdDomainController.java

@@ -12,7 +12,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2025-03-04
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/adDomain")
 public class AdDomainController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdDyAccountController.java

@@ -19,7 +19,6 @@ import com.fs.ad.domain.AdDyAccount;
 import com.fs.ad.service.IAdDyAccountService;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.common.core.page.TableDataInfo;
-import org.springframework.context.annotation.Profile;
 
 /**
  * 抖音账户Controller
@@ -27,7 +26,6 @@ import org.springframework.context.annotation.Profile;
  * @author 吴树波
  * @date 2025-05-27
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/AdDyAccount")
 public class AdDyAccountController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdDyApiController.java

@@ -1,7 +1,6 @@
 package com.fs.ad.controller;
 
 import java.util.List;
-import org.springframework.context.annotation.Profile;
 
 import com.fs.ad.vo.DyAuthorizedVo;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,7 +28,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author 吴树波
  * @date 2025-05-27
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/adDyApi")
 public class AdDyApiController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdHtmlClickLogController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -21,7 +20,6 @@ import java.util.List;
  * @author fs
  * @date 2025-01-09
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/clickLog")
 public class AdHtmlClickLogController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdHtmlTemplateController.java

@@ -12,7 +12,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2024-12-31
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/html/template")
 public class AdHtmlTemplateController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdIqiyiAccountController.java

@@ -12,7 +12,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2025-03-03
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/AdIqiyiAccount")
 public class AdIqiyiAccountController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdSiteController.java

@@ -12,7 +12,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2025-03-04
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/adSite")
 public class AdSiteController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdUploadLogController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -21,7 +20,6 @@ import java.util.List;
  * @author fs
  * @date 2025-03-14
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/AdUploadLog")
 public class AdUploadLogController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/AdYoukuAccountController.java

@@ -12,7 +12,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2025-02-19
  */
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/ad/AdYouKuAccount")
 public class AdYoukuAccountController extends BaseController

fs-admin-saas/src/main/java/com/fs/ad/controller/BdAccountController.java

@@ -13,7 +13,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 import java.util.Optional;
@@ -24,7 +23,6 @@ import java.util.Optional;
  * @author fs
  * @date 2025-01-20
  */
-@Profile({"admin", "company"})
 @RestController
 @AllArgsConstructor
 @RequestMapping("/bd/BdAccount")

fs-admin-saas/src/main/java/com/fs/ad/controller/MockAppController.java

@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.context.annotation.Profile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.security.MessageDigest;
@@ -21,8 +20,6 @@ import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
-
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/baiduBack")
 public class MockAppController {

fs-admin-saas/src/main/java/com/fs/ad/controller/StatisticsController.java

@@ -20,12 +20,9 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.context.annotation.Profile;
 
 import java.time.LocalDate;
 import java.util.List;
-
-@Profile({"admin", "company"})
 @RestController
 @AllArgsConstructor
 @RequestMapping("/baiduStatistics")

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsAdvScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsAdvScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2023-06-08
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/adv")
 public class FsAdvScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsMenuScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsMenuScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/menu")
 public class FsMenuScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsPrescribeDrugScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsPrescribeDrugScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/prescribeDrug")
 public class FsPrescribeDrugScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsPrescribeScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsPrescribeScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/prescribe")
 public class FsPrescribeScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsShippingTemplatesFreeScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsShippingTemplatesFreeScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/shippingTemplatesFree")
 public class FsShippingTemplatesFreeScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsShippingTemplatesRegionScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsShippingTemplatesRegionScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/shippingTemplatesRegion")
 public class FsShippingTemplatesRegionScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsShippingTemplatesScrmBridgeController.java

@@ -13,7 +13,6 @@ import com.fs.hisStore.service.IFsShippingTemplatesScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -24,7 +23,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/shippingTemplates")
 public class FsShippingTemplatesScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreActivityScrmBridgeController.java

@@ -14,7 +14,6 @@ import com.fs.hisStore.vo.FsStoreProductActivityListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +25,6 @@ import java.util.List;
  * @author fs
  * @date 2022-11-18
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/storeActivity")
 public class FsStoreActivityScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreAfterSalesItemScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreAfterSalesItemScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeAfterSalesItem")
 public class FsStoreAfterSalesItemScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreAfterSalesScrmBridgeController.java

@@ -33,7 +33,6 @@ import com.fs.system.mapper.SysConfigMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -48,7 +47,6 @@ import java.util.stream.Collectors;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeAfterSales")
 public class FsStoreAfterSalesScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreAfterSalesStatusScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreAfterSalesStatusScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeAfterSalesStatus")
 public class FsStoreAfterSalesStatusScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreCartScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreCartScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-21
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeCart")
 public class FsStoreCartScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreCouponIssueScrmBridgeController.java

@@ -12,7 +12,6 @@ import com.fs.hisStore.vo.FsStoreCouponIssueVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -23,7 +22,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeCouponIssue")
 public class FsStoreCouponIssueScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreCouponIssueUserScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreCouponIssueUserScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeCouponIssueUser")
 public class FsStoreCouponIssueUserScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreCouponScrmBridgeController.java

@@ -15,7 +15,6 @@ import com.fs.hisStore.service.IFsStoreCouponScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.Date;
 import java.util.List;
@@ -27,7 +26,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/storeCoupon")
 public class FsStoreCouponScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreCouponUserScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreCouponUserScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeCouponUser")
 public class FsStoreCouponUserScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderAuditScrmBridgeController.java

@@ -15,7 +15,6 @@ import com.fs.hisStore.vo.FsStoreOrderAuditVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -27,7 +26,6 @@ import java.util.List;
  * @author fs
  * @date 2023-06-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeOrderAudit")
 public class FsStoreOrderAuditScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderItemScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreOrderItemScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-21
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeOrderItem")
 public class FsStoreOrderItemScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderNoticeScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreOrderNoticeScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeOrderNotice")
 public class FsStoreOrderNoticeScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderOfflineScrmBridgeController.java

@@ -21,7 +21,6 @@ import com.fs.hisStore.vo.FsStoreOrderOfflineListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.Date;
 import java.util.List;
@@ -33,7 +32,6 @@ import java.util.List;
  * @author fs
  * @date 2024-10-29
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeOrderOffline")
 public class FsStoreOrderOfflineScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderPromotionScrmBridgeController.java

@@ -21,7 +21,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -33,7 +32,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/PromotionOrder")
 public class FsStoreOrderPromotionScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderScrmBridgeController.java

@@ -67,7 +67,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.context.annotation.Profile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -82,7 +81,6 @@ import java.util.stream.Collectors;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeOrder")
 public class FsStoreOrderScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderStatusScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreOrderStatusScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeOrderStatus")
 public class FsStoreOrderStatusScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductAttrScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreProductAttrScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductAttr")
 public class FsStoreProductAttrScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductAttrValueScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreProductAttrValueScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductAttrValue")
 public class FsStoreProductAttrValueScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductCategoryScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreProductCategoryScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-16
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductCategory")
 public class FsStoreProductCategoryScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductDetailsScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreProductDetailsScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductDetails")
 public class FsStoreProductDetailsScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductGroupScrmBridgeController.java

@@ -18,7 +18,6 @@ import com.fs.hisStore.service.IFsStoreProductScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -29,7 +28,6 @@ import java.util.List;
  * @author fs
  * @date 2022-11-23
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductGroup")
 public class FsStoreProductGroupScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductRelationScrmBridgeController.java

@@ -15,7 +15,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -26,7 +25,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductRelation")
 public class FsStoreProductRelationScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductReplyScrmBridgeController.java

@@ -13,7 +13,6 @@ import com.fs.hisStore.vo.FsStoreProductReplyVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -24,7 +23,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductReply")
 public class FsStoreProductReplyScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductRuleScrmBridgeController.java

@@ -14,7 +14,6 @@ import com.fs.hisStore.service.IFsStoreProductRuleScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -25,7 +24,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductRule")
 public class FsStoreProductRuleScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductTemplateScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreProductTemplateScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeProductTemplate")
 public class FsStoreProductTemplateScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreRecommendScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreRecommendScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2023-06-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/recommend")
 public class FsStoreRecommendScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreShopStaffScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreShopStaffScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeShopStaff")
 public class FsStoreShopStaffScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreVisitScrmBridgeController.java

@@ -11,7 +11,6 @@ import com.fs.hisStore.service.IFsStoreVisitScrmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2022-03-15
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/storeVisit")
 public class FsStoreVisitScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsUserPromoterApplyScrmBridgeController.java

@@ -13,7 +13,6 @@ import com.fs.hisStore.vo.FsUserPromoterApplyVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -24,7 +23,6 @@ import java.util.List;
  * @author fs
  * @date 2023-02-28
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/store/userPromoterApply")
 public class FsUserPromoterApplyScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/admin/controller/store/SysOperlogScrmBridgeController.java

@@ -13,7 +13,6 @@ import com.fs.hisStore.service.ISysOperLogScrmService;
 import com.fs.hisStore.vo.StoreOperMainVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -23,7 +22,6 @@ import java.util.List;
  *
  * @author fs
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/store/operlogScrm")
 public class SysOperlogScrmBridgeController extends BaseController

fs-admin-saas/src/main/java/com/fs/aiSoundReplication/VoiceCloneController.java

@@ -17,15 +17,12 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.context.annotation.Profile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.util.List;
 import java.util.UUID;
-
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/api/voice-clone")
 @Api(tags = "声音复刻API")

fs-admin-saas/src/main/java/com/fs/api/controller/IndexStatisticsController.java

@@ -20,7 +20,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -34,7 +33,6 @@ import static com.fs.statis.StatisticsRedisConstant.*;
 /**
  * 首页-统计
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/index/statistics")
 public class IndexStatisticsController {

fs-admin-saas/src/main/java/com/fs/api/controller/StatisticManageController.java

@@ -7,7 +7,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import javax.annotation.Resource;
 
@@ -16,7 +15,6 @@ import javax.annotation.Resource;
  * @author: Guos
  * @time: 2025/10/30 上午9:16
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/statistic/manage")
 public class StatisticManageController {

fs-admin-saas/src/main/java/com/fs/bean/AliPayBean.java

@@ -1,107 +0,0 @@
-package com.fs.bean;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-@Component
-@PropertySource("classpath:/pay/alipay.properties")
-@ConfigurationProperties(prefix = "alipay")
-public class AliPayBean {
-    private String appId;
-    private String privateKey;
-    private String publicKey;
-    private String appCertPath;
-    private String aliPayCertPath;
-    private String aliPayRootCertPath;
-    private String serverUrl;
-    private String domain;
-    private String returnDomain;
-
-    public String getReturnDomain() {
-        return returnDomain;
-    }
-
-    public void setReturnDomain(String returnDomain) {
-        this.returnDomain = returnDomain;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getPrivateKey() {
-        return privateKey;
-    }
-
-    public void setPrivateKey(String privateKey) {
-        this.privateKey = privateKey;
-    }
-
-    public String getPublicKey() {
-        return publicKey;
-    }
-
-    public void setPublicKey(String publicKey) {
-        this.publicKey = publicKey;
-    }
-
-    public String getAppCertPath() {
-        return appCertPath;
-    }
-
-    public void setAppCertPath(String appCertPath) {
-        this.appCertPath = appCertPath;
-    }
-
-    public String getAliPayCertPath() {
-        return aliPayCertPath;
-    }
-
-    public void setAliPayCertPath(String aliPayCertPath) {
-        this.aliPayCertPath = aliPayCertPath;
-    }
-
-    public String getAliPayRootCertPath() {
-        return aliPayRootCertPath;
-    }
-
-    public void setAliPayRootCertPath(String aliPayRootCertPath) {
-        this.aliPayRootCertPath = aliPayRootCertPath;
-    }
-
-    public String getServerUrl() {
-        return serverUrl;
-    }
-
-    public void setServerUrl(String serverUrl) {
-        this.serverUrl = serverUrl;
-    }
-
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-    @Override
-    public String toString() {
-        return "AliPayBean{" +
-                "appId='" + appId + '\'' +
-                ", privateKey='" + privateKey + '\'' +
-                ", publicKey='" + publicKey + '\'' +
-                ", appCertPath='" + appCertPath + '\'' +
-                ", aliPayCertPath='" + aliPayCertPath + '\'' +
-                ", aliPayRootCertPath='" + aliPayRootCertPath + '\'' +
-                ", serverUrl='" + serverUrl + '\'' +
-                ", domain='" + domain + '\'' +
-                '}';
-    }
-}

fs-admin-saas/src/main/java/com/fs/billing/controller/BillingStatementController.java

@@ -6,11 +6,8 @@ import com.fs.common.core.domain.R;
 import com.fs.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import javax.annotation.Resource;
-
-@Profile({"admin", "company"})
 @RestController
 @RequestMapping("/api/fee")
 public class BillingStatementController {

fs-admin-saas/src/main/java/com/fs/billing/controller/FeePlanController.java

@@ -5,12 +5,9 @@ import com.fs.billing.service.BillingServices;
 import com.fs.common.core.domain.R;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
-@Profile({"admin", "company"})
 @RestController
 @Validated
 @RequestMapping("/api/fee/plan")

fs-admin-saas/src/main/java/com/fs/billing/controller/TenantBillingController.java

@@ -5,12 +5,9 @@ import com.fs.billing.service.BillingServices;
 import com.fs.common.core.domain.R;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
-@Profile({"admin", "company"})
 @RestController
 @Validated
 @RequestMapping("/api/fee/tenant")

fs-admin-saas/src/main/java/com/fs/billing/controller/UsageEventController.java

@@ -5,12 +5,9 @@ import com.fs.billing.service.BillingServices;
 import com.fs.common.core.domain.R;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
-@Profile({"admin", "company"})
 @RestController
 @Validated
 @RequestMapping("/api/fee/usage")

fs-admin-saas/src/main/java/com/fs/billing/controller/WalletController.java

@@ -7,12 +7,9 @@ import com.fs.common.utils.SecurityUtils;
 import com.fs.framework.security.LoginUser;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
-@Profile({"admin", "company"})
 @RestController
 @Validated
 @RequestMapping("/api/fee/wallet")

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatDatasetController.java

@@ -15,7 +15,6 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,7 +26,6 @@ import java.util.List;
  * @author fs
  * @date 2024-04-21
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/chatDataset")
 public class ChatDatasetController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatDatasetFileController.java

@@ -17,7 +17,6 @@ import com.fs.common.exception.file.OssException;
 import com.fs.common.utils.file.FileUploadUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,7 +31,6 @@ import java.util.List;
  * @author fs
  * @date 2024-04-21
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/chatDatasetFile")
 public class ChatDatasetFileController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatKeywordController.java

@@ -9,7 +9,6 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import java.util.List;
  * @author fs
  * @date 2024-04-19
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/chatKeyword")
 public class ChatKeywordController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatMsgController.java

@@ -16,7 +16,6 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,7 +27,6 @@ import java.util.List;
  * @author fs
  * @date 2024-04-19
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/chatMsg")
 public class ChatMsgController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatMsgLogsController.java

@@ -16,7 +16,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,7 +27,6 @@ import java.util.List;
  * @author fs
  * @date 2024-05-10
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/chatMsgLogs")
 public class ChatMsgLogsController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatRoleController.java

@@ -28,7 +28,6 @@ import com.fs.wx.kf.vo.WeixinKfAddEditAccountVO;
 import com.fs.wx.kf.vo.WeixinKfDelAccountVO;
 import com.fs.wx.kf.vo.WeixinKfGetAccountUrlVO;
 import org.springframework.beans.BeanUtils;
-import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -41,7 +40,6 @@ import java.util.List;
  * @author fs
  * @date 2024-04-19
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/chatRole")
 public class ChatRoleController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatSessionController.java

@@ -16,7 +16,6 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,7 +27,6 @@ import java.util.List;
  * @author fs
  * @date 2024-05-11
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/chatSession")
 public class ChatSessionController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatUploadController.java

@@ -18,12 +18,8 @@ import com.fs.wx.kf.dto.WeixinKfUploadDTO;
 import com.fs.wx.kf.service.IWeixinKfService;
 import com.fs.wx.kf.vo.WeixinKfUploadVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
-
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/upload")
 public class ChatUploadController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatUserController.java

@@ -9,7 +9,6 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import java.util.List;
  * @author fs
  * @date 2024-05-11
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/chat/chatUser")
 public class ChatUserController extends BaseController

fs-admin-saas/src/main/java/com/fs/chat/controller/FastGptRoleController.java

@@ -12,7 +12,6 @@ import com.fs.fastGpt.service.IFastGptRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2024-09-30
  */
-@Profile("admin")
 @RestController
 @RequestMapping("/fastGpt/fastGptRole")
 public class FastGptRoleController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallBizGroupController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -21,7 +20,6 @@ import java.util.List;
  * @author fs
  * @date 2026-03-06
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiSipCall/bizGroup")
 public class AiSipCallBizGroupController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallGatewayController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.Date;
 import java.util.List;
@@ -22,7 +21,6 @@ import java.util.List;
  * @author fs
  * @date 2026-03-06
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiSipCall/gateway")
 public class AiSipCallGatewayController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallLlmAgentAccountController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -21,7 +20,6 @@ import java.util.List;
  * @author fs
  * @date 2026-03-06
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiSipCall/llmAgentAccount")
 public class AiSipCallLlmAgentAccountController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallOutboundCdrController.java

@@ -16,7 +16,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.Date;
 import java.util.List;
@@ -28,7 +27,6 @@ import java.util.List;
  * @date 2026-03-19
  */
 @Slf4j
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiSipCall/outboundCdr")
 public class AiSipCallOutboundCdrController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallPhoneController.java

@@ -16,7 +16,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -30,7 +29,6 @@ import java.util.Map;
  * @date 2026-03-06
  */
 @Slf4j
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiSipCall/phone")
 public class AiSipCallPhoneController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallTaskController.java

@@ -26,7 +26,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.context.annotation.Profile;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -40,7 +39,6 @@ import java.util.List;
  * @date 2026-03-06
  */
 @Slf4j
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiSipCall/task")
 public class AiSipCallTaskController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallUserController.java

@@ -14,7 +14,6 @@ import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.Date;
 import java.util.List;
@@ -26,7 +25,6 @@ import java.util.Map;
  * @author fs
  * @date 2026-03-13
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiSipCall/aiSipCallUser")
 public class AiSipCallUserController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallVoiceTtsAliyunController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -21,7 +20,6 @@ import java.util.List;
  * @author fs
  * @date 2026-03-06
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiSipCall/voiceTtsAliyun")
 public class AiSipCallVoiceTtsAliyunController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatDatasetController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,7 +35,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author fs
  * @date 2024-04-21
  */
-@Profile("company")
 @RestController
 @RequestMapping("/chat/chatDataset")
 public class ChatDatasetController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatDatasetFileController.java

@@ -22,7 +22,6 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFRun;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.fs.common.annotation.Log;
@@ -41,7 +40,6 @@ import org.springframework.web.multipart.MultipartFile;
  * @author fs
  * @date 2024-04-21
  */
-@Profile("company")
 @RestController
 @RequestMapping("/chat/chatDatasetFile")
 public class ChatDatasetFileController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatKeywordController.java

@@ -6,7 +6,6 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,7 +30,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author fs
  * @date 2024-04-19
  */
-@Profile("company")
 @RestController
 @RequestMapping("/chat/chatKeyword")
 public class ChatKeywordController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatMsgController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,7 +35,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author fs
  * @date 2024-04-19
  */
-@Profile("company")
 @RestController
 @RequestMapping("/chat/chatMsg")
 public class ChatMsgController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatMsgLogsController.java

@@ -13,7 +13,6 @@ import com.fs.his.vo.FsDoctorArticleListUVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,7 +37,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author fs
  * @date 2024-05-10
  */
-@Profile("company")
 @RestController
 @RequestMapping("/chat/chatMsgLogs")
 public class ChatMsgLogsController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatRoleController.java

@@ -20,7 +20,6 @@ import com.fs.wx.kf.vo.WeixinKfAddEditAccountVO;
 import com.fs.wx.kf.vo.WeixinKfDelAccountVO;
 import com.fs.wx.kf.vo.WeixinKfGetAccountUrlVO;
 import org.springframework.beans.BeanUtils;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,7 +45,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author fs
  * @date 2024-04-19
  */
-@Profile("company")
 @RestController
 @RequestMapping("/chat/chatRole")
 public class ChatRoleController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatSessionController.java

@@ -13,7 +13,6 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,7 +37,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author fs
  * @date 2024-05-11
  */
-@Profile("company")
 @RestController
 @RequestMapping("/chat/chatSession")
 public class ChatSessionController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatUploadController.java

@@ -21,12 +21,8 @@ import com.fs.wx.kf.service.IWeixinKfService;
 import com.fs.wx.kf.vo.WeixinKfUploadVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
-
-@Profile("company")
 @RestController
 @RequestMapping("/chat/upload")
 public class ChatUploadController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/chat/ChatUserController.java

@@ -2,7 +2,6 @@ package com.fs.company.controller.chat;
 
 import java.util.List;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,7 +26,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author fs
  * @date 2024-05-11
  */
-@Profile("company")
 @RestController
 @RequestMapping("/chat/chatUser")
 public class ChatUserController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/common/CaptchaController.java

@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.context.annotation.Profile;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
@@ -26,7 +25,6 @@ import java.util.concurrent.TimeUnit;
  * 
 
  */
-@Profile("company")
 @RestController
 public class CaptchaController
 {

fs-admin-saas/src/main/java/com/fs/company/controller/common/CommonController.java

@@ -33,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.context.annotation.Profile;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
@@ -51,7 +50,6 @@ import java.util.Map;
  *
 
  */
-@Profile("company")
 @RestController
 public class CommonController
 {

fs-admin-saas/src/main/java/com/fs/company/controller/common/IndexController.java

@@ -19,15 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.context.annotation.Profile;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
-
-@Profile("company")
 @RestController
 @RequestMapping("/common/index")
 public class IndexController

fs-admin-saas/src/main/java/com/fs/company/controller/company/CompanyAiWorkflowController.java

@@ -12,7 +12,6 @@ import com.fs.his.domain.FsAiWorkflowNode;
 import com.fs.his.service.IFsAiWorkflowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.Arrays;
 import java.util.List;
@@ -23,7 +22,6 @@ import java.util.List;
  * @author fs
  * @date 2026-01-09
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/aiWorkflow")
 public class CompanyAiWorkflowController extends BaseController {

fs-admin-saas/src/main/java/com/fs/company/controller/company/CompanyBalanceController.java

@@ -10,13 +10,10 @@ import com.fs.proxy.service.BalanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-@Profile("company")
 @RestController
 @RequestMapping("/company/balance")
 public class CompanyBalanceController extends BaseController {

fs-admin-saas/src/main/java/com/fs/company/controller/company/CompanyConfigController.java

@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -26,7 +25,6 @@ import java.util.List;
  *
 
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/companyConfig")
 public class CompanyConfigController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/company/CompanyConsumeRecordController.java

@@ -9,11 +9,8 @@ import com.fs.proxy.service.BalanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
-
-@Profile("company")
 @RestController
 @RequestMapping("/company/consumeRecord")
 public class CompanyConsumeRecordController extends BaseController {

fs-admin-saas/src/main/java/com/fs/company/controller/company/CompanyController.java

@@ -18,7 +18,6 @@ import com.fs.his.vo.OptionsVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.List;
 
@@ -28,7 +27,6 @@ import java.util.List;
  * @author fs
  * @date 2021-10-04
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/company")
 public class CompanyController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/company/CompanyDeptController.java

@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.context.annotation.Profile;
 
 import java.util.Iterator;
 import java.util.List;
@@ -27,7 +26,6 @@ import java.util.List;
  *
 
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/companyDept")
 public class CompanyDeptController extends BaseController

fs-admin-saas/src/main/java/com/fs/company/controller/company/CompanyDomainBindController.java

@@ -1,7 +1,6 @@
 package com.fs.company.controller.company;
 
 import java.util.List;
-import org.springframework.context.annotation.Profile;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.fs.common.core.domain.R;
@@ -35,7 +34,6 @@ import com.fs.common.core.page.TableDataInfo;
  * @author fs
  * @date 2025-06-17
  */
-@Profile("company")
 @RestController
 @RequestMapping("/company/companyDomainBind")
 public class CompanyDomainBindController extends BaseController