diff --git a/dl_admin/ruoyi-admin/pom.xml b/dl_admin/ruoyi-admin/pom.xml
index 6f72e83..6595d34 100644
--- a/dl_admin/ruoyi-admin/pom.xml
+++ b/dl_admin/ruoyi-admin/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>nuxt-site</artifactId>
 
     <description>
         web服务入口
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
index 261e5fb..08f6ead 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
@@ -265,4 +265,25 @@ public class WebController extends BaseController {
         WebDetailVO webDetailVO = new WebDetailVO();
         return R.ok(prodNewService.getProdNewInfo(id));
     }
+
+    /**
+     * 全站搜索
+     * @author vinjor-M
+     * @date 10:04 2025/7/8
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     **/
+    @ApiOperation("全站搜索")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "pageNum", value = "页码（1开始）", required = true, dataType = "int", paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "pageSize", value = "每页显示数量", required = true, dataType = "int", paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "text", value = "搜索内容", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
+    })
+    @GetMapping("/searchText")
+    public R<IPage<BusiProdNew>> searchText(String tenantId,String text,
+                                     @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize){
+        Page<BusiProdNew> page = new Page<>(pageNum,pageSize);
+        return R.ok(prodNewService.searchTextAll(tenantId,text,page));
+    }
 }
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdNewService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdNewService.java
index 152fb63..932e0b2 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdNewService.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdNewService.java
@@ -63,4 +63,15 @@ public interface IBusiProdNewService extends IService<BusiProdNew>
      * @return com.ruoyi.busi.vo.WebDetailVO
     **/
     WebDetailVO getProdNewInfo(String id);
+
+    /**
+     * 全站搜索产品和文章
+     * @author vinjor-M
+     * @date 13:55 2025/7/9
+     * @param tenantId 站点ID
+ * @param text 搜索内容
+ * @param page 分页对象
+     * @return com.baomidou.mybatisplus.core.metadata.IPage<com.ruoyi.busi.vo.ProdNewVO>
+    **/
+    IPage<BusiProdNew> searchTextAll(String tenantId, String text,Page<BusiProdNew> page);
 }
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java
index b90c0c1..5ddc208 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java
@@ -13,10 +13,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 网站栏目Service业务层处理
@@ -52,7 +50,10 @@ public class BusiCategoryServiceImpl extends ServiceImpl<BusiCategoryMapper, Bus
         }
         lambdaQueryWrapper.orderByDesc(BusiCategory::getSort);
         List<BusiCategory> list = list(lambdaQueryWrapper);
-        return buildCategoryTree(list);
+        List<BusiCategoryVO> rtnList = buildCategoryTree(list);
+        return rtnList.stream().sorted(Comparator.comparing(BusiCategoryVO::getSort,
+                Comparator.nullsLast(Comparator.reverseOrder())))
+                .collect(Collectors.toList());
     }
 
     /**
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdNewServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdNewServiceImpl.java
index 3b22f17..cefca73 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdNewServiceImpl.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdNewServiceImpl.java
@@ -180,4 +180,27 @@ public class BusiProdNewServiceImpl extends ServiceImpl<BusiProdNewMapper,BusiPr
         webDetailVO.setNext(busiProdNewMapper.selectPreOrNext(prodNew.getDataType(),prodNew.getSort(),"next",prodNew.getTenantId(),prodNew.getCatgId()));
         return webDetailVO;
     }
+
+    /**
+     * 全站搜索产品和文章
+     *
+     * @param tenantId 站点ID
+     * @param text     搜索内容
+     * @param page     分页对象
+     * @return com.baomidou.mybatisplus.core.metadata.IPage<com.ruoyi.busi.vo.ProdNewVO>
+     * @author vinjor-M
+     * @date 13:55 2025/7/9
+     **/
+    @Override
+    public IPage<BusiProdNew> searchTextAll(String tenantId, String text, Page<BusiProdNew> page) {
+        LambdaQueryWrapper<BusiProdNew> queryWrapper = new LambdaQueryWrapper<BusiProdNew>()
+                .eq(BusiProdNew::getTenantId,tenantId)
+                .eq(BusiProdNew::getIfPublic,true)
+                .and(wq->wq
+                        .like(BusiProdNew::getTitle,text)
+                        .or().like(BusiProdNew::getDescription,text)
+                        .or().like(BusiProdNew::getContent,text))
+                .orderByDesc(BusiProdNew::getSort);
+        return this.page(page,queryWrapper);
+    }
 }
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
index b4f6bac..ca4d77b 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
@@ -27,7 +27,6 @@ import io.swagger.annotations.ApiOperation;
  * 
  * @author ruoyi
  */
