diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/resource/ResourceListApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/resource/ResourceListApi.java
index 8dac1d9cb1bdba6d0c78574ee79a51d1f8dd6a57..30f012fff583ec2deeca9033a46ae9ba5d5e9033 100644
--- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/resource/ResourceListApi.java
+++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/resource/ResourceListApi.java
@@ -19,9 +19,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.cmdb.auth.label.CMDB;
-import neatlogic.framework.cmdb.crossover.IResourceListApiCrossoverService;
+import neatlogic.framework.cmdb.dto.ci.AttrVo;
+import neatlogic.framework.cmdb.dto.ci.CiVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo;
+import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityConfigVo;
+import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityFieldMappingVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceInfo;
 import neatlogic.framework.cmdb.enums.group.GroupType;
@@ -31,6 +34,8 @@ import neatlogic.framework.restful.annotation.*;
 import neatlogic.framework.restful.constvalue.OperationTypeEnum;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
 import neatlogic.framework.util.TableResultUtil;
+import neatlogic.module.cmdb.dao.mapper.ci.AttrMapper;
+import neatlogic.module.cmdb.dao.mapper.ci.CiMapper;
 import neatlogic.module.cmdb.dao.mapper.resourcecenter.ResourceEntityMapper;
 import neatlogic.module.cmdb.dao.mapper.resourcecenter.ResourceMapper;
 import neatlogic.module.cmdb.service.ci.CiAuthChecker;
@@ -51,7 +56,7 @@ import java.util.*;
 @Service
 @AuthAction(action = CMDB.class)
 @OperationType(type = OperationTypeEnum.SEARCH)
