Merge remote-tracking branch 'origin/saas-api' into saas-api

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

@@ -20,7 +20,18 @@ import org.springframework.transaction.annotation.Transactional;
         @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
             "com\\.fs\\.framework\\.service\\.PermissionService",
             "com\\.fs\\.framework\\.service\\.UserDetailsServiceImpl",
-            "com\\.fs\\.company\\.controller\\..*",
+            // 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\\..*",
+            // hisStore: fs-admin-saas 已有带 @Profile 的副本，排除 fs-company 的无 @Profile 版本
             "com\\.fs\\.hisStore\\.controller\\..*",
             "com\\.fs\\.his\\.controller\\.FsAiWorkflowController"
         })

fs-company/src/main/java/com/fs/company/controller/companyWorkflow/CompanyWorkflowTagTemplateBindingController.java

@@ -17,6 +17,7 @@ import java.util.Map;
 /**
  * 标签模板绑定Controller
  */
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/tagBinding")
 public class CompanyWorkflowTagTemplateBindingController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/knowledge/AiKnowledgeBaseController.java

@@ -25,6 +25,7 @@ import java.util.List;
 * @author Administrator
 * @since 2026-04-28 10:17:59
 */
+@Profile("company")
 @RestController
 @RequestMapping("/ai/knowledge/base")
 public class AiKnowledgeBaseController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/knowledge/CompanyAiProviderController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
+@Profile("company")
 @RestController
 @RequestMapping("/knowledge/ai-provider")
 public class CompanyAiProviderController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/tag/CompanyTagTemplateBindingController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/tagTemplate")
 public class CompanyTagTemplateBindingController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/workflow/LobsterApiRegistryController.java

@@ -18,6 +18,7 @@ import java.util.*;
  * 管理 lobster_api_registry 表 CRUD
  * 页面: 接口注册中心 → 注册/启用/禁用/主备切换
  */
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/lobster/api-registry")
 public class LobsterApiRegistryController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/workflow/LobsterBillingController.java

@@ -19,6 +19,7 @@ import java.util.*;
  * 管理Token消耗系数 + 消费流水查询
  * 页面: 计费管理 → Token系数设置 + 消费明细
  */
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/lobster/billing")
 public class LobsterBillingController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/workflow/LobsterDeadLetterController.java

@@ -18,6 +18,7 @@ import java.util.*;
  * 表: lobster_message_delivery_log
  * 页面: 死信管理 → 查看/批量重发/统计
  */
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/lobster/dead-letter")
 public class LobsterDeadLetterController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/workflow/LobsterEventAuditController.java

@@ -22,6 +22,7 @@ import java.util.*;
  * 
  * 关联: EventDecisionEngine AI决策后写入 → 运营审核通过 → WorkflowPatcher注入节点
  */
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/lobster/event-audit")
 public class LobsterEventAuditController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/workflow/LobsterOptimizationController.java

@@ -25,6 +25,7 @@ import java.util.Map;
  * 5. 优化统计：查看优化效果统计
  * 6. 手动触发分析：手动触发用户级优化分析
  */
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/lobster/optimization")
 public class LobsterOptimizationController {

fs-company/src/main/java/com/fs/company/controller/workflow/LobsterPromptController.java

@@ -18,6 +18,7 @@ import java.util.*;
  * 表: lobster_system_prompt
  * 页面: Prompt管理 → 增删改查 + 租户/行业筛选 + 缓存刷新
  */
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/lobster/prompt")
 public class LobsterPromptController extends BaseController {

fs-company/src/main/java/com/fs/company/controller/workflow/LobsterSalesCorpusController.java

@@ -24,6 +24,7 @@ import java.util.*;
  * 
  * 核心价值: 租户上传销冠/金牌客服聊天话术 → AI分析提取沟通模式 → 进化引擎学习 → 全租户共享
  */
+@Profile("company")
 @RestController
 @RequestMapping("/workflow/lobster/sales-corpus")
 public class LobsterSalesCorpusController extends BaseController {