diff --git a/README.md b/README.md index e8de60c..83541a3 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,7 @@ - ### 本地部署安装 手册(推荐): [在线文档](http://docs.kykms.cn/docs/mindoc/mindoc-1eqploikpjlkc) -- ### 一键运行脚本 -快速部署docker镜像,请使用Centos 7以上版本,最低配置2C/4G。下载一键运行脚本:http://www.kykms.cn/install_community.sh -部署成功,访问:http://Your_IP:3000 - ### 开发环境准备与运行 请参考:[开发环境准备与运行](./开发环境准备与运行.MD) - 默认登录账号: admin/123456 diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js index 86033bf..c2fe1ac 100644 --- a/ant-design-vue-jeecg/src/config/router.config.js +++ b/ant-design-vue-jeecg/src/config/router.config.js @@ -49,12 +49,6 @@ export const constantRouterMap = [ meta: { title: '首页' ,keepAlive: true }, component: () => import('@/views/km/search/DefaultDocSearch') }, - { - path:'/advancedSearch', - name:'advancedSearch', - meta: { title: '高级检索' ,keepAlive: true }, - component: () => import('@/views/km/search/AdvancedSearch') - }, { path:'/docSearch', name:'docSearch', diff --git a/ant-design-vue-jeecg/src/views/km/search/AdvancedSearch.vue b/ant-design-vue-jeecg/src/views/km/search/AdvancedSearch.vue deleted file mode 100644 index 75e64bb..0000000 --- a/ant-design-vue-jeecg/src/views/km/search/AdvancedSearch.vue +++ /dev/null @@ -1,773 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/km/search/DefaultDocSearch.vue b/ant-design-vue-jeecg/src/views/km/search/DefaultDocSearch.vue index 9de7590..f7c78e3 100644 --- a/ant-design-vue-jeecg/src/views/km/search/DefaultDocSearch.vue +++ b/ant-design-vue-jeecg/src/views/km/search/DefaultDocSearch.vue @@ -28,7 +28,6 @@
- 高级检索   > 全文检索 @@ -682,9 +681,6 @@ }) }, - advancedSearch() { - this.$router.push('/advancedSearch'); - }, } diff --git a/ant-design-vue-jeecg/src/views/km/search/DocSearch.vue b/ant-design-vue-jeecg/src/views/km/search/DocSearch.vue index a295d76..3b33365 100644 --- a/ant-design-vue-jeecg/src/views/km/search/DocSearch.vue +++ b/ant-design-vue-jeecg/src/views/km/search/DocSearch.vue @@ -21,7 +21,6 @@ - 结果中检索
@@ -29,7 +28,6 @@
- 高级检索   > 全文检索 { public Result delete(@RequestParam(name="id",required=true) String id,HttpServletRequest req) { return kmDocService.deleteDoc(id,req); } - + /** * 批量删除 * @@ -221,7 +221,7 @@ public class KmDocController extends JeecgController { else return Result.error("全部失败"); } - + /** * 通过id查询 * @@ -328,15 +328,6 @@ public class KmDocController extends JeecgController { } } - @ApiOperation(value="km_doc-高级检索", notes="km_doc-高级检索") - @GetMapping(value = "/advanceSearchDoc") - public Result advanceSearchDoc(KmDocEsParamVO kmDocEsParamVO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req){ - return searchDoc(kmDocEsParamVO,pageNo,pageSize,req); - } - /** * @param docId 指想要下载的文档id * @param response diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java index 5f76910..103d056 100644 --- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java @@ -657,7 +657,7 @@ public class KmDocServiceImpl extends ServiceImpl implements return kmSearchResultObjVO; } KmSearchRecord kmSearchRecord = new KmSearchRecord(); - //在结果中检索的条件处理 + HttpSession session = req.getSession(); //最终条件