周洋

fs-admin-saas/Dockerfile

@@ -1,6 +1,7 @@
 FROM openjdk:8-jre
 # java版本，最好使用openjdk，而不是类似于Java:1.8
-COPY ./target/fs-admin.jar fs-admin.jar
+COPY ./target/fs-saasadmin.jar fs-saasadmin.jar
 # 向外暴露的接口，最好与项目yml文件中的端口一致
-ENTRYPOINT ["java","-jar","fs-admin.jar"]
+EXPOSE 8002
+ENTRYPOINT ["java","-jar","fs-saasadmin.jar"]
 # 执行启动命令java -jar

fs-admin-saas/pom.xml

@@ -9,10 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>fs-admin-saas</artifactId>
+    <artifactId>fs-saasadmin</artifactId>
 
     <description>
-        web服务入口
+        SaaS管理端(saasadminui后端)
     </description>
 
     <dependencies>

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

@@ -31,10 +31,10 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 @EnableAsync
 @EnableScheduling
-public class FSAdminSaasApplication {
+public class FsSaasAdminApplication {
     public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(FSAdminSaasApplication.class, args);
-        System.out.println("admin启动成功");
+        SpringApplication.run(FsSaasAdminApplication.class, args);
+        System.out.println("SaaSAdmin API启动成功");
     }
 }

fs-admin/pom.xml

@@ -124,6 +124,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- fs-saasadmin(原fs-admin-saas) 提供管理端业务Controller（@Profile("admin")控制加载） -->
+        <dependency>
+            <groupId>com.fs</groupId>
+            <artifactId>fs-saasadmin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- swagger2-->
         <dependency>
             <groupId>io.springfox</groupId>

fs-company/Dockerfile

@@ -1,6 +1,6 @@
 FROM openjdk:8-jre
 # java版本，最好使用openjdk，而不是类似于Java:1.8
-COPY ./target/fs-company.jar fs-company.jar
+COPY ./target/fs-saas.jar fs-saas.jar
 # 向外暴露的接口，最好与项目yml文件中的端口一致
-ENTRYPOINT ["java","-jar","fs-company.jar"]
+ENTRYPOINT ["java","-jar","fs-saas.jar"]
 # 执行启动命令java -jar

fs-company/pom.xml

@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.fs</groupId>
-    <artifactId>fs-company</artifactId>
+    <artifactId>fs-saas</artifactId>
     <description>
-        公司接口
+        SaaS租户服务端(saasui/saasadminui后端)
     </description>
 
     <dependencies>
@@ -106,10 +106,10 @@
             <groupId>com.fs</groupId>
             <artifactId>fs-service</artifactId>
         </dependency>
-        <!-- fs-admin-saas 提供 his/course/billing 等控制器，saasadminui 需要这些接口 -->
+        <!-- fs-saasadmin(原fs-admin-saas) 提供 his/course/billing 等控制器，saasadminui 需要这些接口 -->
         <dependency>
             <groupId>com.fs</groupId>
-            <artifactId>fs-admin-saas</artifactId>
+            <artifactId>fs-saasadmin</artifactId>
             <version>${project.version}</version>
         </dependency>
 

fs-company/src/main/java/com/fs/FsCompanyApplication.java → fs-company/src/main/java/com/fs/FsSaasApplication.java

@@ -58,11 +58,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 )
 @EnableTransactionManagement
 @EnableAsync
-public class FsCompanyApplication
+public class FsSaasApplication
 {
     public static void main(String[] args)
     {
-        SpringApplication.run(FsCompanyApplication.class, args);
-        System.out.println("CompanyAPI启动成功");
+        SpringApplication.run(FsSaasApplication.class, args);
+        System.out.println("SaaS API启动成功");
     }
 }

fs-proxy/pom.xml

@@ -9,10 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>fs-proxy</artifactId>
+    <artifactId>fs-agent</artifactId>
 
     <description>
-        代理端服务模块
+        代理端服务模块(agentui后端)
     </description>
 
     <dependencies>

pom.xml

@@ -266,7 +266,7 @@
 
     <modules>
         <module>fs-admin</module>
-        <module>fs-admin-saas</module>
+        <module>fs-admin-saas</module>  <!-- 目录名保持fs-admin-saas, artifactId已改为fs-saasadmin -->
         <module>fs-framework</module>
         <module>fs-service</module>
         <module>fs-quartz</module>
@@ -275,7 +275,7 @@
         <module>fs-user-app</module>
         <module>fs-qw-api-msg</module>
         <module>fs-store</module>
-        <module>fs-company</module>
+        <module>fs-company</module>  <!-- 目录名保持fs-company, artifactId已改为fs-saas -->
         <module>fs-doctor-app</module>
         <module>fs-ai-chat</module>
         <module>fs-ai-api</module>

start-company.bat

@@ -1,10 +1,10 @@
 @echo off
 chcp 65001 >nul
 echo ============================================
-echo   启动 FS-COMPANY (CompanyUI)
+echo   启动 FS-SAAS (SaaSUI/SaaSAdminUI)
 echo   端口: 8006
-echo   前端: companyUI
+echo   前端: saasui / saasadminui
 echo ============================================
 cd /d "%~dp0fs-company"
-java -jar target\fs-company.jar --spring.profiles.active=dev
+java -jar target\fs-saas.jar --spring.profiles.active=dev
 pause