lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-06-04 17:43:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改工具类

Browse Source
This commit is contained in:
TinyAnts
2022-04-22 14:16:13 +08:00
parent 655fb1addc
commit e9d37cfc7a
28 changed files with 342 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java
View File

@@ -82,8 +82,8 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
}
// 校验用户被删除
Map<String, Object> map = ToolsUtil.jsonToMap(RedisUtil.hGet(AdminConfig.backstageManageKey, uid).toString());
if (map == null || map.get("isDelete").toString().equals("1")) {
Map<String, String> map = ToolsUtil.jsonToMap(RedisUtil.hGet(AdminConfig.backstageManageKey, uid).toString());
if (map == null || map.get("isDelete").equals("1")) {
RedisUtil.del(token);
RedisUtil.hDel(AdminConfig.backstageManageKey, uid);
AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg());

5
like-framework/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java
View File

@@ -6,6 +6,7 @@ import com.hxkj.common.entity.system.SystemLogOperate;
import com.hxkj.common.mapper.system.SystemLogOperateMapper;
import com.hxkj.common.utils.HttpUtil;
import com.hxkj.common.utils.IpUtil;
import com.hxkj.common.utils.RequestUtil;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.AfterThrowing;
@@ -116,10 +117,10 @@ public class LogAspect {
SystemLogOperate model = new SystemLogOperate();
model.setAdminId(adminId);
model.setTitle(logAnnotation.title());
model.setIp(IpUtil.getIpAddress(request));
model.setIp(IpUtil.getIpAddress());
model.setType(request.getMethod());
model.setMethod(className + "." + methodName + "()");
model.setUrl(HttpUtil.route());
model.setUrl(RequestUtil.route());
model.setArgs(params);
model.setError(error);
model.setStatus(status);

5
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java
View File

@@ -8,6 +8,7 @@ import com.hxkj.admin.validate.PageParam;
import com.hxkj.admin.vo.album.AlbumVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.utils.ArrayUtil;
import com.hxkj.common.utils.ToolsUtil;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +21,7 @@ import java.util.Map;
* 相册管理
*/
@RestController
@RequestMapping("/api/album")
@RequestMapping("api/album")
public class AlbumController {
@Resource
@@ -69,7 +70,7 @@ public class AlbumController {
return AjaxResult.failed("缺少cid参数");
}
List<Integer> ids = ToolsUtil.objectToListAsInt(params.get("ids"));
List<Integer> ids = ArrayUtil.objectToListAsInt(params.get("ids"));
iAlbumService.albumMove(ids, Integer.parseInt(params.get("cid").toString()));
return AjaxResult.success();
}

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java
View File

@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/api/article")
@RequestMapping("api/article")
public class ArticleController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java
View File

@@ -15,7 +15,7 @@ import java.util.Map;
*/
@Slf4j
@RestController
@RequestMapping("/api/index")
@RequestMapping("api/index")
public class IndexController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java
View File

@@ -22,7 +22,7 @@ import java.util.Map;
* 上传管理
*/
@RestController
@RequestMapping("/api/upload")
@RequestMapping("api/upload")
public class UploadController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java
View File

@@ -18,7 +18,7 @@ import java.util.*;
* 缓存监控管理
*/
@RestController
@RequestMapping("/api/monitor")
@RequestMapping("api/monitor")
public class CacheController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java
View File

@@ -16,7 +16,7 @@ import java.util.Map;
* 服务监控管理
*/
@RestController
@RequestMapping("/api/monitor")
@RequestMapping("api/monitor")
public class ServerController {
/**
* 服务器信息

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java
View File

@@ -12,7 +12,7 @@ import java.util.Map;
* 基础设置管理
*/
@RestController
@RequestMapping("/api/setting")
@RequestMapping("api/setting")
public class BasicsController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java
View File

@@ -20,7 +20,7 @@ import java.util.Map;
* 系统管理员管理
*/
@RestController
@RequestMapping("/api/system/admin")
@RequestMapping("api/system/admin")
public class SystemAdminController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java
View File

@@ -19,7 +19,7 @@ import java.util.Map;
* 系统日志管理
*/
@RestController
@RequestMapping("/api/system/log")
@RequestMapping("api/system/log")
public class SystemLogController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java
View File

@@ -19,7 +19,7 @@ import java.util.Map;
* 系统登录管理
*/
@RestController
@RequestMapping("/api/system")
@RequestMapping("api/system")
public class SystemLoginController {
@Resource

4
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java
View File

@@ -5,7 +5,6 @@ import com.hxkj.admin.LikeAdminThreadLocal;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.ISystemMenuService;
import com.hxkj.admin.validate.system.SystemMenuParam;
import com.hxkj.admin.vo.system.SystemAuthVo;
import com.hxkj.admin.vo.system.SystemMenuVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.validator.annotation.IDMust;
@@ -13,13 +12,12 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 系统菜单管理
*/
@RestController
@RequestMapping("/api/system/menu")
@RequestMapping("api/system/menu")
public class SystemMenuController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java
View File

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
* 系统角色管理
*/
@RestController
@RequestMapping("/api/system/role")
@RequestMapping("api/system/role")
public class SystemRoleController {
@Resource

2
like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java
View File

@@ -79,7 +79,7 @@ public class AlbumServiceImpl implements IAlbumService {
BeanUtils.copyProperties(album, vo);
vo.setUri(UrlUtil.toAbsoluteUrl(album.getUri()));
vo.setSize(ToolsUtil.toStorageUnit(album.getSize()));
vo.setSize(ToolsUtil.storageUnit(album.getSize()));
vo.setCreateTime(TimeUtil.timestampToDate(album.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(album.getUpdateTime()));
albumVoArrayList.add(vo);

2
like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
View File

@@ -331,7 +331,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
this.cacheAdminUserByUid(adminId);
if (systemAdminParam.getPassword() != null) {
String token = Objects.requireNonNull(HttpUtil.obj()).getHeader("token");
String token = Objects.requireNonNull(RequestUtil.handler()).getHeader("token");
RedisUtil.del(AdminConfig.backstageTokenKey + token);
}
}

8
like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java
View File

@@ -72,7 +72,7 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
}
try {
sysAdmin.setLastLoginIp(HttpUtil.ip());
sysAdmin.setLastLoginIp(IpUtil.getIpAddress());
sysAdmin.setLastLoginTime(System.currentTimeMillis() / 1000);
systemAdminMapper.updateById(sysAdmin);
@@ -86,7 +86,7 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
response.put("token", token);
// 更新登录信息
sysAdmin.setLastLoginIp(HttpUtil.ip());
sysAdmin.setLastLoginIp(IpUtil.getIpAddress());
sysAdmin.setLastLoginTime(TimeUtil.timestamp());
systemAdminMapper.updateById(sysAdmin);
@@ -118,13 +118,13 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
*/
private void recordLoginLog(Integer adminId, String username, String error) {
try {
HttpServletRequest request = Objects.requireNonNull(HttpUtil.obj());
HttpServletRequest request = Objects.requireNonNull(RequestUtil.handler());
final UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
SystemLogLogin model = new SystemLogLogin();
model.setAdminId(adminId);
model.setUsername(username);
model.setIp(HttpUtil.ip());
model.setIp(IpUtil.getIpAddress());
model.setOs(userAgent.getOperatingSystem().getName());
model.setBrowser(userAgent.getBrowser().getName());
model.setStatus(StringUtil.isEmpty(error) ? 1 : 0);

2
like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java
View File

@@ -121,7 +121,7 @@ public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService {
}
}
RedisUtil.hSet(AdminConfig.backstageRolesKey, String.valueOf(roleId), ArrayUtil.listStrToString(menuArray, ","));
RedisUtil.hSet(AdminConfig.backstageRolesKey, String.valueOf(roleId), ArrayUtil.listToStringByStr(menuArray, ","));
}
}