-public class ResourceListApi extends PrivateApiComponentBase implements IResourceListApiCrossoverService {
+public class ResourceListApi extends PrivateApiComponentBase {
 
     @Resource
     private IResourceCenterResourceService resourceCenterResourceService;
@@ -62,6 +67,12 @@ public class ResourceListApi extends PrivateApiComponentBase implements IResourc
     @Resource
     private ResourceEntityMapper resourceEntityMapper;
 
+    @Resource
+    private AttrMapper attrMapper;
+
+    @Resource
+    private CiMapper ciMapper;
+
     @Override
     public String getToken() {
         return "resourcecenter/resource/list";
@@ -122,7 +133,41 @@ public class ResourceListApi extends PrivateApiComponentBase implements IResourc
             searchVo = resourceCenterResourceService.assembleResourceSearchVo(jsonObj);
         }
         resourceCenterResourceService.handleBatchSearchList(searchVo);
-
+        ResourceEntityVo resourceEntityVo = resourceEntityMapper.getResourceEntityByName("scence_ipobject_detail");
+        if (resourceEntityVo != null) {
+            ResourceEntityConfigVo config = resourceEntityVo.getConfig();
+            if (config != null) {
+                List<ResourceEntityFieldMappingVo> mappingList = config.getFieldMappingList();
+                if (CollectionUtils.isNotEmpty(mappingList)) {
+                    Long nameAttrId = null;
+                    Long ipAttrId = null;
+                    for (ResourceEntityFieldMappingVo mappingVo : mappingList) {
+                        if (Objects.equals(mappingVo.getField(), "name")) {
+                            CiVo ciVo = ciMapper.getCiByName(mappingVo.getFromCi());
+                            if (ciVo != null) {
+                                AttrVo attr = attrMapper.getAttrByCiIdAndName(ciVo.getId(), mappingVo.getFromAttr());
+                                if (attr != null) {
+                                    nameAttrId = attr.getId();
+                                }
+                            }
+                        } else if (Objects.equals(mappingVo.getField(), "ip")) {
+                            CiVo ciVo = ciMapper.getCiByName(mappingVo.getFromCi());
+                            if (ciVo != null) {
+                                AttrVo attr = attrMapper.getAttrByCiIdAndName(ciVo.getId(), mappingVo.getFromAttr());
+                                if (attr != null) {
+                                    ipAttrId = attr.getId();
+                                }
+                            }
+                        }
+                        if (nameAttrId != null && ipAttrId != null) {
+                            break;
+                        }
+                    }
+                    searchVo.setIpFieldAttrId(ipAttrId);
+                    searchVo.setNameFieldAttrId(nameAttrId);
+                }
+            }
+        }
         int rowNum = resourceMapper.getResourceCount(searchVo);
         if (rowNum == 0) {
             return TableResultUtil.getResult(resourceList, searchVo);
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
index 8e521270811380999d1136d3f4d0e59f0dd27f8c..bf234c26e41be34321b1c6427341290caf9fd0b8 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
@@ -140,7 +140,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                 #{tagId}
             </foreach>
         </if>
-        <if test="batchSearchList != null and batchSearchList.size() > 0 and searchField != null and searchField != ''">
+        <!--<if test="batchSearchList != null and batchSearchList.size() > 0 and searchField != null and searchField != ''">
             AND
             <if test="searchField == 'name'">
                 <foreach collection="batchSearchList" item="item" open="(" separator=" OR " close=")">
@@ -152,7 +152,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                     a.`ip` LIKE #{item}
                 </foreach>
             </if>
-        </if>
+        </if>-->
         <if test="inspectJobPhaseNodeStatusList !=null and inspectJobPhaseNodeStatusList.size() > 0">
             AND ajpn.status in
             <foreach collection="inspectJobPhaseNodeStatusList" item="status" open="(" close=")" separator=",">
@@ -181,8 +181,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                 </otherwise>
             </choose>
         </if>
-        WHERE a.`name` LIKE CONCAT('%', #{keyword}, '%')
-        <include refid="resource_ipobject_where"/>
+        <if test="keywordList != null and keywordList.size() > 0">
+            JOIN fulltextindex_field_cmdb ffc ON ffc.target_id = a.id AND ffc.target_field = #{nameFieldAttrId}
+            JOIN fulltextindex_word fw ON ffc.word_id = fw.id
+            AND (fw.word IN
+            <foreach collection="keywordList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            <!-- OR `a`.`name` LIKE CONCAT('%',#{keyword},'%') -->
+            )
+        </if>
+        <where>
+            <include refid="resource_ipobject_where"/>
+        </where>
     </select>
 
     <select id="getResourceCountByIpKeyword"
@@ -205,8 +216,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                 </otherwise>
             </choose>
         </if>
-        WHERE a.`ip` LIKE CONCAT('%', #{keyword}, '%')
-        <include refid="resource_ipobject_where"/>
+        <if test="keywordList != null and keywordList.size() > 0">
+            JOIN fulltextindex_field_cmdb ffc ON ffc.target_id = a.id AND ffc.target_field = #{ipFieldAttrId}
+            JOIN fulltextindex_word fw ON ffc.word_id = fw.id
+            AND (fw.word IN
+            <foreach collection="keywordList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            <!-- OR `a`.`ip` LIKE CONCAT('%',#{keyword},'%') -->
+            )
+        </if>
+        <where>
+            <include refid="resource_ipobject_where"/>
+        </where>
     </select>
 
     <select id="getResourceCount" parameterType="neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo"
@@ -232,10 +254,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                 </otherwise>
             </choose>
         </if>
+        <if test="keywordList != null and keywordList.size() > 0">
+            JOIN fulltextindex_field_cmdb ffc ON ffc.target_id = a.id AND ffc.target_field IN (#{nameFieldAttrId}, #{ipFieldAttrId})
+            JOIN fulltextindex_word fw ON ffc.word_id = fw.id
+            AND (fw.word IN
+            <foreach collection="keywordList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
+        <if test="batchSearchList != null and batchSearchList.size() > 0 and searchField != null and searchField != ''">
+            JOIN fulltextindex_field_cmdb ffc2 ON ffc2.target_id = a.id
+            <choose>
+                <when test="searchField == 'name'">
+                    AND ffc2.target_field = #{nameFieldAttrId}
+                </when>
+                <otherwise>
+                    AND ffc2.target_field = #{ipFieldAttrId}
+                </otherwise>
+            </choose>
+            JOIN fulltextindex_word fw2 ON ffc2.word_id = fw2.id
+            AND (fw2.word IN
+            <foreach collection="batchSearchList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
         <where>
-            <if test="keyword != null and keyword != ''">
+            <!--<if test="keyword != null and keyword != ''">
                 AND (a.`name` LIKE CONCAT('%', #{keyword}, '%') OR a.`ip` LIKE CONCAT('%', #{keyword}, '%'))
-            </if>
+            </if>-->
             <include refid="resource_ipobject_where"/>
         </where>
     </select>
@@ -264,10 +312,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                 </otherwise>
             </choose>
         </if>
+        <if test="keywordList != null and keywordList.size() > 0">
+            JOIN fulltextindex_field_cmdb ffc ON ffc.target_id = a.id AND ffc.target_field IN (#{nameFieldAttrId}, #{ipFieldAttrId})
+            JOIN fulltextindex_word fw ON ffc.word_id = fw.id
+            AND (fw.word IN
+            <foreach collection="keywordList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
+        <if test="batchSearchList != null and batchSearchList.size() > 0 and searchField != null and searchField != ''">
+            JOIN fulltextindex_field_cmdb ffc2 ON ffc2.target_id = a.id
+            <choose>
+                <when test="searchField == 'name'">
+                    AND ffc2.target_field = #{nameFieldAttrId}
+                </when>
+                <otherwise>
+                    AND ffc2.target_field = #{ipFieldAttrId}
+                </otherwise>
+            </choose>
+            JOIN fulltextindex_word fw2 ON ffc2.word_id = fw2.id
+            AND (fw2.word IN
+            <foreach collection="batchSearchList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
         <where>
-            <if test="keyword != null and keyword != ''">
+            <!--<if test="keyword != null and keyword != ''">
                 AND (a.`name` LIKE CONCAT('%', #{keyword}, '%') OR a.`ip` LIKE CONCAT('%', #{keyword}, '%'))
-            </if>
+            </if>-->
             <include refid="resource_ipobject_where"/>
         </where>
         <choose>
diff --git a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
index 5892ce1f70c38c3e2cb1e5f536d1d27b78586d8d..5db921a6ee9caef727da8894330c5b07157044f1 100644
--- a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
+++ b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
@@ -45,6 +45,7 @@ import neatlogic.framework.config.ConfigManager;
 import neatlogic.framework.dao.mapper.DataBaseViewInfoMapper;
 import neatlogic.framework.dao.mapper.SchemaMapper;
 import neatlogic.framework.dto.DataBaseViewInfoVo;
+import neatlogic.framework.fulltextindex.utils.FullTextIndexUtil;
 import neatlogic.framework.store.mysql.DatabaseVendor;
 import neatlogic.framework.store.mysql.DatasourceManager;
 import neatlogic.framework.transaction.core.EscapeTransactionJob;
@@ -210,22 +211,27 @@ public class ResourceCenterResourceServiceImpl implements IResourceCenterResourc
     public void handleBatchSearchList(ResourceSearchVo searchVo) {
         List<String> batchSearchList = searchVo.getBatchSearchList();
         if (CollectionUtils.isNotEmpty(batchSearchList)) {
+            List<String> keywordList = new ArrayList<>();
             if (Objects.equals(searchVo.getSearchField(), "name")) {
-                List<String> list = new ArrayList<>();
+//                List<String> list = new ArrayList<>();
                 for (String keyword : batchSearchList) {
-                    list.add("%" + keyword + "%");
+//                    list.add("%" + keyword + "%");
+                    keywordList.addAll(FullTextIndexUtil.sliceKeyword(keyword));
                 }
-                searchVo.setBatchSearchList(list);
+//                searchVo.setBatchSearchList(list);
             } else if (Objects.equals(searchVo.getSearchField(), "ip")) {
-                List<String> list = new ArrayList<>();
+//                List<String> list = new ArrayList<>();
                 for (String keyword : batchSearchList) {
-                    if (keyword.contains("*")) {
-                        keyword = keyword.replace('*', '%');
-                    }
-                    list.add(keyword);
+//                    if (keyword.contains("*")) {
+//                        keyword = keyword.replace('*', '%');
+//                    }
+//                    list.add(keyword);
+                    keywordList.addAll(FullTextIndexUtil.sliceKeyword(keyword));
                 }
-                searchVo.setBatchSearchList(list);
+//                searchVo.setBatchSearchList(list);
             }
+//            searchVo.setKeyword(String.join(" ", keywordList));
+            searchVo.setBatchSearchList(keywordList);
         }
     }