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

优化工具类的命名

Browse Source
This commit is contained in:
TinyAnts
2022-12-02 14:42:20 +08:00
parent 0077e75e85
commit 5f5026d40c
78 changed files with 703 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java
View File

@@ -2,14 +2,13 @@ package com.mdd.admin;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.mdd.admin.config.AdminConfig;
import com.mdd.admin.service.ISystemAuthAdminService;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.enums.HttpEnum;
import com.mdd.common.utils.RedisUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.ToolsUtil;
import com.mdd.common.util.RedisUtils;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.ToolsUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
@@ -55,7 +54,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
// Token是否为空
String token = StpUtil.getTokenValue();
if (StringUtils.isBlank(token)) {
if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(token)) {
AjaxResult<Object> result = AjaxResult.failed(HttpEnum.TOKEN_EMPTY.getCode(), HttpEnum.TOKEN_EMPTY.getMsg());
response.getWriter().print(JSON.toJSONString(result));
return false;
@@ -63,20 +62,20 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
// Token是否过期
Object id = StpUtil.getLoginId();
if (StringUtil.isNull(id)) {
if (StringUtils.isNull(id)) {
AjaxResult<Object> result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg());
response.getWriter().print(JSON.toJSONString(result));
return false;
}
// Users是否存在
if (!RedisUtil.hExists(AdminConfig.backstageManageKey, id)) {
if (!RedisUtils.hExists(AdminConfig.backstageManageKey, id)) {
iSystemAuthAdminService.cacheAdminUserByUid(Integer.parseInt(id.toString()));
}
// 获取用户的信息
String UserStr = RedisUtil.hGet(AdminConfig.backstageManageKey, String.valueOf(id)).toString();
Map<String, String> userMap = ToolsUtil.jsonToMap(UserStr);
String UserStr = RedisUtils.hGet(AdminConfig.backstageManageKey, String.valueOf(id)).toString();
Map<String, String> userMap = ToolsUtils.jsonToMap(UserStr);
// 校验用户被删除
if (userMap.get("isDelete").equals("1")) {

6
server/like-admin/src/main/java/com/mdd/admin/LikeAdminThreadLocal.java
View File

@@ -1,9 +1,7 @@
package com.mdd.admin;
import com.mdd.common.utils.ArrayUtil;
import com.mdd.common.util.ArrayUtils;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
@@ -62,7 +60,7 @@ public class LikeAdminThreadLocal {
if (roleIds.equals("") || roleIds.equals("0")) {
return Collections.emptyList();
}
return ArrayUtil.stringToListAsInt(roleIds, ",");
return ArrayUtils.stringToListAsInt(roleIds, ",");
}
/**

17
server/like-admin/src/main/java/com/mdd/admin/config/StpInterConfig.java
View File

@@ -3,10 +3,9 @@ package com.mdd.admin.config;
import cn.dev33.satoken.stp.StpInterface;
import com.mdd.admin.LikeAdminThreadLocal;
import com.mdd.admin.service.ISystemAuthPermService;
import com.mdd.common.utils.ArrayUtil;
import com.mdd.common.utils.RedisUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.ToolsUtil;
import com.mdd.common.util.ArrayUtils;
import com.mdd.common.util.RedisUtils;
import com.mdd.common.util.StringUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -34,13 +33,13 @@ public class StpInterConfig implements StpInterface {
List<String> perms = new LinkedList<>();
for (Integer roleId : roleIds) {
Object menusObj = RedisUtil.hGet(AdminConfig.backstageRolesKey, String.valueOf(roleId));
if (StringUtil.isNull(menusObj)) {
Object menusObj = RedisUtils.hGet(AdminConfig.backstageRolesKey, String.valueOf(roleId));
if (StringUtils.isNull(menusObj)) {
iSystemAuthPermService.cacheRoleMenusByRoleId(roleId);
menusObj = RedisUtil.hGet(AdminConfig.backstageRolesKey, String.valueOf(roleId));
menusObj = RedisUtils.hGet(AdminConfig.backstageRolesKey, String.valueOf(roleId));
}
if (StringUtil.isNotNull(menusObj)) {
perms.addAll(ArrayUtil.stringToListAsStr(menusObj.toString(), ","));
if (StringUtils.isNotNull(menusObj)) {
perms.addAll(ArrayUtils.stringToListAsStr(menusObj.toString(), ","));
}
}

4
server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java
View File

@@ -2,7 +2,7 @@ package com.mdd.admin.config;
import com.mdd.admin.LikeAdminInterceptor;
import com.mdd.common.config.GlobalConfig;
import com.mdd.common.utils.YmlUtil;
import com.mdd.common.util.YmlUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -47,7 +47,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
*/
@Override
public void addResourceHandlers(@NotNull ResourceHandlerRegistry registry) {
String directory = YmlUtil.get("like.upload-directory");
String directory = YmlUtils.get("like.upload-directory");
registry.addResourceHandler("/"+ GlobalConfig.publicPrefix +"/**")
.addResourceLocations("file:" + directory);
}

8
server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java
View File

@@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSON;
import com.mdd.admin.LikeAdminThreadLocal;
import com.mdd.common.entity.system.SystemLogOperate;
import com.mdd.common.mapper.system.SystemLogOperateMapper;
import com.mdd.common.utils.IpUtil;
import com.mdd.common.utils.RequestUtil;
import com.mdd.common.util.IpUtils;
import com.mdd.common.util.RequestUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.AfterThrowing;
@@ -134,10 +134,10 @@ public class LogAspect {
SystemLogOperate model = new SystemLogOperate();
model.setAdminId(adminId);
model.setTitle(logAnnotation.title());
model.setIp(IpUtil.getIpAddress());
model.setIp(IpUtils.getIpAddress());
model.setType(request.getMethod());
model.setMethod(className + "." + methodName + "()");
model.setUrl(RequestUtil.route());
model.setUrl(RequestUtils.route());
model.setArgs(params);
model.setError(error);
model.setStatus(status);

36
server/like-admin/src/main/java/com/mdd/admin/config/quartz/InvokeUtils.java
View File

@@ -1,8 +1,8 @@
package com.mdd.admin.config.quartz;
import com.mdd.common.entity.Crontab;
import com.mdd.common.utils.SpringUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.SpringUtils;
import com.mdd.common.util.StringUtils;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -26,7 +26,7 @@ public class InvokeUtils {
List<Object[]> methodParams = getMethodParams(invokeTarget);
if (!isValidClassName(beanName)) {
Object bean = SpringUtil.getBean(beanName);
Object bean = SpringUtils.getBean(beanName);
invokeMethod(bean, methodName, methodParams);
} else {
Object bean = Class.forName(beanName).newInstance();
@@ -44,7 +44,7 @@ public class InvokeUtils {
private static void invokeMethod(Object bean, String methodName, List<Object[]> methodParams)
throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
InvocationTargetException {
if (StringUtil.isNotNull(methodParams) && methodParams.size() > 0) {
if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) {
Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams));
method.invoke(bean, getMethodParamsValue(methodParams));
} else {
@@ -61,7 +61,7 @@ public class InvokeUtils {
* @return true是 false否
*/
public static boolean isValidClassName(String invokeTarget) {
return StringUtil.countMatches(invokeTarget, ".") > 1;
return StringUtils.countMatches(invokeTarget, ".") > 1;
}
/**
@@ -71,8 +71,8 @@ public class InvokeUtils {
* @return bean名称
*/
public static String getBeanName(String invokeTarget) {
String beanName = StringUtil.substringBefore(invokeTarget, "(");
return StringUtil.substringBeforeLast(beanName, ".");
String beanName = StringUtils.substringBefore(invokeTarget, "(");
return StringUtils.substringBeforeLast(beanName, ".");
}
/**
@@ -82,8 +82,8 @@ public class InvokeUtils {
* @return method方法
*/
public static String getMethodName(String invokeTarget) {
String methodName = StringUtil.substringBefore(invokeTarget, "(");
return StringUtil.substringAfterLast(methodName, ".");
String methodName = StringUtils.substringBefore(invokeTarget, "(");
return StringUtils.substringAfterLast(methodName, ".");
}
/**
@@ -93,22 +93,22 @@ public class InvokeUtils {
* @return method方法相关参数列表
*/
public static List<Object[]> getMethodParams(String invokeTarget) {
String methodStr = StringUtil.substringBetween(invokeTarget, "(", ")");
if (StringUtil.isEmpty(methodStr)) {
String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
if (StringUtils.isEmpty(methodStr)) {
return null;
}
String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
List<Object[]> clazz = new LinkedList<>();
for (String methodParam : methodParams) {
String str = StringUtil.trimToEmpty(methodParam);
if (StringUtil.startsWithAny(str, "'", "\"")) {
clazz.add(new Object[]{StringUtil.substring(str, 1, str.length() - 1), String.class});
String str = StringUtils.trimToEmpty(methodParam);
if (StringUtils.startsWithAny(str, "'", "\"")) {
clazz.add(new Object[]{StringUtils.substring(str, 1, str.length() - 1), String.class});
} else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str)) {
clazz.add(new Object[]{Boolean.valueOf(str), Boolean.class});
} else if (StringUtil.endsWith(str, "L")) {
clazz.add(new Object[]{Long.valueOf(StringUtil.substring(str, 0, str.length() - 1)), Long.class});
} else if (StringUtil.endsWith(str, "D")) {
clazz.add(new Object[]{Double.valueOf(StringUtil.substring(str, 0, str.length() - 1)), Double.class});
} else if (StringUtils.endsWith(str, "L")) {
clazz.add(new Object[]{Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class});
} else if (StringUtils.endsWith(str, "D")) {
clazz.add(new Object[]{Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class});
} else {
clazz.add(new Object[]{Integer.valueOf(str), Integer.class});
}

4
server/like-admin/src/main/java/com/mdd/admin/config/quartz/QuartzUtils.java
View File

@@ -3,7 +3,7 @@ package com.mdd.admin.config.quartz;
import com.mdd.admin.config.quartz.exceution.QuartzDisExecution;
import com.mdd.admin.config.quartz.exceution.QuartzJobExecution;
import com.mdd.common.entity.Crontab;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.StringUtils;
import org.quartz.*;
/**
@@ -91,7 +91,7 @@ public class QuartzUtils {
}
// 如果过期则调度
if (StringUtil.isNotNull(CronUtils.nextExecution(job.getRules()))) {
if (StringUtils.isNotNull(CronUtils.nextExecution(job.getRules()))) {
scheduler.scheduleJob(jobDetail, trigger);
}

8
server/like-admin/src/main/java/com/mdd/admin/config/quartz/exceution/AbstractQuartzJob.java
View File

@@ -3,8 +3,8 @@ package com.mdd.admin.config.quartz.exceution;
import com.mdd.admin.config.quartz.TaskConstants;
import com.mdd.common.entity.Crontab;
import com.mdd.common.mapper.CrontabMapper;
import com.mdd.common.utils.SpringUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.SpringUtils;
import com.mdd.common.util.StringUtils;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.slf4j.Logger;
@@ -61,12 +61,12 @@ public abstract class AbstractQuartzJob implements Job {
crontab.setStartTime(startTime / 1000);
crontab.setEndTime(endTime / 1000);
crontab.setTaskTime(endTime - startTime);
if (StringUtil.isNotNull(e)) {
if (StringUtils.isNotNull(e)) {
crontab.setError(e.getMessage());
crontab.setStatus(TaskConstants.STATUS_FAIL);
}
SpringUtil.getBean(CrontabMapper.class).updateById(crontab);
SpringUtils.getBean(CrontabMapper.class).updateById(crontab);
}
/**

6
server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java
View File

@@ -9,7 +9,7 @@ import com.mdd.common.enums.AlbumEnum;
import com.mdd.common.exception.OperateException;
import com.mdd.common.plugin.storage.StorageDriver;
import com.mdd.common.plugin.storage.UploadFilesVo;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -54,7 +54,7 @@ public class UploadController {
StorageDriver storageDriver = new StorageDriver();
UploadFilesVo vo = storageDriver.upload(multipartFile, "image", AlbumEnum.IMAGE.getCode());
String cid = StringUtil.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0";
String cid = StringUtils.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0";
Map<String, String> album = new LinkedHashMap<>();
album.put("aid", String.valueOf(LikeAdminThreadLocal.getAdminId()));
@@ -93,7 +93,7 @@ public class UploadController {
StorageDriver storageDriver = new StorageDriver();
UploadFilesVo vo = storageDriver.upload(multipartFile, "video", AlbumEnum.Video.getCode());
String cid = StringUtil.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0";
String cid = StringUtils.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0";
Map<String, String> album = new LinkedHashMap<>();
album.put("cid", cid);

6
server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorCacheController.java
View File

@@ -3,7 +3,7 @@ package com.mdd.admin.controller.monitor;
import com.mdd.admin.config.aop.Log;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.StringUtils;
import org.springframework.data.redis.connection.RedisServerCommands;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
@@ -49,8 +49,8 @@ public class MonitorCacheController {
commandStats.stringPropertyNames().forEach(key -> {
Map<String, String> data = new HashMap<>(2);
String property = commandStats.getProperty(key);
data.put("name", StringUtil.removeStart(key, "cmdstat_"));
data.put("value", StringUtil.substringBetween(property, "calls=", ",usec"));
data.put("name", StringUtils.removeStart(key, "cmdstat_"));
data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
pieList.add(data);
});

6
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java
View File

@@ -9,7 +9,7 @@ import com.mdd.admin.validate.setting.DictDataUpdateValidate;
import com.mdd.admin.vo.setting.SettingDictDataVo;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.core.PageResult;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +37,7 @@ public class SettingDictDataController {
*/
@GetMapping("/all")
public AjaxResult<List<SettingDictDataVo>> all(@RequestParam Map<String, String> params) {
Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失");
Assert.isFalse(StringUtils.isEmpty(params.get("dictType")), "dictType缺失");
List<SettingDictDataVo> list = iSettingDictDataService.all(params);
return AjaxResult.success(list);
}
@@ -53,7 +53,7 @@ public class SettingDictDataController {
@GetMapping("/list")
public AjaxResult<PageResult<SettingDictDataVo>> list(@Validated PageValidate pageValidate,
@RequestParam Map<String, String> params) {
Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失");
Assert.isFalse(StringUtils.isEmpty(params.get("dictType")), "dictType缺失");
PageResult<SettingDictDataVo> list = iSettingDictDataService.list(pageValidate, params);
return AjaxResult.success(list);
}

4
server/like-admin/src/main/java/com/mdd/admin/crontab/MyJob.java
View File

@@ -5,13 +5,13 @@ import org.springframework.stereotype.Component;
/**
* 工作类的具体实现,即需要定时执行的“某个事件”
* 具体的定时任务
*/
@Component("myJob")
public class MyJob {
public void handle(String s) {
System.out.println("执行无参方法: " + s);
System.out.println("有参数定时任务执行逻辑 : " + s);
}
}

24
server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java
View File

@@ -17,7 +17,7 @@ import com.mdd.common.entity.album.Album;
import com.mdd.common.entity.album.AlbumCate;
import com.mdd.common.mapper.album.AlbumCateMapper;
import com.mdd.common.mapper.album.AlbumMapper;
import com.mdd.common.utils.*;
import com.mdd.common.util.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -62,7 +62,7 @@ public class AlbumsServiceImpl implements IAlbumsService {
.eq("is_delete", 0)
.orderByDesc("id");
if (StringUtil.isNotNull(searchValidate.getCid())) {
if (StringUtils.isNotNull(searchValidate.getCid())) {
queryWrapper.eq("cid", searchValidate.getCid());
}
@@ -73,7 +73,7 @@ public class AlbumsServiceImpl implements IAlbumsService {
IPage<Album> iPage = albumMapper.selectPage(new Page<>(page, limit), queryWrapper);
String engine = ConfigUtil.get("storage", "default", "local");
String engine = ConfigUtils.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
List<AlbumVo> list = new ArrayList<>();
@@ -86,10 +86,10 @@ public class AlbumsServiceImpl implements IAlbumsService {
} else {
vo.setPath(album.getUri());
}
vo.setUri(UrlUtil.toAbsoluteUrl(album.getUri()));
vo.setSize(ToolsUtil.storageUnit(album.getSize()));
vo.setCreateTime(TimeUtil.timestampToDate(album.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(album.getUpdateTime()));
vo.setUri(UrlUtils.toAbsoluteUrl(album.getUri()));
vo.setSize(ToolsUtils.storageUnit(album.getSize()));
vo.setCreateTime(TimeUtils.timestampToDate(album.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(album.getUpdateTime()));
list.add(vo);
}
@@ -208,11 +208,11 @@ public class AlbumsServiceImpl implements IAlbumsService {
.eq("is_delete", 0)
.orderByDesc("id");
if (StringUtil.isNotNull(searchValidate.getType()) && searchValidate.getType() > 0) {
if (StringUtils.isNotNull(searchValidate.getType()) && searchValidate.getType() > 0) {
queryWrapper.eq("type", searchValidate.getType());
}
if (StringUtil.isNotNull(searchValidate.getKeyword()) && StringUtil.isNotEmpty(searchValidate.getKeyword())) {
if (StringUtils.isNotNull(searchValidate.getKeyword()) && StringUtils.isNotEmpty(searchValidate.getKeyword())) {
queryWrapper.like("name", searchValidate.getKeyword());
}
@@ -223,13 +223,13 @@ public class AlbumsServiceImpl implements IAlbumsService {
AlbumCateVo vo = new AlbumCateVo();
BeanUtils.copyProperties(albumCate, vo);
vo.setCreateTime(TimeUtil.timestampToDate(albumCate.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(albumCate.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(albumCate.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(albumCate.getUpdateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
return ArrayUtils.listToTree(jsonArray, "id", "pid", "children");
}
/**

24
server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java
View File

@@ -14,7 +14,7 @@ import com.mdd.common.entity.article.Article;
import com.mdd.common.entity.article.ArticleCategory;
import com.mdd.common.mapper.article.ArticleCategoryMapper;
import com.mdd.common.mapper.article.ArticleMapper;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
@@ -56,8 +56,8 @@ public class ArtCateServiceImpl implements IArtCateService {
ArticleCateVo vo = new ArticleCateVo();
BeanUtils.copyProperties(category, vo);
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(vo.getUpdateTime()));
vos.add(vo);
}
@@ -98,8 +98,8 @@ public class ArtCateServiceImpl implements IArtCateService {
.eq("is_delete", 0));
vo.setNumber(number);
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(vo.getUpdateTime()));
list.add(vo);
}
@@ -127,8 +127,8 @@ public class ArtCateServiceImpl implements IArtCateService {
ArticleCateVo vo = new ArticleCateVo();
BeanUtils.copyProperties(model, vo);
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(model.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(model.getUpdateTime()));
return vo;
}
@@ -145,8 +145,8 @@ public class ArtCateServiceImpl implements IArtCateService {
model.setName(createValidate.getName());
model.setSort(createValidate.getSort());
model.setIsShow(model.getIsShow());
model.setCreateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtil.timestamp());
model.setCreateTime(TimeUtils.timestamp());
model.setUpdateTime(TimeUtils.timestamp());
articleCategoryMapper.insert(model);
}
@@ -171,7 +171,7 @@ public class ArtCateServiceImpl implements IArtCateService {
model.setName(updateValidate.getName());
model.setSort(updateValidate.getSort());
model.setIsShow(updateValidate.getIsShow());
model.setUpdateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtils.timestamp());
articleCategoryMapper.updateById(model);
}
@@ -199,7 +199,7 @@ public class ArtCateServiceImpl implements IArtCateService {
Assert.isNull(article, "当前分类已被文章使用,请先移除!");
model.setIsDelete(1);
model.setDeleteTime(TimeUtil.timestamp());
model.setDeleteTime(TimeUtils.timestamp());
articleCategoryMapper.updateById(model);
}
@@ -220,7 +220,7 @@ public class ArtCateServiceImpl implements IArtCateService {
Assert.notNull(model, "分类不存在");
model.setIsShow(model.getIsShow()==0?1:0);
model.setUpdateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtils.timestamp());
articleCategoryMapper.updateById(model);
}

34
server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java
View File

@@ -17,9 +17,9 @@ import com.mdd.common.entity.article.Article;
import com.mdd.common.entity.article.ArticleCategory;
import com.mdd.common.mapper.article.ArticleCategoryMapper;
import com.mdd.common.mapper.article.ArticleMapper;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.TimeUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
@@ -72,9 +72,9 @@ public class ArticleServiceImpl implements IArticleService {
mpjQueryWrapper);
for (ArticleListedVo vo : iPage.getRecords()) {
vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage()));
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime()));
vo.setImage(UrlUtils.toAbsoluteUrl(vo.getImage()));
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(vo.getUpdateTime()));
}
return PageResult.iPageHandle(iPage);
@@ -100,10 +100,10 @@ public class ArticleServiceImpl implements IArticleService {
ArticleDetailVo vo = new ArticleDetailVo();
BeanUtils.copyProperties(model, vo);
vo.setContent(StringUtil.isNull(model.getContent()) ? "" : model.getContent());
vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage()));
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
vo.setContent(StringUtils.isNull(model.getContent()) ? "" : model.getContent());
vo.setImage(UrlUtils.toAbsoluteUrl(model.getImage()));
vo.setCreateTime(TimeUtils.timestampToDate(model.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(model.getUpdateTime()));
return vo;
}
@@ -119,7 +119,7 @@ public class ArticleServiceImpl implements IArticleService {
Article model = new Article();
model.setCid(createValidate.getCid());
model.setTitle(createValidate.getTitle());
model.setImage(UrlUtil.toRelativeUrl(createValidate.getImage()));
model.setImage(UrlUtils.toRelativeUrl(createValidate.getImage()));
model.setIntro(createValidate.getIntro());
model.setContent(createValidate.getContent());
model.setSummary(createValidate.getSummary());
@@ -127,8 +127,8 @@ public class ArticleServiceImpl implements IArticleService {
model.setIsShow(createValidate.getIsShow());
model.setAuthor(createValidate.getAuthor());
model.setVisit(createValidate.getVisit());
model.setCreateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtil.timestamp());
model.setCreateTime(TimeUtils.timestamp());
model.setUpdateTime(TimeUtils.timestamp());
articleMapper.insert(model);
}
@@ -154,7 +154,7 @@ public class ArticleServiceImpl implements IArticleService {
model.setCid(updateValidate.getCid());
model.setTitle(updateValidate.getTitle());
model.setImage(UrlUtil.toRelativeUrl(updateValidate.getImage()));
model.setImage(UrlUtils.toRelativeUrl(updateValidate.getImage()));
model.setIntro(updateValidate.getIntro());
model.setContent(updateValidate.getContent());
model.setSummary(updateValidate.getSummary());
@@ -162,7 +162,7 @@ public class ArticleServiceImpl implements IArticleService {
model.setIsShow(updateValidate.getIsShow());
model.setAuthor(updateValidate.getAuthor());
model.setSort(updateValidate.getSort());
model.setUpdateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtils.timestamp());
articleMapper.updateById(model);
}
@@ -183,7 +183,7 @@ public class ArticleServiceImpl implements IArticleService {
Assert.notNull(article, "文章不存在!");
article.setIsDelete(1);
article.setDeleteTime(TimeUtil.timestamp());
article.setDeleteTime(TimeUtils.timestamp());
articleMapper.updateById(article);
}
@@ -204,7 +204,7 @@ public class ArticleServiceImpl implements IArticleService {
Assert.notNull(article, "文章不存在!");
article.setIsShow(article.getIsShow()==0?1:0);
article.setUpdateTime(TimeUtil.timestamp());
article.setUpdateTime(TimeUtils.timestamp());
articleMapper.updateById(article);
}

10
server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelH5ConfigServiceImpl.java
View File

@@ -3,7 +3,7 @@ package com.mdd.admin.service.impl;
import com.mdd.admin.service.IChannelH5ConfigService;
import com.mdd.admin.validate.channel.ChannelH5Validate;
import com.mdd.admin.vo.channel.ChannelH5Vo;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.util.ConfigUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@@ -22,7 +22,7 @@ public class ChannelH5ConfigServiceImpl implements IChannelH5ConfigService {
*/
@Override
public ChannelH5Vo detail() {
Map<String, String> config = ConfigUtil.get("h5_channel");
Map<String, String> config = ConfigUtils.get("h5_channel");
ChannelH5Vo vo = new ChannelH5Vo();
vo.setStatus(Integer.parseInt(config.getOrDefault("status", "0")));
vo.setClose(Integer.parseInt(config.getOrDefault("close", "0")));
@@ -38,9 +38,9 @@ public class ChannelH5ConfigServiceImpl implements IChannelH5ConfigService {
*/
@Override
public void save(ChannelH5Validate channelH5Validate) {
ConfigUtil.set("h5_channel", "status", String.valueOf(channelH5Validate.getStatus()));
ConfigUtil.set("h5_channel", "close", String.valueOf(channelH5Validate.getClose()));
ConfigUtil.set("h5_channel", "url", channelH5Validate.getUrl());
ConfigUtils.set("h5_channel", "status", String.valueOf(channelH5Validate.getStatus()));
ConfigUtils.set("h5_channel", "close", String.valueOf(channelH5Validate.getClose()));
ConfigUtils.set("h5_channel", "url", channelH5Validate.getUrl());
}
}

22
server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java
View File

@@ -3,9 +3,9 @@ package com.mdd.admin.service.impl;
import com.mdd.admin.service.IChannelMpConfigService;
import com.mdd.admin.validate.channel.ChannelMpValidate;
import com.mdd.admin.vo.channel.ChannelMpVo;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.RequestUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.RequestUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@@ -24,17 +24,17 @@ public class ChannelMpConfigServiceImpl implements IChannelMpConfigService {
*/
@Override
public ChannelMpVo detail() {
Map<String, String> config = ConfigUtil.get("mp_channel");
Map<String, String> config = ConfigUtils.get("mp_channel");
ChannelMpVo vo = new ChannelMpVo();
vo.setName(config.getOrDefault("name", ""));
vo.setPrimaryId(config.getOrDefault("primaryId", ""));
vo.setAppId(config.getOrDefault("appId", ""));
vo.setAppSecret(config.getOrDefault("appSecret", ""));
vo.setQrCode(UrlUtil.toAbsoluteUrl(config.getOrDefault("qrCode", "")));
vo.setQrCode(UrlUtils.toAbsoluteUrl(config.getOrDefault("qrCode", "")));
String domain = RequestUtil.domain();
String domain = RequestUtils.domain();
vo.setRequestDomain(domain);
vo.setSocketDomain(domain);
vo.setUploadFileDomain(domain);
@@ -54,11 +54,11 @@ public class ChannelMpConfigServiceImpl implements IChannelMpConfigService {
*/
@Override
public void save(ChannelMpValidate channelMpValidate) {
ConfigUtil.set("mp_channel", "name", channelMpValidate.getName());
ConfigUtil.set("mp_channel", "primaryId", channelMpValidate.getPrimaryId());
ConfigUtil.set("mp_channel", "appId", channelMpValidate.getAppId());
ConfigUtil.set("mp_channel", "appSecret", channelMpValidate.getAppSecret());
ConfigUtil.set("mp_channel", "qrCode", UrlUtil.toRelativeUrl(channelMpValidate.getQrCode()));
ConfigUtils.set("mp_channel", "name", channelMpValidate.getName());
ConfigUtils.set("mp_channel", "primaryId", channelMpValidate.getPrimaryId());
ConfigUtils.set("mp_channel", "appId", channelMpValidate.getAppId());
ConfigUtils.set("mp_channel", "appSecret", channelMpValidate.getAppSecret());
ConfigUtils.set("mp_channel", "qrCode", UrlUtils.toRelativeUrl(channelMpValidate.getQrCode()));
}
}

30
server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaConfigServiceImpl.java
View File

@@ -3,9 +3,9 @@ package com.mdd.admin.service.impl;
import com.mdd.admin.service.IChannelOaConfigService;
import com.mdd.admin.validate.channel.ChannelOaValidate;
import com.mdd.admin.vo.channel.ChannelOaVo;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.RequestUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.RequestUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@@ -24,10 +24,10 @@ public class ChannelOaConfigServiceImpl implements IChannelOaConfigService {
*/
@Override
public ChannelOaVo detail() {
Map<String, String> config = ConfigUtil.get("oa_channel");
Map<String, String> config = ConfigUtils.get("oa_channel");
ChannelOaVo vo = new ChannelOaVo();
vo.setQrCode(UrlUtil.toAbsoluteUrl(config.getOrDefault("qrCode", "")));
vo.setQrCode(UrlUtils.toAbsoluteUrl(config.getOrDefault("qrCode", "")));
vo.setName(config.getOrDefault("name", ""));
vo.setPrimaryId(config.getOrDefault("primaryId", ""));
vo.setAppId(config.getOrDefault("appId", ""));
@@ -37,7 +37,7 @@ public class ChannelOaConfigServiceImpl implements IChannelOaConfigService {
vo.setEncodingAesKey(config.getOrDefault("encodingAesKey", ""));
vo.setEncryptionType(Integer.parseInt(config.getOrDefault("encryptionType", "1")));
String domain = RequestUtil.domain();
String domain = RequestUtils.domain();
vo.setBusinessDomain(domain);
vo.setJsDomain(domain);
vo.setWebDomain(domain);
@@ -53,15 +53,15 @@ public class ChannelOaConfigServiceImpl implements IChannelOaConfigService {
*/
@Override
public void save(ChannelOaValidate channelOaValidate) {
ConfigUtil.set("oa_channel", "name", channelOaValidate.getName());
ConfigUtil.set("oa_channel", "primaryId", channelOaValidate.getPrimaryId());
ConfigUtil.set("oa_channel", "qrCode", UrlUtil.toRelativeUrl(channelOaValidate.getQrCode()));
ConfigUtil.set("oa_channel", "appId", channelOaValidate.getAppId());
ConfigUtil.set("oa_channel", "appSecret", channelOaValidate.getAppSecret());
ConfigUtil.set("oa_channel", "url", channelOaValidate.getUrl());
ConfigUtil.set("oa_channel", "token", channelOaValidate.getToken());
ConfigUtil.set("oa_channel", "encodingAesKey", channelOaValidate.getEncodingAesKey());
ConfigUtil.set("oa_channel", "encryptionType", String.valueOf(channelOaValidate.getEncryptionType()));
ConfigUtils.set("oa_channel", "name", channelOaValidate.getName());
ConfigUtils.set("oa_channel", "primaryId", channelOaValidate.getPrimaryId());
ConfigUtils.set("oa_channel", "qrCode", UrlUtils.toRelativeUrl(channelOaValidate.getQrCode()));
ConfigUtils.set("oa_channel", "appId", channelOaValidate.getAppId());
ConfigUtils.set("oa_channel", "appSecret", channelOaValidate.getAppSecret());
ConfigUtils.set("oa_channel", "url", channelOaValidate.getUrl());
ConfigUtils.set("oa_channel", "token", channelOaValidate.getToken());
ConfigUtils.set("oa_channel", "encodingAesKey", channelOaValidate.getEncodingAesKey());
ConfigUtils.set("oa_channel", "encryptionType", String.valueOf(channelOaValidate.getEncryptionType()));
}
}

12
server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaMenusServiceImpl.java
View File

@@ -5,7 +5,7 @@ import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.mdd.admin.service.IChannelOaMenusService;
import com.mdd.common.exception.OperateException;
import com.mdd.common.utils.*;
import com.mdd.common.util.*;
import me.chanjar.weixin.common.bean.menu.WxMenu;
import me.chanjar.weixin.common.bean.menu.WxMenuButton;
import me.chanjar.weixin.common.error.WxErrorException;
@@ -29,7 +29,7 @@ public class ChannelOaMenusServiceImpl implements IChannelOaMenusService {
*/
@Override
public JSONArray detail() {
String json = ConfigUtil.get("oa_channel", "menus", "[]");
String json = ConfigUtils.get("oa_channel", "menus", "[]");
return JSONArray.parseArray(json);
}
@@ -48,7 +48,7 @@ public class ChannelOaMenusServiceImpl implements IChannelOaMenusService {
List<Map<String, String>> params = new LinkedList<>();
for (Object o : objs) {
params.add(ToolsUtil.objectToMap(o));
params.add(ToolsUtils.objectToMap(o));
}
List<WxMenuButton> menuButtons = new LinkedList<>();
@@ -79,7 +79,7 @@ public class ChannelOaMenusServiceImpl implements IChannelOaMenusService {
// 子级菜单
if (Integer.parseInt(item.get("menuType")) == 2) {
Assert.notNull(item.get("subButtons"), "子级菜单不能为空");
List<Map<String, String>> subButtons = ArrayUtil.stringToListAsMapStr(item.get("subButtons"));
List<Map<String, String>> subButtons = ArrayUtils.stringToListAsMapStr(item.get("subButtons"));
if (subButtons.size() > 5) {
throw new OperateException("子级菜单超出限制(最多5个)");
@@ -105,14 +105,14 @@ public class ChannelOaMenusServiceImpl implements IChannelOaMenusService {
}
}
ConfigUtil.set("oa_channel", "menus", JSON.toJSONString(objs));
ConfigUtils.set("oa_channel", "menus", JSON.toJSONString(objs));
if (isPublish) {
try {
WxMenu wxMenu = new WxMenu();
wxMenu.setButtons(menuButtons);
WxMpService wxMpService = WeChatUtil.official();
WxMpService wxMpService = WeChatUtils.official();
WxMpMenuService wxMpMenuService = new WxMpMenuServiceImpl(wxMpService);
wxMpMenuService.menuCreate(wxMenu);
} catch (WxErrorException e) {

6
server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java
View File

@@ -13,7 +13,7 @@ import com.mdd.admin.vo.CrontabListedVo;
import com.mdd.common.core.PageResult;
import com.mdd.common.entity.Crontab;
import com.mdd.common.mapper.CrontabMapper;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.TimeUtils;
import org.quartz.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -74,8 +74,8 @@ public class CrontabServiceImpl implements ICrontabService {
CrontabListedVo vo = new CrontabListedVo();
BeanUtils.copyProperties(crontab, vo);
vo.setStartTime(crontab.getStartTime()<=0?"-": TimeUtil.timestampToDate(crontab.getStartTime()));
vo.setEndTime(crontab.getEndTime()<=0?"-": TimeUtil.timestampToDate(crontab.getEndTime()));
vo.setStartTime(crontab.getStartTime()<=0?"-": TimeUtils.timestampToDate(crontab.getStartTime()));
vo.setEndTime(crontab.getEndTime()<=0?"-": TimeUtils.timestampToDate(crontab.getEndTime()));
list.add(vo);
}

8
server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateDataServiceImpl.java
View File

@@ -5,8 +5,8 @@ import com.mdd.admin.service.IDecorateDataService;
import com.mdd.admin.vo.decorate.DecorateDataArticleVo;
import com.mdd.common.entity.article.Article;
import com.mdd.common.mapper.article.ArticleMapper;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.TimeUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -43,8 +43,8 @@ public class DecorateDataServiceImpl implements IDecorateDataService {
for (Article article : articles) {
DecorateDataArticleVo vo = new DecorateDataArticleVo();
BeanUtils.copyProperties(article, vo);
vo.setImage(UrlUtil.toAbsoluteUrl(article.getImage()));
vo.setCreateTime(TimeUtil.timestampToDate(article.getCreateTime()));
vo.setImage(UrlUtils.toAbsoluteUrl(article.getImage()));
vo.setCreateTime(TimeUtils.timestampToDate(article.getCreateTime()));
list.add(vo);
}

23
server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java
View File

@@ -1,7 +1,6 @@
package com.mdd.admin.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mdd.admin.service.IDecorateTabbarService;
import com.mdd.admin.validate.DecorateTabsValidate;
@@ -9,7 +8,7 @@ import com.mdd.admin.vo.decorate.DecorateTabsListsVo;
import com.mdd.admin.vo.decorate.DecorateTabbarVo;
import com.mdd.common.entity.DecorateTabbar;
import com.mdd.common.mapper.DecorateTabbarMapper;
import com.mdd.common.utils.*;
import com.mdd.common.util.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,18 +43,18 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService {
DecorateTabsListsVo vo = new DecorateTabsListsVo();
vo.setId(tab.getId());
vo.setName(tab.getName());
vo.setSelected(UrlUtil.toAbsoluteUrl(tab.getSelected()));
vo.setUnselected(UrlUtil.toAbsoluteUrl(tab.getUnselected()));
vo.setSelected(UrlUtils.toAbsoluteUrl(tab.getSelected()));
vo.setUnselected(UrlUtils.toAbsoluteUrl(tab.getUnselected()));
vo.setLink(JSON.parse(tab.getLink()));
vo.setCreateTime(TimeUtil.timestampToDate(tab.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(tab.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(tab.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(tab.getUpdateTime()));
tabList.add(vo);
}
String tabbar = ConfigUtil.get("tabbar", "style", "{}");
String tabbar = ConfigUtils.get("tabbar", "style", "{}");
DecorateTabbarVo response = new DecorateTabbarVo();
response.setStyle(ToolsUtil.jsonToMap(tabbar));
response.setStyle(ToolsUtils.jsonToMap(tabbar));
response.setList(tabList);
return response;
}
@@ -75,15 +74,15 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService {
DecorateTabbar model = new DecorateTabbar();
model.setName(obj.getName());
model.setLink(JSON.toJSONString(obj.getLink()));
model.setSelected(UrlUtil.toRelativeUrl(obj.getSelected()));
model.setUnselected(UrlUtil.toRelativeUrl(obj.getUnselected()));
model.setSelected(UrlUtils.toRelativeUrl(obj.getSelected()));
model.setUnselected(UrlUtils.toRelativeUrl(obj.getUnselected()));
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
decorateTabbarMapper.insert(model);
}
if (StringUtil.isNotNull(tabsValidate.getStyle())) {
ConfigUtil.set("tabbar", "style", JSON.toJSONString(tabsValidate.getStyle()));
if (StringUtils.isNotNull(tabsValidate.getStyle())) {
ConfigUtils.set("tabbar", "style", JSON.toJSONString(tabsValidate.getStyle()));
}
}

26
server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexServiceImpl.java
View File

@@ -2,10 +2,10 @@ package com.mdd.admin.service.impl;
import com.mdd.admin.service.IIndexService;
import com.mdd.common.config.GlobalConfig;
import com.mdd.common.utils.ArrayUtil;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.ArrayUtils;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.TimeUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -28,7 +28,7 @@ public class IndexServiceImpl implements IIndexService {
// 版本信息
Map<String, Object> version = new LinkedHashMap<>();
version.put("name", ConfigUtil.get("website", "name", "LikeAdmin-Java"));
version.put("name", ConfigUtils.get("website", "name", "LikeAdmin-Java"));
version.put("version", GlobalConfig.version);
version.put("website", "www.likeadmin.cn");
version.put("based", "Vue3.x、ElementUI、MySQL");
@@ -53,7 +53,7 @@ public class IndexServiceImpl implements IIndexService {
// 访客图表
Map<String, Object> visitor = new LinkedHashMap<>();
visitor.put("date", TimeUtil.daysAgoDate(15));
visitor.put("date", TimeUtils.daysAgoDate(15));
visitor.put("list", Arrays.asList(12,13,11,5,8,22,14,9,456,62,78,12,18,22,46));
console.put("visitor", visitor);
@@ -68,16 +68,16 @@ public class IndexServiceImpl implements IIndexService {
*/
@Override
public Map<String, Object> config() {
Map<String, String> website = ConfigUtil.get("website");
String copyright = ConfigUtil.get("website", "copyright", "");
Map<String, String> website = ConfigUtils.get("website");
String copyright = ConfigUtils.get("website", "copyright", "");
Map<String, Object> map = new LinkedHashMap<>();
map.put("webName", website.getOrDefault("name", ""));
map.put("webLogo", UrlUtil.toAbsoluteUrl(website.getOrDefault("logo", "")));
map.put("webFavicon", UrlUtil.toAbsoluteUrl(website.getOrDefault("favicon", "")));
map.put("webBackdrop", UrlUtil.toAbsoluteUrl(website.getOrDefault("backdrop", "")));
map.put("ossDomain", UrlUtil.domain());
map.put("copyright", ArrayUtil.stringToListAsMapStr(copyright));
map.put("webLogo", UrlUtils.toAbsoluteUrl(website.getOrDefault("logo", "")));
map.put("webFavicon", UrlUtils.toAbsoluteUrl(website.getOrDefault("favicon", "")));
map.put("webBackdrop", UrlUtils.toAbsoluteUrl(website.getOrDefault("backdrop", "")));
map.put("ossDomain", UrlUtils.domain());
map.put("copyright", ArrayUtils.stringToListAsMapStr(copyright));
return map;
}

10
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingCopyrightServiceImpl.java
View File

@@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSON;
import com.mdd.admin.service.ISettingCopyrightService;
import com.mdd.admin.validate.setting.SettingCopyrightValidate;
import com.mdd.admin.vo.setting.SettingCopyrightVo;
import com.mdd.common.utils.ArrayUtil;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.util.ArrayUtils;
import com.mdd.common.util.ConfigUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -24,8 +24,8 @@ public class SettingCopyrightServiceImpl implements ISettingCopyrightService {
*/
@Override
public List<SettingCopyrightVo> detail() {
String config = ConfigUtil.get("website", "copyright", "[]");
List<Map<String, String>> copyright = ArrayUtil.stringToListAsMapStr(config);
String config = ConfigUtils.get("website", "copyright", "[]");
List<Map<String, String>> copyright = ArrayUtils.stringToListAsMapStr(config);
List<SettingCopyrightVo> list = new LinkedList<>();
for (Map<String, String> map : copyright) {
@@ -47,7 +47,7 @@ public class SettingCopyrightServiceImpl implements ISettingCopyrightService {
@Override
public void save(SettingCopyrightValidate copyrightValidate) {
String s = JSON.toJSONString(copyrightValidate.getList());
ConfigUtil.set("website", "copyright", s);
ConfigUtils.set("website", "copyright", s);
}
}

14
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingDictDataServiceImpl.java
View File

@@ -14,7 +14,7 @@ import com.mdd.common.entity.setting.DictData;
import com.mdd.common.entity.setting.DictType;
import com.mdd.common.mapper.setting.DictDataMapper;
import com.mdd.common.mapper.setting.DictTypeMapper;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -69,8 +69,8 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
SettingDictDataVo vo = new SettingDictDataVo();
BeanUtils.copyProperties(dictData, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictData.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(dictData.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(dictData.getUpdateTime()));
list.add(vo);
}
@@ -116,8 +116,8 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
SettingDictDataVo vo = new SettingDictDataVo();
BeanUtils.copyProperties(dictData, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictData.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(dictData.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(dictData.getUpdateTime()));
list.add(vo);
}
@@ -143,8 +143,8 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
SettingDictDataVo vo = new SettingDictDataVo();
BeanUtils.copyProperties(dictData, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictData.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictData.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(dictData.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(dictData.getUpdateTime()));
return vo;
}

14
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingDictTypeServiceImpl.java
View File

@@ -12,7 +12,7 @@ import com.mdd.admin.vo.setting.SettingDictTypeVo;
import com.mdd.common.core.PageResult;
import com.mdd.common.entity.setting.DictType;
import com.mdd.common.mapper.setting.DictTypeMapper;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -50,8 +50,8 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService {
SettingDictTypeVo vo = new SettingDictTypeVo();
BeanUtils.copyProperties(dictType, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictType.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(dictType.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(dictType.getUpdateTime()));
list.add(vo);
}
@@ -89,8 +89,8 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService {
SettingDictTypeVo vo = new SettingDictTypeVo();
BeanUtils.copyProperties(dictType, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictType.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(dictType.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(dictType.getUpdateTime()));
list.add(vo);
}
@@ -116,8 +116,8 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService {
SettingDictTypeVo vo = new SettingDictTypeVo();
BeanUtils.copyProperties(dictType, vo);
vo.setCreateTime(TimeUtil.timestampToDate(dictType.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(dictType.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(dictType.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(dictType.getUpdateTime()));
return vo;
}

21
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingLoginServiceImpl.java
View File

@@ -3,11 +3,10 @@ package com.mdd.admin.service.impl;
import com.mdd.admin.service.ISettingLoginService;
import com.mdd.admin.validate.setting.SettingLoginValidate;
import com.mdd.admin.vo.setting.SettingLoginVo;
import com.mdd.common.utils.ArrayUtil;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.util.ArrayUtils;
import com.mdd.common.util.ConfigUtils;
import org.springframework.stereotype.Service;
import java.util.LinkedHashMap;
import java.util.Map;
/**
@@ -24,14 +23,14 @@ public class SettingLoginServiceImpl implements ISettingLoginService {
*/
@Override
public SettingLoginVo detail() {
Map<String, String> config = ConfigUtil.get("login");
Map<String, String> config = ConfigUtils.get("login");
SettingLoginVo vo = new SettingLoginVo();
vo.setLoginWay(ArrayUtil.stringToListAsInt(config.getOrDefault("loginWay", ""), ","));
vo.setLoginWay(ArrayUtils.stringToListAsInt(config.getOrDefault("loginWay", ""), ","));
vo.setForceBindMobile(Integer.parseInt(config.getOrDefault("forceBindMobile", "0")));
vo.setOpenAgreement(Integer.parseInt(config.getOrDefault("openAgreement", "0")));
vo.setOpenOtherAuth(Integer.parseInt(config.getOrDefault("openOtherAuth", "0")));
vo.setAutoLoginAuth(ArrayUtil.stringToListAsInt(config.getOrDefault("autoLoginAuth", ""), ","));
vo.setAutoLoginAuth(ArrayUtils.stringToListAsInt(config.getOrDefault("autoLoginAuth", ""), ","));
return vo;
}
@@ -43,11 +42,11 @@ public class SettingLoginServiceImpl implements ISettingLoginService {
*/
@Override
public void save(SettingLoginValidate loginValidate) {
ConfigUtil.set("login", "loginWay", loginValidate.getLoginWay());
ConfigUtil.set("login", "forceBindMobile", String.valueOf(loginValidate.getForceBindMobile()));
ConfigUtil.set("login", "openAgreement", String.valueOf(loginValidate.getOpenAgreement()));
ConfigUtil.set("login", "openOtherAuth", String.valueOf(loginValidate.getOpenOtherAuth()));
ConfigUtil.set("login", "autoLoginAuth", String.valueOf(loginValidate.getAutoLoginAuth()));
ConfigUtils.set("login", "loginWay", loginValidate.getLoginWay());
ConfigUtils.set("login", "forceBindMobile", String.valueOf(loginValidate.getForceBindMobile()));
ConfigUtils.set("login", "openAgreement", String.valueOf(loginValidate.getOpenAgreement()));
ConfigUtils.set("login", "openOtherAuth", String.valueOf(loginValidate.getOpenOtherAuth()));
ConfigUtils.set("login", "autoLoginAuth", String.valueOf(loginValidate.getAutoLoginAuth()));
}
}

50
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java
View File

@@ -7,9 +7,9 @@ import com.mdd.admin.vo.setting.SettingNoticeDetailVo;
import com.mdd.admin.vo.setting.SettingNoticeListedVo;
import com.mdd.common.entity.notice.NoticeSetting;
import com.mdd.common.mapper.notice.NoticeSettingMapper;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.utils.ToolsUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.TimeUtils;
import com.mdd.common.util.ToolsUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -47,18 +47,18 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
SettingNoticeListedVo vo = new SettingNoticeListedVo();
BeanUtils.copyProperties(n, vo);
Map<String, String> systemMap = ToolsUtil.jsonToMap(n.getSystemNotice());
Map<String, String> smsMap = ToolsUtil.jsonToMap(n.getSmsNotice());
Map<String, String> oaMap = ToolsUtil.jsonToMap(n.getOaNotice());
Map<String, String> mnpMap = ToolsUtil.jsonToMap(n.getMnpNotice());
Map<String, String> systemMap = ToolsUtils.jsonToMap(n.getSystemNotice());
Map<String, String> smsMap = ToolsUtils.jsonToMap(n.getSmsNotice());
Map<String, String> oaMap = ToolsUtils.jsonToMap(n.getOaNotice());
Map<String, String> mnpMap = ToolsUtils.jsonToMap(n.getMnpNotice());
vo.setType(n.getType()==1?"业务通知":"验证码");
vo.setSystemStatus(Integer.parseInt(systemMap.getOrDefault("status", "0")));
vo.setSmsStatus(Integer.parseInt(smsMap.getOrDefault("status", "0")));
vo.setOaStatus(Integer.parseInt(oaMap.getOrDefault("status", "0")));
vo.setMnpStatus(Integer.parseInt(mnpMap.getOrDefault("status", "0")));
vo.setCreateTime(TimeUtil.timestampToDate(n.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(n.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(n.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(n.getUpdateTime()));
list.add(vo);
}
@@ -86,10 +86,10 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
.eq("is_delete", 0)
.last("limit 1"));
Map<String, Object> systemMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSystemNotice());
Map<String, Object> oaMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getOaNotice());
Map<String, Object> mnpMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getMnpNotice());
Map<String, Object> smsMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getSmsNotice());
Map<String, Object> systemMap = ToolsUtils.jsonToMapAsObj(noticeSetting.getSystemNotice());
Map<String, Object> oaMap = ToolsUtils.jsonToMapAsObj(noticeSetting.getOaNotice());
Map<String, Object> mnpMap = ToolsUtils.jsonToMapAsObj(noticeSetting.getMnpNotice());
Map<String, Object> smsMap = ToolsUtils.jsonToMapAsObj(noticeSetting.getSmsNotice());
smsMap.put("tips", JSON.parseArray(smsMap.get("tips").toString()));
@@ -117,27 +117,27 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
.eq("is_delete", 0)
.last("limit 1"));
Map<String, String> systemParam = ToolsUtil.objectToMap(params.get("systemNotice"));
Map<String, String> systemMap = ToolsUtil.jsonToMap(noticeSetting.getSystemNotice());
if (!StringUtil.isNotEmpty(systemMap)) {
Map<String, String> systemParam = ToolsUtils.objectToMap(params.get("systemNotice"));
Map<String, String> systemMap = ToolsUtils.jsonToMap(noticeSetting.getSystemNotice());
if (!StringUtils.isNotEmpty(systemMap)) {
systemMap.put("title", systemParam.getOrDefault("title", ""));
systemMap.put("content", systemParam.getOrDefault("content", ""));
systemMap.put("tips", systemParam.getOrDefault("tips", ""));
systemMap.put("status", systemParam.getOrDefault("status", "0"));
}
Map<String, String> smsParam = ToolsUtil.objectToMap(params.get("smsNotice"));
Map<String, String> smsMap = ToolsUtil.jsonToMap(noticeSetting.getSmsNotice());
if (!StringUtil.isNotEmpty(smsMap)) {
Map<String, String> smsParam = ToolsUtils.objectToMap(params.get("smsNotice"));
Map<String, String> smsMap = ToolsUtils.jsonToMap(noticeSetting.getSmsNotice());
if (!StringUtils.isNotEmpty(smsMap)) {
smsMap.put("templateId", smsParam.getOrDefault("templateId", ""));
smsMap.put("content", smsParam.getOrDefault("content", ""));
smsMap.put("tips", smsParam.getOrDefault("tips", ""));
smsMap.put("status", smsParam.getOrDefault("status", "0"));
}
Map<String, String> oaParam = ToolsUtil.objectToMap(params.get("oaNotice"));
Map<String, String> oaMap = ToolsUtil.jsonToMap(noticeSetting.getOaNotice());
if (!StringUtil.isNotEmpty(oaMap)) {
Map<String, String> oaParam = ToolsUtils.objectToMap(params.get("oaNotice"));
Map<String, String> oaMap = ToolsUtils.jsonToMap(noticeSetting.getOaNotice());
if (!StringUtils.isNotEmpty(oaMap)) {
oaMap.put("name", oaParam.getOrDefault("name", ""));
oaMap.put("first", oaParam.getOrDefault("first", ""));
oaMap.put("remark", oaParam.getOrDefault("remark", ""));
@@ -148,9 +148,9 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
oaMap.put("status", oaParam.getOrDefault("status", "0"));
}
Map<String, String> mnpParam = ToolsUtil.objectToMap(params.get("mnpNotice"));
Map<String, String> mnpMap = ToolsUtil.jsonToMap(noticeSetting.getMnpNotice());
if (!StringUtil.isNotEmpty(mnpParam)) {
Map<String, String> mnpParam = ToolsUtils.objectToMap(params.get("mnpNotice"));
Map<String, String> mnpMap = ToolsUtils.jsonToMap(noticeSetting.getMnpNotice());
if (!StringUtils.isNotEmpty(mnpParam)) {
mnpMap.put("templateId", mnpParam.get("templateId"));
mnpMap.put("templateSn", mnpParam.get("templateSn"));
mnpMap.put("tpl", mnpParam.get("tpl"));

16
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingProtocolServiceImpl.java
View File

@@ -5,8 +5,8 @@ import com.mdd.admin.service.ISettingProtocolService;
import com.mdd.admin.validate.setting.SettingProtocolValidate;
import com.mdd.admin.vo.setting.SettingProtocolDetailVo;
import com.mdd.admin.vo.setting.SettingProtocolObjectVo;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.ToolsUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.ToolsUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@@ -25,10 +25,10 @@ public class SettingProtocolServiceImpl implements ISettingProtocolService {
*/
@Override
public SettingProtocolDetailVo detail() {
String service = ConfigUtil.get("protocol", "service", "{\"name\":\"\",\"content\":\"\"}");
String privacy = ConfigUtil.get("protocol", "privacy", "{\"name\":\"\",\"content\":\"\"}");
Map<String, String> serviceMap = ToolsUtil.jsonToMap(service);
Map<String, String> privacyMap = ToolsUtil.jsonToMap(privacy);
String service = ConfigUtils.get("protocol", "service", "{\"name\":\"\",\"content\":\"\"}");
String privacy = ConfigUtils.get("protocol", "privacy", "{\"name\":\"\",\"content\":\"\"}");
Map<String, String> serviceMap = ToolsUtils.jsonToMap(service);
Map<String, String> privacyMap = ToolsUtils.jsonToMap(privacy);
SettingProtocolObjectVo serviceObj = new SettingProtocolObjectVo();
serviceObj.setName(serviceMap.getOrDefault("name", ""));
@@ -52,8 +52,8 @@ public class SettingProtocolServiceImpl implements ISettingProtocolService {
*/
@Override
public void save(SettingProtocolValidate protocolValidate) {
ConfigUtil.set("protocol","service", JSON.toJSONString(protocolValidate.getService()));
ConfigUtil.set("protocol","privacy", JSON.toJSONString(protocolValidate.getPrivacy()));
ConfigUtils.set("protocol","service", JSON.toJSONString(protocolValidate.getService()));
ConfigUtils.set("protocol","privacy", JSON.toJSONString(protocolValidate.getPrivacy()));
}
}

6
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSearchServiceImpl.java
View File

@@ -7,7 +7,7 @@ import com.mdd.admin.vo.setting.SettingSearchDetailVo;
import com.mdd.admin.vo.setting.SettingSearchObjectVo;
import com.mdd.common.entity.setting.HotSearch;
import com.mdd.common.mapper.setting.HotSearchMapper;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.util.ConfigUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -30,7 +30,7 @@ public class SettingSearchServiceImpl implements ISettingSearchService {
*/
@Override
public SettingSearchDetailVo detail() {
Integer isHotSearch = Integer.parseInt(ConfigUtil.get("search", "isHotSearch", "0"));
Integer isHotSearch = Integer.parseInt(ConfigUtils.get("search", "isHotSearch", "0"));
List<HotSearch> list = hotSearchMapper.selectList(new QueryWrapper<HotSearch>().orderByDesc("sort"));
SettingSearchDetailVo vo = new SettingSearchDetailVo();
@@ -48,7 +48,7 @@ public class SettingSearchServiceImpl implements ISettingSearchService {
@Override
public void save(SettingSearchValidate searchValidate) {
String isHotSearch = String.valueOf(searchValidate.getIsHotSearch());
ConfigUtil.set("search", "isHotSearch", isHotSearch);
ConfigUtils.set("search", "isHotSearch", isHotSearch);
hotSearchMapper.delete(new QueryWrapper<HotSearch>().ge("id", 0));
for (SettingSearchObjectVo vo : searchValidate.getList()) {

20
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSmsServiceImpl.java
View File

@@ -2,8 +2,8 @@ package com.mdd.admin.service.impl;
import com.alibaba.fastjson2.JSON;
import com.mdd.admin.service.ISettingSmsService;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.StringUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -22,7 +22,7 @@ public class SettingSmsServiceImpl implements ISettingSmsService {
*/
@Override
public List<Map<String, Object>> list() {
String engine = ConfigUtil.get("sms", "default", "aliyun");
String engine = ConfigUtils.get("sms", "default", "aliyun");
List<Map<String, Object>> list = new LinkedList<>();
Map<String, Object> aliyun = new LinkedHashMap<>();
@@ -48,9 +48,9 @@ public class SettingSmsServiceImpl implements ISettingSmsService {
*/
@Override
public Map<String, Object> detail(String alias) {
String engine = ConfigUtil.get("sms", "default", "local");
Map<String, String> config = ConfigUtil.getMap("sms", alias);
config = StringUtil.isNotNull(config) ? config : Collections.emptyMap();
String engine = ConfigUtils.get("sms", "default", "local");
Map<String, String> config = ConfigUtils.getMap("sms", alias);
config = StringUtils.isNotNull(config) ? config : Collections.emptyMap();
Map<String, Object> map = new LinkedHashMap<>();
map.put("name", config.getOrDefault("name", ""));
@@ -105,13 +105,13 @@ public class SettingSmsServiceImpl implements ISettingSmsService {
break;
}
ConfigUtil.set("sms", params.get("alias"), JSON.toJSONString(map));
ConfigUtils.set("sms", params.get("alias"), JSON.toJSONString(map));
String engine = ConfigUtil.get("sms", "default", "");
String engine = ConfigUtils.get("sms", "default", "");
if (Integer.parseInt(params.get("status")) == 1) {
ConfigUtil.set("sms", "default", params.get("alias"));
ConfigUtils.set("sms", "default", params.get("alias"));
} else if (engine.equals(params.get("alias")) && Integer.parseInt(params.get("status")) == 0) {
ConfigUtil.set("sms", "default", "");
ConfigUtils.set("sms", "default", "");
}
}

26
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java
View File

@@ -3,8 +3,8 @@ package com.mdd.admin.service.impl;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.mdd.admin.service.ISettingStorageService;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.StringUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -23,7 +23,7 @@ public class SettingStorageServiceImpl implements ISettingStorageService {
*/
@Override
public List<Map<String, Object>> list() {
String engine = ConfigUtil.get("storage", "default", "local");
String engine = ConfigUtils.get("storage", "default", "local");
List<Map<String, Object>> list = new LinkedList<>();
Map<String, Object> local = new LinkedHashMap<>();
@@ -66,9 +66,9 @@ public class SettingStorageServiceImpl implements ISettingStorageService {
*/
@Override
public Map<String, Object> detail(String alias) {
String engine = ConfigUtil.get("storage", "default", "local");
Map<String, String> config = ConfigUtil.getMap("storage", alias);
config = StringUtil.isNotNull(config) ? config : Collections.emptyMap();
String engine = ConfigUtils.get("storage", "default", "local");
Map<String, String> config = ConfigUtils.getMap("storage", alias);
config = StringUtils.isNotNull(config) ? config : Collections.emptyMap();
Map<String, Object> map = new LinkedHashMap<>();
map.put("name", config.getOrDefault("name", ""));
@@ -119,13 +119,13 @@ public class SettingStorageServiceImpl implements ISettingStorageService {
}
}
ConfigUtil.set("storage", params.get("alias"), JSON.toJSONString(map));
ConfigUtils.set("storage", params.get("alias"), JSON.toJSONString(map));
String engine = ConfigUtil.get("storage", "default", "local");
String engine = ConfigUtils.get("storage", "default", "local");
if (Integer.parseInt(params.get("status")) == 1) {
ConfigUtil.set("storage", "default", params.get("alias"));
ConfigUtils.set("storage", "default", params.get("alias"));
} else if (engine.equals(params.get("alias")) && Integer.parseInt(params.get("status")) == 0) {
ConfigUtil.set("storage", "default", "");
ConfigUtils.set("storage", "default", "");
}
}
@@ -138,11 +138,11 @@ public class SettingStorageServiceImpl implements ISettingStorageService {
*/
@Override
public void change(String alias, Integer status) {
String engine = ConfigUtil.get("storage", "default", "local");
String engine = ConfigUtils.get("storage", "default", "local");
if (engine.equals(alias) && status == 0) {
ConfigUtil.set("storage", "default", "");
ConfigUtils.set("storage", "default", "");
} else {
ConfigUtil.set("storage", "default", alias);
ConfigUtils.set("storage", "default", alias);
}
}

10
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingUserServiceImpl.java
View File

@@ -3,8 +3,8 @@ package com.mdd.admin.service.impl;
import com.mdd.admin.service.ISettingUserService;
import com.mdd.admin.validate.setting.SettingUserValidate;
import com.mdd.admin.vo.setting.SettingUserVo;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.stereotype.Service;
/**
@@ -21,10 +21,10 @@ public class SettingUserServiceImpl implements ISettingUserService {
*/
@Override
public SettingUserVo detail() {
String defaultAvatar = ConfigUtil.get("user", "defaultAvatar", "");
String defaultAvatar = ConfigUtils.get("user", "defaultAvatar", "");
SettingUserVo vo = new SettingUserVo();
vo.setDefaultAvatar(UrlUtil.toAbsoluteUrl(defaultAvatar));
vo.setDefaultAvatar(UrlUtils.toAbsoluteUrl(defaultAvatar));
return vo;
}
@@ -36,7 +36,7 @@ public class SettingUserServiceImpl implements ISettingUserService {
*/
@Override
public void save(SettingUserValidate userValidate) {
ConfigUtil.set("user", "defaultAvatar", UrlUtil.toRelativeUrl(userValidate.getDefaultAvatar()));
ConfigUtils.set("user", "defaultAvatar", UrlUtils.toRelativeUrl(userValidate.getDefaultAvatar()));
}
}

27
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingWebsiteServiceImpl.java
View File

@@ -3,11 +3,10 @@ package com.mdd.admin.service.impl;
import com.mdd.admin.service.ISettingWebsiteService;
import com.mdd.admin.validate.setting.SettingWebsiteValidate;
import com.mdd.admin.vo.setting.SettingWebsiteVo;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.stereotype.Service;
import java.util.LinkedHashMap;
import java.util.Map;
/**
@@ -24,15 +23,15 @@ public class SettingWebsiteServiceImpl implements ISettingWebsiteService {
*/
@Override
public SettingWebsiteVo detail() {
Map<String, String> config = ConfigUtil.get("website");
Map<String, String> config = ConfigUtils.get("website");
SettingWebsiteVo vo = new SettingWebsiteVo();
vo.setName(config.getOrDefault("name", ""));
vo.setLogo(UrlUtil.toAbsoluteUrl(config.getOrDefault("logo", "")));
vo.setFavicon(UrlUtil.toAbsoluteUrl(config.getOrDefault("favicon", "")));
vo.setBackdrop(UrlUtil.toAbsoluteUrl(config.getOrDefault("backdrop", "")));
vo.setLogo(UrlUtils.toAbsoluteUrl(config.getOrDefault("logo", "")));
vo.setFavicon(UrlUtils.toAbsoluteUrl(config.getOrDefault("favicon", "")));
vo.setBackdrop(UrlUtils.toAbsoluteUrl(config.getOrDefault("backdrop", "")));
vo.setShopName(config.getOrDefault("shopName", ""));
vo.setShopLogo(UrlUtil.toAbsoluteUrl(config.getOrDefault("shopLogo", "")));
vo.setShopLogo(UrlUtils.toAbsoluteUrl(config.getOrDefault("shopLogo", "")));
return vo;
}
@@ -44,12 +43,12 @@ public class SettingWebsiteServiceImpl implements ISettingWebsiteService {
*/
@Override
public void save(SettingWebsiteValidate websiteValidate) {
ConfigUtil.set("website", "name", websiteValidate.getName());
ConfigUtil.set("website", "logo", UrlUtil.toRelativeUrl(websiteValidate.getLogo()));
ConfigUtil.set("website", "favicon", UrlUtil.toRelativeUrl(websiteValidate.getFavicon()));
ConfigUtil.set("website", "backdrop", UrlUtil.toRelativeUrl(websiteValidate.getBackdrop()));
ConfigUtil.set("website", "shopName", websiteValidate.getShopName());
ConfigUtil.set("website", "shopLogo", UrlUtil.toRelativeUrl(websiteValidate.getShopLogo()));
ConfigUtils.set("website", "name", websiteValidate.getName());
ConfigUtils.set("website", "logo", UrlUtils.toRelativeUrl(websiteValidate.getLogo()));
ConfigUtils.set("website", "favicon", UrlUtils.toRelativeUrl(websiteValidate.getFavicon()));
ConfigUtils.set("website", "backdrop", UrlUtils.toRelativeUrl(websiteValidate.getBackdrop()));
ConfigUtils.set("website", "shopName", websiteValidate.getShopName());
ConfigUtils.set("website", "shopLogo", UrlUtils.toRelativeUrl(websiteValidate.getShopLogo()));
}
}

92
server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java
View File

@@ -26,7 +26,7 @@ import com.mdd.common.mapper.system.SystemAuthAdminMapper;
import com.mdd.common.mapper.system.SystemAuthDeptMapper;
import com.mdd.common.mapper.system.SystemAuthMenuMapper;
import com.mdd.common.mapper.system.SystemAuthRoleMapper;
import com.mdd.common.utils.*;
import com.mdd.common.util.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -80,7 +80,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
"like:nickname:str"
});
if (StringUtil.isNotNull(searchValidate.getRole())) {
if (StringUtils.isNotNull(searchValidate.getRole())) {
mpjQueryWrapper.in("role_ids", Collections.singletonList(searchValidate.getRole()));
}
@@ -94,7 +94,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
vo.setRole("系统管理员");
} else {
List<String> role = new LinkedList<>();
List<Integer> roleIds = ArrayUtil.stringToListAsInt(vo.getRole(), ",");
List<Integer> roleIds = ArrayUtils.stringToListAsInt(vo.getRole(), ",");
if (!roleIds.isEmpty()) {
List<SystemAuthRole> roleList = systemAuthRoleMapper.selectList(new QueryWrapper<SystemAuthRole>()
.select("id,name")
@@ -103,14 +103,14 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
role.add(d.getName());
}
}
vo.setRole(ArrayUtil.listToStringByStr(role, "/"));
vo.setRole(ArrayUtils.listToStringByStr(role, "/"));
}
if (StringUtil.isNull(vo.getDept()) || vo.getDept().equals("")) {
if (StringUtils.isNull(vo.getDept()) || vo.getDept().equals("")) {
vo.setDept("");
} else {
List<String> dept = new LinkedList<>();
List<Integer> deptIds = ArrayUtil.stringToListAsInt(vo.getDept(), ",");
List<Integer> deptIds = ArrayUtils.stringToListAsInt(vo.getDept(), ",");
if (!deptIds.isEmpty()) {
List<SystemAuthDept> deptList = systemAuthDeptMapper.selectList(new QueryWrapper<SystemAuthDept>()
.select("id,name")
@@ -120,13 +120,13 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
dept.add(d.getName());
}
}
vo.setDept(ArrayUtil.listToStringByStr(dept, "/"));
vo.setDept(ArrayUtils.listToStringByStr(dept, "/"));
}
vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar()));
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime()));
vo.setLastLoginTime(TimeUtil.timestampToDate(vo.getLastLoginTime()));
vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar()));
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(vo.getUpdateTime()));
vo.setLastLoginTime(TimeUtils.timestampToDate(vo.getLastLoginTime()));
}
return PageResult.iPageHandle(iPage);
@@ -154,15 +154,15 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
SystemAuthAdminInformVo systemAuthAdminInformVo = new SystemAuthAdminInformVo();
BeanUtils.copyProperties(sysAdmin, systemAuthAdminInformVo);
systemAuthAdminInformVo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar()));
systemAuthAdminInformVo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime()));
systemAuthAdminInformVo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime()));
systemAuthAdminInformVo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime()));
systemAuthAdminInformVo.setAvatar(UrlUtils.toAbsoluteUrl(sysAdmin.getAvatar()));
systemAuthAdminInformVo.setUpdateTime(TimeUtils.timestampToDate(sysAdmin.getUpdateTime()));
systemAuthAdminInformVo.setCreateTime(TimeUtils.timestampToDate(sysAdmin.getCreateTime()));
systemAuthAdminInformVo.setLastLoginTime(TimeUtils.timestampToDate(sysAdmin.getLastLoginTime()));
// 角色权限
List<String> auths = new LinkedList<>();
if (adminId > 1) {
List<Integer> roleIds = ArrayUtil.stringToListAsInt(sysAdmin.getRoleIds(), ",");
List<Integer> roleIds = ArrayUtils.stringToListAsInt(sysAdmin.getRoleIds(), ",");
List<Integer> menuIds = iSystemAuthPermService.selectMenuIdsByRoleId(roleIds);
if (menuIds.size() > 0) {
List<SystemAuthMenu> systemAuthMenus = systemAuthMenuMapper.selectList(new QueryWrapper<SystemAuthMenu>()
@@ -173,7 +173,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
// 处理权限
for (SystemAuthMenu item : systemAuthMenus) {
if (StringUtil.isNotNull(item.getPerms()) && StringUtil.isNotEmpty(item.getPerms())) {
if (StringUtils.isNotNull(item.getPerms()) && StringUtils.isNotEmpty(item.getPerms())) {
auths.add(item.getPerms().trim());
}
}
@@ -217,13 +217,13 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
SystemAuthAdminDetailVo vo = new SystemAuthAdminDetailVo();
BeanUtils.copyProperties(sysAdmin, vo);
vo.setRoleIds(ArrayUtil.stringToListAsInt(sysAdmin.getRoleIds(), ","));
vo.setDeptIds(ArrayUtil.stringToListAsInt(sysAdmin.getDeptIds(), ","));
vo.setPostIds(ArrayUtil.stringToListAsInt(sysAdmin.getPostIds(), ","));
vo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar()));
vo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime()));
vo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime()));
vo.setRoleIds(ArrayUtils.stringToListAsInt(sysAdmin.getRoleIds(), ","));
vo.setDeptIds(ArrayUtils.stringToListAsInt(sysAdmin.getDeptIds(), ","));
vo.setPostIds(ArrayUtils.stringToListAsInt(sysAdmin.getPostIds(), ","));
vo.setAvatar(UrlUtils.toAbsoluteUrl(sysAdmin.getAvatar()));
vo.setCreateTime(TimeUtils.timestampToDate(sysAdmin.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(sysAdmin.getUpdateTime()));
vo.setLastLoginTime(TimeUtils.timestampToDate(sysAdmin.getLastLoginTime()));
return vo;
}
@@ -248,17 +248,17 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
.eq("nickname", createValidate.getNickname())
.last("limit 1")), "昵称已存在换一个吧！");
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5(createValidate.getPassword().trim() + salt);
String salt = ToolsUtils.randomString(5);
String pwd = ToolsUtils.makeMd5(createValidate.getPassword().trim() + salt);
String createAvatar = createValidate.getAvatar();
String defaultAvatar = "/api/static/backend_avatar.png";
String avatar = StringUtil.isNotEmpty(createValidate.getAvatar()) ? UrlUtil.toRelativeUrl(createAvatar) : defaultAvatar;
String avatar = StringUtils.isNotEmpty(createValidate.getAvatar()) ? UrlUtils.toRelativeUrl(createAvatar) : defaultAvatar;
SystemAuthAdmin model = new SystemAuthAdmin();
model.setRoleIds(ArrayUtil.listToStringByInt(createValidate.getRoleIds(), ","));
model.setDeptIds(ArrayUtil.listToStringByInt(createValidate.getDeptIds(), ","));
model.setPostIds(ArrayUtil.listToStringByInt(createValidate.getPostIds(), ","));
model.setRoleIds(ArrayUtils.listToStringByInt(createValidate.getRoleIds(), ","));
model.setDeptIds(ArrayUtils.listToStringByInt(createValidate.getDeptIds(), ","));
model.setPostIds(ArrayUtils.listToStringByInt(createValidate.getPostIds(), ","));
model.setUsername(createValidate.getUsername());
model.setNickname(createValidate.getNickname());
model.setAvatar(avatar);
@@ -308,11 +308,11 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
SystemAuthAdmin model = new SystemAuthAdmin();
model.setId(updateValidate.getId());
model.setRoleIds(ArrayUtil.listToStringByInt(updateValidate.getRoleIds(), ","));
model.setDeptIds(ArrayUtil.listToStringByInt(updateValidate.getDeptIds(), ","));
model.setPostIds(ArrayUtil.listToStringByInt(updateValidate.getPostIds(), ","));
model.setRoleIds(ArrayUtils.listToStringByInt(updateValidate.getRoleIds(), ","));
model.setDeptIds(ArrayUtils.listToStringByInt(updateValidate.getDeptIds(), ","));
model.setPostIds(ArrayUtils.listToStringByInt(updateValidate.getPostIds(), ","));
model.setNickname(updateValidate.getNickname());
model.setAvatar(UrlUtil.toRelativeUrl(updateValidate.getAvatar()));
model.setAvatar(UrlUtils.toRelativeUrl(updateValidate.getAvatar()));
model.setSort(updateValidate.getSort());
model.setIsMultipoint(updateValidate.getIsMultipoint());
model.setIsDisable(updateValidate.getIsDisable());
@@ -322,9 +322,9 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
model.setUsername(updateValidate.getUsername());
}
if (StringUtil.isNotNull(updateValidate.getPassword()) && StringUtil.isNotEmpty(updateValidate.getPassword())) {
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5( updateValidate.getPassword().trim() + salt);
if (StringUtils.isNotNull(updateValidate.getPassword()) && StringUtils.isNotEmpty(updateValidate.getPassword())) {
String salt = ToolsUtils.randomString(5);
String pwd = ToolsUtils.makeMd5( updateValidate.getPassword().trim() + salt);
model.setPassword(pwd);
model.setSalt(salt);
}
@@ -332,7 +332,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
systemAuthAdminMapper.updateById(model);
this.cacheAdminUserByUid(updateValidate.getId());
if (StringUtil.isNotNull(updateValidate.getPassword()) && StringUtil.isNotEmpty(updateValidate.getPassword())) {
if (StringUtils.isNotNull(updateValidate.getPassword()) && StringUtils.isNotEmpty(updateValidate.getPassword())) {
StpUtil.kickout(updateValidate.getId());
}
}
@@ -355,17 +355,17 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
String createAvatar = upInfoValidate.getAvatar();
String defaultAvatar = "/api/static/backend_avatar.png";
String avatar = StringUtil.isNotEmpty(upInfoValidate.getAvatar()) ? UrlUtil.toRelativeUrl(createAvatar) : defaultAvatar;
String avatar = StringUtils.isNotEmpty(upInfoValidate.getAvatar()) ? UrlUtils.toRelativeUrl(createAvatar) : defaultAvatar;
model.setAvatar(avatar);
model.setNickname(upInfoValidate.getNickname());
model.setUpdateTime(System.currentTimeMillis() / 1000);
if (StringUtil.isNotNull(upInfoValidate.getPassword()) && StringUtil.isNotEmpty(upInfoValidate.getPassword())) {
String currPassword = ToolsUtil.makeMd5(upInfoValidate.getCurrPassword() + model.getSalt());
if (StringUtils.isNotNull(upInfoValidate.getPassword()) && StringUtils.isNotEmpty(upInfoValidate.getPassword())) {
String currPassword = ToolsUtils.makeMd5(upInfoValidate.getCurrPassword() + model.getSalt());
Assert.isFalse(!currPassword.equals(model.getPassword()), "当前密码不正确!");
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5( upInfoValidate.getPassword().trim() + salt);
String salt = ToolsUtils.randomString(5);
String pwd = ToolsUtils.makeMd5( upInfoValidate.getPassword().trim() + salt);
model.setPassword(pwd);
model.setSalt(salt);
}
@@ -373,7 +373,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
systemAuthAdminMapper.updateById(model);
this.cacheAdminUserByUid(adminId);
if (StringUtil.isNotNull(upInfoValidate.getPassword()) && StringUtil.isNotEmpty(upInfoValidate.getPassword())) {
if (StringUtils.isNotNull(upInfoValidate.getPassword()) && StringUtils.isNotEmpty(upInfoValidate.getPassword())) {
StpUtil.kickout(adminId);
}
}
@@ -427,7 +427,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
Integer disable = systemAuthAdmin.getIsDisable() == 1 ? 0 : 1;
systemAuthAdmin.setIsDisable(disable);
systemAuthAdmin.setUpdateTime(TimeUtil.timestamp());
systemAuthAdmin.setUpdateTime(TimeUtils.timestamp());
systemAuthAdminMapper.updateById(systemAuthAdmin);
this.cacheAdminUserByUid(id);
@@ -459,7 +459,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
Map<String, Object> map = new LinkedHashMap<>();
map.put(String.valueOf(sysAdmin.getId()), JSON.toJSONString(user));
RedisUtil.hmSet(AdminConfig.backstageManageKey, map);
RedisUtils.hmSet(AdminConfig.backstageManageKey, map);
}
}

18
server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthDeptServiceImpl.java
View File

@@ -12,8 +12,8 @@ import com.mdd.common.entity.system.SystemAuthAdmin;
import com.mdd.common.entity.system.SystemAuthDept;
import com.mdd.common.mapper.system.SystemAuthAdminMapper;
import com.mdd.common.mapper.system.SystemAuthDeptMapper;
import com.mdd.common.utils.ArrayUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.ArrayUtils;
import com.mdd.common.util.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -50,8 +50,8 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
SystemAuthDeptVo vo = new SystemAuthDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthDept.getUpdateTime()));
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthDept.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthDept.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthDept.getCreateTime()));
list.add(vo);
}
@@ -86,13 +86,13 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
SystemAuthDeptVo vo = new SystemAuthDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthDept.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthDept.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthDept.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthDept.getUpdateTime()));
list.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(list));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
return ArrayUtils.listToTree(jsonArray, "id", "pid", "children");
}
/**
@@ -117,8 +117,8 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
SystemAuthDeptVo vo = new SystemAuthDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthDept.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthDept.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthDept.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthDept.getUpdateTime()));
return vo;
}

28
server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthMenuServiceImpl.java
View File

@@ -12,9 +12,9 @@ import com.mdd.admin.validate.system.SystemMenuUpdateValidate;
import com.mdd.admin.vo.system.SystemAuthMenuVo;
import com.mdd.common.entity.system.SystemAuthMenu;
import com.mdd.common.mapper.system.SystemAuthMenuMapper;
import com.mdd.common.utils.ArrayUtil;
import com.mdd.common.utils.RedisUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.ArrayUtils;
import com.mdd.common.util.RedisUtils;
import com.mdd.common.util.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -66,13 +66,13 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
SystemAuthMenuVo vo = new SystemAuthMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthMenu.getUpdateTime()));
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthMenu.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthMenu.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthMenu.getCreateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
return ArrayUtils.listToTree(jsonArray, "id", "pid", "children");
}
/**
@@ -94,13 +94,13 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
SystemAuthMenuVo vo = new SystemAuthMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthMenu.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthMenu.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthMenu.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthMenu.getUpdateTime()));
lists.add(vo);
}
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists));
return ArrayUtil.listToTree(jsonArray, "id", "pid", "children");
return ArrayUtils.listToTree(jsonArray, "id", "pid", "children");
}
/**
@@ -117,8 +117,8 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
SystemAuthMenuVo vo = new SystemAuthMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthMenu.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthMenu.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthMenu.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthMenu.getUpdateTime()));
return vo;
}
@@ -149,7 +149,7 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAuthMenuMapper.insert(model);
RedisUtil.del(AdminConfig.backstageRolesKey);
RedisUtils.del(AdminConfig.backstageRolesKey);
}
/**
@@ -179,7 +179,7 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemAuthMenuMapper.updateById(model);
RedisUtil.del(AdminConfig.backstageRolesKey);
RedisUtils.del(AdminConfig.backstageRolesKey);
}
/**
@@ -206,7 +206,7 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
systemAuthMenuMapper.deleteById(id);
iSystemAuthPermService.batchDeleteByMenuId(id);
RedisUtil.del(AdminConfig.backstageRolesKey);
RedisUtils.del(AdminConfig.backstageRolesKey);
}
}

12
server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthPermServiceImpl.java
View File

@@ -9,9 +9,9 @@ import com.mdd.common.entity.system.SystemAuthRole;
import com.mdd.common.mapper.system.SystemAuthMenuMapper;
import com.mdd.common.mapper.system.SystemAuthPermMapper;
import com.mdd.common.mapper.system.SystemAuthRoleMapper;
import com.mdd.common.utils.ArrayUtil;
import com.mdd.common.utils.RedisUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.ArrayUtils;
import com.mdd.common.util.RedisUtils;
import com.mdd.common.util.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -54,7 +54,7 @@ public class SystemAuthPermServiceImpl implements ISystemAuthPermService {
.eq("is_disable", 0)
.last("limit 1"));
if (StringUtil.isNull(systemAuthRole)) {
if (StringUtils.isNull(systemAuthRole)) {
return menus;
}
@@ -137,13 +137,13 @@ public class SystemAuthPermServiceImpl implements ISystemAuthPermService {
.orderByAsc(Arrays.asList("menu_sort", "id")));
for (SystemAuthMenu item : systemAuthMenus) {
if (StringUtil.isNotNull(item.getPerms()) && StringUtil.isNotEmpty(item.getPerms())) {
if (StringUtils.isNotNull(item.getPerms()) && StringUtils.isNotEmpty(item.getPerms())) {
menuArray.add(item.getPerms().trim());
}
}
}
RedisUtil.hSet(AdminConfig.backstageRolesKey, String.valueOf(roleId), ArrayUtil.listToStringByStr(menuArray, ","));
RedisUtils.hSet(AdminConfig.backstageRolesKey, String.valueOf(roleId), ArrayUtils.listToStringByStr(menuArray, ","));
}
}

14
server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthPostServiceImpl.java
View File

@@ -15,7 +15,7 @@ import com.mdd.common.entity.system.SystemAuthAdmin;
import com.mdd.common.entity.system.SystemAuthPost;
import com.mdd.common.mapper.system.SystemAuthAdminMapper;
import com.mdd.common.mapper.system.SystemAuthPostMapper;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -53,8 +53,8 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
SystemAuthPostVo vo = new SystemAuthPostVo();
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthPost.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthPost.getUpdateTime()));
adminVoArrayList.add(vo);
}
@@ -94,8 +94,8 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
SystemAuthPostVo vo = new SystemAuthPostVo();
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthPost.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthPost.getUpdateTime()));
list.add(vo);
}
@@ -123,8 +123,8 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
SystemAuthPostVo vo = new SystemAuthPostVo();
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthPost.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthPost.getUpdateTime()));
return vo;
}

20
server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthRoleServiceImpl.java
View File

@@ -16,8 +16,8 @@ import com.mdd.common.entity.system.SystemAuthAdmin;
import com.mdd.common.entity.system.SystemAuthRole;
import com.mdd.common.mapper.system.SystemAuthAdminMapper;
import com.mdd.common.mapper.system.SystemAuthRoleMapper;
import com.mdd.common.utils.RedisUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.RedisUtils;
import com.mdd.common.util.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -62,8 +62,8 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
vo.setName(systemAuthRole.getName());
vo.setSort(systemAuthRole.getSort());
vo.setIsDisable(systemAuthRole.getIsDisable());
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthRole.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthRole.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthRole.getUpdateTime()));
vo.setMember(0);
vo.setRemark("");
vo.setMenus(Collections.EMPTY_LIST);
@@ -100,8 +100,8 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
vo.setMenus(new ArrayList<>());
vo.setMember(member);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthRole.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthRole.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthRole.getUpdateTime()));
list.add(vo);
}
@@ -130,8 +130,8 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
BeanUtils.copyProperties(systemAuthRole, vo);
vo.setMember(0);
vo.setMenus(iSystemAuthPermService.selectMenuIdsByRoleId(roleIds));
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthRole.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(systemAuthRole.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(systemAuthRole.getUpdateTime()));
return vo;
}
@@ -192,7 +192,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
iSystemAuthPermService.batchDeleteByRoleId(updateValidate.getId());
iSystemAuthPermService.batchSaveByMenuIds(updateValidate.getId(), updateValidate.getMenuIds());
RedisUtil.del(AdminConfig.backstageRolesKey);
RedisUtils.del(AdminConfig.backstageRolesKey);
}
/**
@@ -219,7 +219,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
systemAuthRoleMapper.deleteById(id);
iSystemAuthPermService.batchDeleteByRoleId(id);
RedisUtil.del(AdminConfig.backstageRolesKey);
RedisUtils.del(AdminConfig.backstageRolesKey);
}
}

19
server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemLoginServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.mdd.admin.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mdd.admin.config.AdminConfig;
import com.mdd.admin.service.ISystemAuthAdminService;
import com.mdd.admin.service.ISystemLoginService;
import com.mdd.admin.validate.system.SystemAdminLoginsValidate;
@@ -14,7 +13,7 @@ import com.mdd.common.exception.LoginException;
import com.mdd.common.exception.OperateException;
import com.mdd.common.mapper.system.SystemAuthAdminMapper;
import com.mdd.common.mapper.system.SystemLogLoginMapper;
import com.mdd.common.utils.*;
import com.mdd.common.util.*;
import nl.bitwalker.useragentutils.UserAgent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +57,7 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
.eq("username", username)
.last("limit 1"));
if (StringUtil.isNull(sysAdmin) || sysAdmin.getIsDelete().equals(1)) {
if (StringUtils.isNull(sysAdmin) || sysAdmin.getIsDelete().equals(1)) {
this.recordLoginLog(0, loginsValidate.getUsername(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg());
throw new LoginException(HttpEnum.LOGIN_ACCOUNT_ERROR.getCode(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg());
}
@@ -69,7 +68,7 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
}
String newPWd = password + sysAdmin.getSalt();
String md5Pwd = ToolsUtil.makeMd5(newPWd);
String md5Pwd = ToolsUtils.makeMd5(newPWd);
if (!md5Pwd.equals(sysAdmin.getPassword())) {
this.recordLoginLog(sysAdmin.getId(), loginsValidate.getUsername(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg());
throw new LoginException(HttpEnum.LOGIN_ACCOUNT_ERROR.getCode(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg());
@@ -85,7 +84,7 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
StpUtil.login(sysAdmin.getId());
// 更新登录信息
sysAdmin.setLastLoginIp(IpUtil.getIpAddress());
sysAdmin.setLastLoginIp(IpUtils.getIpAddress());
sysAdmin.setLastLoginTime(System.currentTimeMillis() / 1000);
systemAuthAdminMapper.updateById(sysAdmin);
@@ -99,8 +98,8 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
vo.setToken(StpUtil.getTokenValue());
return vo;
} catch (Exception e) {
Integer adminId = StringUtil.isNotNull(sysAdmin.getId()) ? sysAdmin.getId() : 0;
String error = StringUtil.isEmpty(e.getMessage()) ? "未知错误" : e.getMessage();
Integer adminId = StringUtils.isNotNull(sysAdmin.getId()) ? sysAdmin.getId() : 0;
String error = StringUtils.isEmpty(e.getMessage()) ? "未知错误" : e.getMessage();
this.recordLoginLog(adminId, loginsValidate.getUsername(), error);
throw new OperateException(e.getMessage());
}
@@ -122,16 +121,16 @@ public class SystemLoginServiceImpl implements ISystemLoginService {
*/
private void recordLoginLog(Integer adminId, String username, String error) {
try {
HttpServletRequest request = Objects.requireNonNull(RequestUtil.handler());
HttpServletRequest request = Objects.requireNonNull(RequestUtils.handler());
final UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
SystemLogLogin model = new SystemLogLogin();
model.setAdminId(adminId);
model.setUsername(username);
model.setIp(IpUtil.getIpAddress());
model.setIp(IpUtils.getIpAddress());
model.setOs(userAgent.getOperatingSystem().getName());
model.setBrowser(userAgent.getBrowser().getName());
model.setStatus(StringUtil.isEmpty(error) ? 1 : 0);
model.setStatus(StringUtils.isEmpty(error) ? 1 : 0);
model.setCreateTime(System.currentTimeMillis() / 1000);
systemLogLoginMapper.insert(model);
} catch (Exception e) {

14
server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemLogsServerImpl.java
View File

@@ -16,8 +16,8 @@ import com.mdd.common.entity.system.SystemLogLogin;
import com.mdd.common.entity.system.SystemLogOperate;
import com.mdd.common.mapper.system.SystemLogLoginMapper;
import com.mdd.common.mapper.system.SystemLogOperateMapper;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -73,10 +73,10 @@ public class SystemLogsServerImpl implements ISystemLogsServer {
for (SystemLogOperateVo vo : iPage.getRecords()) {
vo.setTaskTime(vo.getTaskTime());
vo.setStartTime(TimeUtil.timestampToDate(vo.getStartTime()));
vo.setEndTime(TimeUtil.timestampToDate(vo.getEndTime()));
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setError(StringUtil.isNull(vo.getError()) ? "" : vo.getError());
vo.setStartTime(TimeUtils.timestampToDate(vo.getStartTime()));
vo.setEndTime(TimeUtils.timestampToDate(vo.getEndTime()));
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
vo.setError(StringUtils.isNull(vo.getError()) ? "" : vo.getError());
}
return PageResult.iPageHandle(iPage);
@@ -110,7 +110,7 @@ public class SystemLogsServerImpl implements ISystemLogsServer {
SystemLogLoginVo vo = new SystemLogLoginVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime()));
list.add(vo);
}

23
server/like-admin/src/main/java/com/mdd/admin/service/impl/UsersServiceImpl.java
View File

@@ -14,16 +14,15 @@ import com.mdd.common.entity.user.User;
import com.mdd.common.enums.ClientEnum;
import com.mdd.common.exception.OperateException;
import com.mdd.common.mapper.user.UserMapper;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.TimeUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
/**
@@ -59,7 +58,7 @@ public class UsersServiceImpl implements IUsersService {
!info.getColumn().equals("salt")
);
if (StringUtil.isNotNull(searchValidate.getKeyword()) && StringUtil.isNotEmpty(searchValidate.getKeyword())) {
if (StringUtils.isNotNull(searchValidate.getKeyword()) && StringUtils.isNotEmpty(searchValidate.getKeyword())) {
String keyword = searchValidate.getKeyword();
queryWrapper.nested(wq->wq
.like("sn", keyword).or()
@@ -81,9 +80,9 @@ public class UsersServiceImpl implements IUsersService {
vo.setSex(user.getSex());
vo.setChannel(ClientEnum.getMsgByCode(user.getChannel()));
vo.setAvatar(UrlUtil.toAbsoluteUrl(user.getAvatar()));
vo.setLastLoginTime(TimeUtil.timestampToDate(user.getLastLoginTime()));
vo.setCreateTime(TimeUtil.timestampToDate(user.getCreateTime()));
vo.setAvatar(UrlUtils.toAbsoluteUrl(user.getAvatar()));
vo.setLastLoginTime(TimeUtils.timestampToDate(user.getLastLoginTime()));
vo.setCreateTime(TimeUtils.timestampToDate(user.getCreateTime()));
list.add(vo);
}
@@ -124,13 +123,13 @@ public class UsersServiceImpl implements IUsersService {
BeanUtils.copyProperties(user, vo);
vo.setSex(user.getSex());
vo.setAvatar(UrlUtil.toAbsoluteUrl(user.getAvatar()));
vo.setAvatar(UrlUtils.toAbsoluteUrl(user.getAvatar()));
vo.setChannel(ClientEnum.getMsgByCode(user.getChannel()));
vo.setCreateTime(TimeUtil.timestampToDate(user.getCreateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(user.getCreateTime()));
if (user.getLastLoginTime() <= 0) {
vo.setLastLoginTime("无");
} else {
vo.setLastLoginTime(TimeUtil.timestampToDate(user.getLastLoginTime()));
vo.setLastLoginTime(TimeUtils.timestampToDate(user.getLastLoginTime()));
}
return vo;
}
@@ -162,7 +161,7 @@ public class UsersServiceImpl implements IUsersService {
.eq("is_delete", 0)
.last("limit 1"));
if (StringUtil.isNotNull(u) && !u.getId().equals(id)) {
if (StringUtils.isNotNull(u) && !u.getId().equals(id)) {
throw new OperateException("当前账号已存在!");
}
}