diff --git a/.gitignore b/.gitignore
index 5ad5761e1f9129fc8dc958c115a2d26d6f8c2d32..0aea98510b971066d46c963bd022317c1acd1b0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,10 @@ logs/
 
 .qoder/
 
-.kiro/
\ No newline at end of file
+.kiro/
+fs-admin/src/main/resources/application-xydev.yml
+fs-admin/src/main/resources/application-xyprod.yml
+/fs-admin/src/main/resources/static/pc
+/fs-admin/src/main/resources/templates/index.html
+fs-admin/src/main/resources/logback-spring.xml
+fs-admin/src/main/resources/logback-spring.xml
diff --git a/fs-admin/pom.xml b/fs-admin/pom.xml
index b94ff18c657cf183bf2a813ccd4f95b3fcc4cc5b..41022ff96647dd3274f286d27d730cd7a1f7b6dd 100644
--- a/fs-admin/pom.xml
+++ b/fs-admin/pom.xml
@@ -69,6 +69,64 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <id>install-frontend-dependencies</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>pnpm</executable>
+                            <workingDirectory>D:\workspace\OpenSoucre\UGit\freefs-myfork\free-fs-frontend</workingDirectory>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>build-frontend</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>pnpm</executable>
+                            <workingDirectory>D:\workspace\OpenSoucre\UGit\freefs-myfork\free-fs-frontend</workingDirectory>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>clean-frontend-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <!-- 删除templates目录中的index.html文件 -->
+                                <delete file="${project.build.outputDirectory}/templates/index.html" failonerror="false"/>
+                                <!-- 删除static/pc目录 -->
+                                <delete dir="${project.build.outputDirectory}/static/pc" failonerror="false"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -91,6 +149,42 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-frontend-index</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/templates</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>D:\workspace\OpenSoucre\UGit\freefs-myfork\free-fs-frontend\dist</directory>
+                                    <includes>
+                                        <include>index.html</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-frontend-static</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/static</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>D:\workspace\OpenSoucre\UGit\freefs-myfork\free-fs-frontend\dist</directory>
+                                    <excludes>
+                                        <exclude>index.html</exclude>
+                                    </excludes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/fs-admin/src/main/java/com/xddcodec/fs/controller/IndexController.java b/fs-admin/src/main/java/com/xddcodec/fs/controller/IndexController.java
new file mode 100644
index 0000000000000000000000000000000000000000..3131e51acbf8baeac9a57942192b3fb81db172c5
--- /dev/null
+++ b/fs-admin/src/main/java/com/xddcodec/fs/controller/IndexController.java
@@ -0,0 +1,62 @@
+package com.xddcodec.fs.controller;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author xiao
+ */
+@Controller
+public class IndexController {
+
+    /**
+     * 默认进入系统页面，系统首页
+     */
+    @RequestMapping(value= {"/", "/view/**"})
+    public String index(HttpServletRequest request, HttpServletResponse response) {
+        String requestURI = request.getRequestURI();
+//        todo 后续如果加入移动端代码放开此部分代码
+//        if ("/".equals(requestURI)) {
+//            if (isMobile(request)) {
+//                return "redirect:/mv/";
+//            }
+//            return "redirect:/pv/";
+//        } else {
+//            if (isMobile(request)) {
+//                return "redirect:" + requestURI.replaceFirst("/view", "/mv");
+//            }
+//            return "redirect:" + requestURI.replaceFirst("/view", "/pv");
+//        }
+        return "redirect:/pv/";
+    }
+
+    /**
+     * pc端 系统首页
+     */
+    @RequestMapping("/pv/**")
+    public String pvindex(HttpServletRequest request, HttpServletResponse response) {
+        return "index";
+    }
+
+    /**
+     * 移动端 系统首页
+     */
+    @RequestMapping("/mv/**")
+    public String mvindex(HttpServletRequest request, HttpServletResponse response) {
+        return "mobile";
+    }
+
+    /**
+     * 去登陆页
+     */
+    @RequestMapping("/login")
+    public String login(HttpServletRequest request, HttpServletResponse response) {
+//        todo 后续如果加入移动端代码放开此部分代码
+//        if (isMobile(request)) {
+//            return "redirect:/mv/login";
+//        }
+        return "redirect:/pv/login";
+    }
+}
diff --git a/fs-admin/src/main/resources/application.yml b/fs-admin/src/main/resources/application.yml
index fae869cff1ce0726376341cb9de16509c4cc5f37..30e7ac970c8b4a6d67eb66e3921cb7a91ce572d4 100644
--- a/fs-admin/src/main/resources/application.yml
+++ b/fs-admin/src/main/resources/application.yml
@@ -39,11 +39,11 @@ spring:
   messages:
     basename: i18n/messages
     encoding: UTF-8
-  # 模版引擎配置
-  #  thymeleaf:
-  #    mode: LEGACYHTML5
-  #    prefix: classpath:/templates/
-  #    encoding: UTF-8
+  # 模版引擎配置 用于后端 统一打包前端 前端打包后的index.html直接放置到 /templates/index.html 同理移动端配置打包后的入口文件为mobile.html放置在/templates/mobile.html，其他静态资源放置在static即可
+  thymeleaf:
+    mode: LEGACYHTML5
+    prefix: classpath:/templates/
+    encoding: UTF-8
 
   # 邮件配置
   mail:
diff --git a/fs-admin/src/main/resources/logback-spring.xml b/fs-admin/src/main/resources/logback-spring.xml
deleted file mode 100644
index e2e39d9c434441b500813beb2f66b3120d64fcff..0000000000000000000000000000000000000000
--- a/fs-admin/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="./logs"/>
-    <contextName>logback</contextName>
-    <springProperty name="application_name" scope="context" source="spring.application.name"/>
-
-    <!-- 控制台输出 -->
-    <!-- 彩色日志 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-
-    <!-- 输出到控制台 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%-20.20t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <!--输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--过滤trace日志到控制台-->
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!-- 输出到文件格式 -->
-    <property name="FILE_LOG_PATTERN"
-              value="%d{yyyy-MM-dd HH:mm:ss.SSS} ${PID} [%thread] %-5level %logger{50} - %msg%n"/>
-
-    <!-- 输出到文件 -->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/${application_name}.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!--日志文件保留天数-->
-            <MaxHistory>30</MaxHistory>
-        </rollingPolicy>
-        <encoder>
-            <Pattern>${FILE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!-- development env -->
-    <springProfile name="dev">
-        <root level="INFO">
-            <!-- 输出到控制台 -->
-            <appender-ref ref="CONSOLE"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="docker">
-        <root level="INFO">
-            <!-- 输出到控制台 -->
-            <appender-ref ref="FILE"/>
-        </root>
-    </springProfile>
-
-    <!-- development env -->
-    <springProfile name="test">
-        <root level="INFO">
-            <!-- 输出到文件 -->
-            <appender-ref ref="FILE"/>
-        </root>
-    </springProfile>
-
-    <!-- production env -->
-    <springProfile name="prod">
-        <root level="info">
-            <!-- 输出到文件 -->
-            <appender-ref ref="FILE"/>
-        </root>
-    </springProfile>
-</configuration>
\ No newline at end of file