-@Api("用户信息管理")
 @RestController
 @RequestMapping("/test/user")
 public class TestController extends BaseController
@@ -38,7 +37,6 @@ public class TestController extends BaseController
         users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
     }
 
-    @ApiOperation("获取用户列表")
     @GetMapping("/list")
     public R<List<UserEntity>> userList()
     {
@@ -46,8 +44,6 @@ public class TestController extends BaseController
         return R.ok(userList);
     }
 
-    @ApiOperation("获取用户详细")
-    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
     @GetMapping("/{userId}")
     public R<UserEntity> getUser(@PathVariable Integer userId)
     {
@@ -61,13 +57,6 @@ public class TestController extends BaseController
         }
     }
 
-    @ApiOperation("新增用户")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class),
-        @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
-    })
     @PostMapping("/save")
     public R<String> save(UserEntity user)
     {
@@ -79,7 +68,6 @@ public class TestController extends BaseController
         return R.ok();
     }
 
-    @ApiOperation("更新用户")
     @PutMapping("/update")
     public R<String> update(@RequestBody UserEntity user)
     {
@@ -96,8 +84,6 @@ public class TestController extends BaseController
         return R.ok();
     }
 
-    @ApiOperation("删除用户信息")
-    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
     @DeleteMapping("/{userId}")
     public R<String> delete(@PathVariable Integer userId)
     {
diff --git a/dl_admin/ruoyi-admin/src/main/resources/application.yml b/dl_admin/ruoyi-admin/src/main/resources/application.yml
index 8af7ed4..5d98a27 100644
--- a/dl_admin/ruoyi-admin/src/main/resources/application.yml
+++ b/dl_admin/ruoyi-admin/src/main/resources/application.yml
@@ -133,7 +133,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping:
 
 # 防止XSS攻击
 xss:
diff --git a/dl_admin/ruoyi-admin/src/main/resources/logback.xml b/dl_admin/ruoyi-admin/src/main/resources/logback.xml
index a360583..69587d8 100644
--- a/dl_admin/ruoyi-admin/src/main/resources/logback.xml
+++ b/dl_admin/ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/www/wwwlogs/java/springboot/nuxt-site-logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
diff --git a/dl_vue/.env.production b/dl_vue/.env.production
index c760d7b..1abe0a7 100644
--- a/dl_vue/.env.production
+++ b/dl_vue/.env.production
@@ -1,11 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 通告快接管理后台
+VUE_APP_TITLE = 成事达管理平台
 
 # 生产环境配置
 ENV = 'production'
 
-# 通告快接管理后台/生产环境
-VUE_APP_BASE_API = 'https://www.ddtg.site/noticeApi'
+# 成事达管理平台/生产环境
+VUE_APP_BASE_API = 'http://122.51.230.86:8099'
 
 # websocket
-VUE_APP_WEBSOCKET = 'ws://localhost:8099/ws/asset/'
+VUE_APP_WEBSOCKET = 'ws://122.51.230.86:8099/ws/asset/'
diff --git a/dl_vue/src/views/busi/category/form/categoryForm.vue b/dl_vue/src/views/busi/category/form/categoryForm.vue
index 47c74e9..6b26dbc 100644
--- a/dl_vue/src/views/busi/category/form/categoryForm.vue
+++ b/dl_vue/src/views/busi/category/form/categoryForm.vue
@@ -30,7 +30,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="排序" prop="sort">
-            <el-input v-model="form.sort" placeholder="请输入排序" />
+            <el-input v-model="form.sort" type="number" placeholder="请输入排序" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -56,12 +56,12 @@
 
       <el-row v-if="form.catgType == 'cp'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="产品上方内容html" prop="prodUp">
+          <el-form-item label="产品上方内容" prop="prodUp">
             <editor v-model="form.prodUp" :min-height="160"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="产品下方内容html" prop="prodDown">
+          <el-form-item label="产品下方内容" prop="prodDown">
             <editor v-model="form.prodDown" :min-height="160"/>
           </el-form-item>
         </el-col>
@@ -70,7 +70,7 @@
 
       <el-row v-if="form.catgType == 'dym' || form.catgType == 'xp'">
         <el-col>
-          <el-form-item label="内容html" prop="content">
+          <el-form-item label="内容" prop="content">
           <editor v-model="form.content" :min-height="192"/>
           </el-form-item>
         </el-col>