diff --git a/src/main/java/xyz/playedu/api/constant/SystemConstant.java b/src/main/java/xyz/playedu/api/constant/SystemConstant.java index b271a30..4a4ff97 100644 --- a/src/main/java/xyz/playedu/api/constant/SystemConstant.java +++ b/src/main/java/xyz/playedu/api/constant/SystemConstant.java @@ -4,8 +4,12 @@ public class SystemConstant { public final static String ENV_PROD = "prod"; - public static String REDIS_PREFIX = "playedu:"; + public final static String REDIS_PREFIX = "playedu:"; public final static String JWT_PRV_ADMIN_USER = "dc14511e97e7eb725fb2976bc939b375"; + public final static String INTERNAL_IP = "127.0.0.1"; + + public final static String INTERNAL_IP_AREA = "内网"; + } diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java index 37010b0..ce3c566 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java @@ -1,5 +1,6 @@ package xyz.playedu.api.controller.backend; +import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -13,10 +14,7 @@ import xyz.playedu.api.types.JsonResponse; import xyz.playedu.api.types.paginate.PaginationResult; import xyz.playedu.api.types.paginate.ResourcePaginateFilter; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import java.util.*; /** * @Author 杭州白书科技有限公司 @@ -33,11 +31,11 @@ public class ResourceController { private ResourceCategoryService categoryService; @GetMapping("/index") - public JsonResponse index( - @RequestParam(name = "page", defaultValue = "1") Integer page, - @RequestParam(name = "size", defaultValue = "10") Integer size, - @RequestParam(name = "name", defaultValue = "") String name - ) { + public JsonResponse index(@RequestParam HashMap params) { + Integer page = MapUtils.getInteger(params, "page", 1); + Integer size = MapUtils.getInteger(params, "size", 10); + String name = MapUtils.getString(params, "name"); + ResourcePaginateFilter filter = new ResourcePaginateFilter(); if (name != null && name.length() > 0) { filter.setName(name); @@ -51,8 +49,10 @@ public class ResourceController { @GetMapping("/create") public JsonResponse create(@RequestParam(name = "type") String type) { List categories = categoryService.getByType(type); + HashMap data = new HashMap<>(); data.put("categories", categories); + return JsonResponse.data(data); } diff --git a/src/main/java/xyz/playedu/api/controller/backend/UserController.java b/src/main/java/xyz/playedu/api/controller/backend/UserController.java index d02bf46..eb9fd7a 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/UserController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/UserController.java @@ -7,6 +7,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import xyz.playedu.api.constant.BPermissionConstant; +import xyz.playedu.api.constant.SystemConstant; import xyz.playedu.api.domain.User; import xyz.playedu.api.domain.UserDepartment; import xyz.playedu.api.event.UserDestroyEvent; @@ -49,19 +50,7 @@ public class UserController { @BackendPermissionMiddleware(slug = BPermissionConstant.USER_INDEX) @GetMapping("/index") - public JsonResponse index( - @RequestParam(name = "page", defaultValue = "1") Integer page, - @RequestParam(name = "size", defaultValue = "10") Integer size, - @RequestParam(name = "name", required = false) String name, - @RequestParam(name = "email", required = false) String email, - @RequestParam(name = "nickname", required = false) String nickname, - @RequestParam(name = "id_card", required = false) String idCard, - @RequestParam(name = "is_active", required = false) Integer isActive, - @RequestParam(name = "is_lock", required = false) Integer isLock, - @RequestParam(name = "is_verify", required = false) Integer isVerify, - @RequestParam(name = "is_set_password", required = false) Integer isSetPassword, - @RequestParam(name = "created_at", required = false) Date[] createdAt - ) { + public JsonResponse index(@RequestParam(name = "page", defaultValue = "1") Integer page, @RequestParam(name = "size", defaultValue = "10") Integer size, @RequestParam(name = "name", required = false) String name, @RequestParam(name = "email", required = false) String email, @RequestParam(name = "nickname", required = false) String nickname, @RequestParam(name = "id_card", required = false) String idCard, @RequestParam(name = "is_active", required = false) Integer isActive, @RequestParam(name = "is_lock", required = false) Integer isLock, @RequestParam(name = "is_verify", required = false) Integer isVerify, @RequestParam(name = "is_set_password", required = false) Integer isSetPassword, @RequestParam(name = "created_at", required = false) Date[] createdAt) { UserPaginateFilter filter = new UserPaginateFilter(); if (name != null && name.length() > 0) { filter.setName(name); @@ -127,8 +116,8 @@ public class UserController { user.setVerifyAt(request.getVerifyAt()); user.setIsSetPassword(request.getIsSetPassword()); - user.setCreateIp("127.0.0.1"); - user.setCreateCity("内网"); + user.setCreateIp(SystemConstant.INTERNAL_IP); + user.setCreateCity(SystemConstant.INTERNAL_IP_AREA); user.setCreatedAt(new Date()); user.setUpdatedAt(new Date()); @@ -312,8 +301,8 @@ public class UserController { tmpInsertUser.setSalt(tmpSalt); tmpInsertUser.setName(users[i][4]); tmpInsertUser.setIdCard(users[i][5]); - tmpInsertUser.setCreateIp("127.0.0.1"); - tmpInsertUser.setCreateCity("内网"); + tmpInsertUser.setCreateIp(SystemConstant.INTERNAL_IP); + tmpInsertUser.setCreateCity(SystemConstant.INTERNAL_IP_AREA); tmpInsertUser.setCreatedAt(new Date()); tmpInsertUser.setUpdatedAt(new Date());