From ec17edbc0d74fc08dadbe723278ff8f07841dc30 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 25 二月 2023 10:44:42 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/ProjectController.java | 7 ++-
src/main/java/com/lf/server/mapper/data/DirMapper.java | 3 +
src/main/resources/mapper/data/DirMapper.xml | 10 ++++
src/main/java/com/lf/server/controller/all/FmeItController.java | 7 ++-
src/main/java/com/lf/server/interceptor/AuthInterceptor.java | 48 ++++++++++++++---------
src/main/java/com/lf/server/controller/all/CrdsController.java | 7 ++-
src/main/java/com/lf/server/entity/all/StaticData.java | 9 +---
src/main/java/com/lf/server/service/data/DirService.java | 7 ++-
8 files changed, 62 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/CrdsController.java b/src/main/java/com/lf/server/controller/all/CrdsController.java
index d2b7bfc..bd07846 100644
--- a/src/main/java/com/lf/server/controller/all/CrdsController.java
+++ b/src/main/java/com/lf/server/controller/all/CrdsController.java
@@ -37,10 +37,13 @@
@SysLog()
@ApiOperation(value = "鏌ヨ椤圭洰")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+ })
@GetMapping(value = "/selectProject")
- public ResponseMsg<List<DirEntity>> selectProject() {
+ public ResponseMsg<List<DirEntity>> selectProject(String name) {
try {
- List<DirEntity> list = dirService.selectProject();
+ List<DirEntity> list = dirService.selectProject(name);
return success(list);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/all/FmeItController.java b/src/main/java/com/lf/server/controller/all/FmeItController.java
index aeaae10..a495ba6 100644
--- a/src/main/java/com/lf/server/controller/all/FmeItController.java
+++ b/src/main/java/com/lf/server/controller/all/FmeItController.java
@@ -261,10 +261,13 @@
@SysLog()
@ApiOperation(value = "鏌ヨ椤圭洰")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+ })
@GetMapping(value = "/selectProject")
- public ResponseMsg<List<DirEntity>> selectProject() {
+ public ResponseMsg<List<DirEntity>> selectProject(String name) {
try {
- List<DirEntity> list = dirService.selectProject();
+ List<DirEntity> list = dirService.selectProject(name);
return success(list);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/data/ProjectController.java b/src/main/java/com/lf/server/controller/data/ProjectController.java
index 4528200..3cfb630 100644
--- a/src/main/java/com/lf/server/controller/data/ProjectController.java
+++ b/src/main/java/com/lf/server/controller/data/ProjectController.java
@@ -67,10 +67,13 @@
@SysLog()
@ApiOperation(value = "鏌ヨ椤圭洰")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+ })
@GetMapping(value = "/selectProject")
- public ResponseMsg<List<DirEntity>> selectProject() {
+ public ResponseMsg<List<DirEntity>> selectProject(String name) {
try {
- List<DirEntity> list = dirService.selectProject();
+ List<DirEntity> list = dirService.selectProject(name);
return success(list);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index 2a74207..f2629c0 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -140,14 +140,9 @@
public final static String TIFF = ".tiff";
/**
- * WMTS
+ * admin
*/
- public final static String WMTS = "WMTS";
-
- /**
- * GetCapabilities
- */
- public final static String CAPABILITY = "GetCapabilities";
+ public final static String ADMIN = "admin";
/**
* 鐗堟湰鍙�
diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index ff5cbbd..4ed007c 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -52,43 +52,53 @@
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
// noinspection AlibabaRemoveCommentedCode
try {
- // 闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
+ // 1.闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
if (!(handler instanceof HandlerMethod) || noNeedAuth(request)) {
return true;
}
- // 鑾峰彇浠ょ墝
+ // 2.鑾峰彇浠ょ墝
String token = WebHelper.getToken(request);
if (StringHelper.isNull(token)) {
return WebHelper.write2Page(response, NO_TOKEN);
}
- // 鑾峰彇IP锛屾鏌ラ粦鍚嶅崟锛屾鏌ョ櫧鍚嶅崟锛屾鏌P涓�鑷存��
- String ip = WebHelper.getIpAddress(request);
- if (StringHelper.isEmpty(ip)) {
- return WebHelper.write2Page(response, IP_NULL);
- }
- if (!checkBlackList(ip, request)) {
- return WebHelper.write2Page(response, BLACK_LIST);
- }
- if (!checkWhiteList(ip, request)) {
- if (!checkIpSource(ip, token)) {
- return WebHelper.write2Page(response, ILLEGAL_TOKEN);
- }
- }
-
- // 鑾峰彇鐢ㄦ埛浠ょ墝
+ // 3.鑾峰彇鐢ㄦ埛浠ょ墝
UserEntity ue = sysService.tokenService.getCurrentUser(request);
if (ue == null) {
return WebHelper.write2Page(response, NO_LOGIN);
}
- // 妫�鏌ョ敤鎴稩D鏄惁绂佺敤
+ // 4.鑾峰彇IP
+ String ip = WebHelper.getIpAddress(request);
+ if (StringHelper.isEmpty(ip)) {
+ return WebHelper.write2Page(response, IP_NULL);
+ }
+
+ // 5.妫�鏌ラ粦鍚嶅崟
+ if (!checkBlackList(ip, request)) {
+ return WebHelper.write2Page(response, BLACK_LIST);
+ }
+
+ // 6.admin璺宠繃鏉冮檺妫�娴�
+ if (StaticData.ADMIN.equals(ue.getUid())) {
+ return true;
+ }
+
+ // 7.妫�鏌ョ櫧鍚嶅崟
+ if (!checkWhiteList(ip, request)) {
+ // 妫�鏌P涓�鑷存��
+ if (!checkIpSource(ip, token)) {
+ return WebHelper.write2Page(response, ILLEGAL_TOKEN);
+ }
+ }
+
+ // 8.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
if (sysService.tokenService.isUidDisable(ue)) {
return WebHelper.write2Page(response, USER_LOCK);
}
- // 鏉冮檺鏍￠獙
+ // 9.鏉冮檺鏍￠獙
if (!checkPerms(ue, request)) {
System.out.println("鏃犳潈闄愯闂細" + request.getRequestURI().toLowerCase());
return WebHelper.write2Page(response, NO_AUTH);
diff --git a/src/main/java/com/lf/server/mapper/data/DirMapper.java b/src/main/java/com/lf/server/mapper/data/DirMapper.java
index 51a4d8e..45859be 100644
--- a/src/main/java/com/lf/server/mapper/data/DirMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DirMapper.java
@@ -96,9 +96,10 @@
/**
* 鏌ヨ椤圭洰
*
+ * @param name
* @return
*/
- public List<DirEntity> selectProject();
+ public List<DirEntity> selectProject(String name);
/**
* 閫掑綊鏌ヨ
diff --git a/src/main/java/com/lf/server/service/data/DirService.java b/src/main/java/com/lf/server/service/data/DirService.java
index 2c255db..a8f5cfa 100644
--- a/src/main/java/com/lf/server/service/data/DirService.java
+++ b/src/main/java/com/lf/server/service/data/DirService.java
@@ -1,6 +1,7 @@
package com.lf.server.service.data;
import com.lf.server.entity.data.DirEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.data.DirMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -69,8 +70,10 @@
}
@Override
- public List<DirEntity> selectProject() {
- return dirMapper.selectProject();
+ public List<DirEntity> selectProject(String name) {
+ name = StringHelper.getLikeStr(name);
+
+ return dirMapper.selectProject(name);
}
@Override
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index 31fb886..bd54f2b 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -17,7 +17,15 @@
</select>
<select id="selectProject" resultType="com.lf.server.entity.data.DirEntity">
- select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where pid = 0 and id > 1 order by order_num;
+ select a.*, fn_get_fullname(a.code, 2) fullName
+ from lf.sys_dir a
+ <where>
+ pid = 0
+ <if test="name != null">
+ and name like #{name}
+ </if>
+ </where>
+ order by order_num;
</select>
<select id="selectDirRecursive" resultType="com.lf.server.entity.data.DirEntity">
--
Gitblit v1.9.3