lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-09-09 16:18:10 +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("当前账号已存在!");
}
}

42
server/like-common/src/main/java/com/mdd/common/core/ServerResult.java
View File

@@ -1,9 +1,9 @@
package com.mdd.common.core;
import com.mdd.common.entity.server.*;
import com.mdd.common.utils.ArithUtil;
import com.mdd.common.utils.IpUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.ArithUtils;
import com.mdd.common.util.IpUtils;
import com.mdd.common.util.TimeUtils;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
import oshi.hardware.CentralProcessor.TickType;
@@ -69,11 +69,11 @@ public class ServerResult {
long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()];
long totalCpu = user + nice + cSys + idle + ioWait + irq + softer + steal;
cpu.setCpuNum(processor.getLogicalProcessorCount());
cpu.setTotal(ArithUtil.round(ArithUtil.mul(totalCpu, 100), 2));
cpu.setSys(ArithUtil.round(ArithUtil.mul(cSys / cpu.getTotal(), 100), 2));
cpu.setUsed(ArithUtil.round(ArithUtil.mul(user / cpu.getTotal(), 100), 2));
cpu.setWait(ArithUtil.round(ArithUtil.mul(ioWait / cpu.getTotal(), 100), 2));
cpu.setFree( ArithUtil.round(ArithUtil.mul(idle / cpu.getTotal(), 100), 2));
cpu.setTotal(ArithUtils.round(ArithUtils.mul(totalCpu, 100), 2));
cpu.setSys(ArithUtils.round(ArithUtils.mul(cSys / cpu.getTotal(), 100), 2));
cpu.setUsed(ArithUtils.round(ArithUtils.mul(user / cpu.getTotal(), 100), 2));
cpu.setWait(ArithUtils.round(ArithUtils.mul(ioWait / cpu.getTotal(), 100), 2));
cpu.setFree( ArithUtils.round(ArithUtils.mul(idle / cpu.getTotal(), 100), 2));
}
/**
@@ -81,10 +81,10 @@ public class ServerResult {
*/
private void setMemInfo(GlobalMemory memory) {
int number = (1024 * 1024 * 1024);
mem.setTotal(ArithUtil.div(memory.getTotal(), number, 2));
mem.setUsed(ArithUtil.div(memory.getTotal() - memory.getAvailable(), number, 2));
mem.setFree(ArithUtil.div(memory.getAvailable(), number, 2));
mem.setUsage(ArithUtil.mul(ArithUtil.div(mem.getUsed(), memory.getTotal(), 4), 100));
mem.setTotal(ArithUtils.div(memory.getTotal(), number, 2));
mem.setUsed(ArithUtils.div(memory.getTotal() - memory.getAvailable(), number, 2));
mem.setFree(ArithUtils.div(memory.getAvailable(), number, 2));
mem.setUsage(ArithUtils.mul(ArithUtils.div(mem.getUsed(), memory.getTotal(), 4), 100));
}
/**
@@ -92,8 +92,8 @@ public class ServerResult {
*/
private void setSysInfo() {
Properties props = System.getProperties();
sys.setComputerName(IpUtil.getHostName());
sys.setComputerIp(IpUtil.getHostIp());
sys.setComputerName(IpUtils.getHostName());
sys.setComputerIp(IpUtils.getHostIp());
sys.setOsName(props.getProperty("os.name"));
sys.setOsArch(props.getProperty("os.arch"));
sys.setUserDir(props.getProperty("user.dir"));
@@ -104,16 +104,16 @@ public class ServerResult {
*/
private void setJvmInfo() {
Properties props = System.getProperties();
jvm.setTotal(ArithUtil.div(Runtime.getRuntime().totalMemory(), (1024 * 1024), 2));
jvm.setMax(ArithUtil.div(Runtime.getRuntime().maxMemory(), (1024 * 1024), 2));
jvm.setFree(ArithUtil.div(Runtime.getRuntime().freeMemory(), (1024 * 1024), 2));
jvm.setUsage(ArithUtil.mul(ArithUtil.div(jvm.getTotal() - jvm.getFree(), jvm.getTotal(), 4), 100));
jvm.setTotal(ArithUtils.div(Runtime.getRuntime().totalMemory(), (1024 * 1024), 2));
jvm.setMax(ArithUtils.div(Runtime.getRuntime().maxMemory(), (1024 * 1024), 2));
jvm.setFree(ArithUtils.div(Runtime.getRuntime().freeMemory(), (1024 * 1024), 2));
jvm.setUsage(ArithUtils.mul(ArithUtils.div(jvm.getTotal() - jvm.getFree(), jvm.getTotal(), 4), 100));
jvm.setVersion(props.getProperty("java.version"));
jvm.setHome(props.getProperty("java.home"));
jvm.setName(ManagementFactory.getRuntimeMXBean().getVmName());
jvm.setInputArgs(ManagementFactory.getRuntimeMXBean().getInputArguments().toString());
jvm.setRunTime(TimeUtil.datePoor(TimeUtil.nowDate(), TimeUtil.serverStartDate()));
jvm.setStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(TimeUtil.serverStartDate()));
jvm.setRunTime(TimeUtils.datePoor(TimeUtils.nowDate(), TimeUtils.serverStartDate()));
jvm.setStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(TimeUtils.serverStartDate()));
}
/**
@@ -134,7 +134,7 @@ public class ServerResult {
sysFile.setTotal(convertFileSize(total));
sysFile.setFree(convertFileSize(free));
sysFile.setUsed(convertFileSize(used));
sysFile.setUsage(ArithUtil.mul(ArithUtil.div(used, total, 4), 100));
sysFile.setUsage(ArithUtils.mul(ArithUtils.div(used, total, 4), 100));
disk.add(sysFile);
}
}

10
server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java
View File

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.google.gson.reflect.TypeToken;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.util.TimeUtils;
import org.apache.ibatis.annotations.Mapper;
import java.lang.reflect.Type;
@@ -168,8 +168,8 @@ public interface IBaseMapper<T> extends MPJBaseMapper<T> {
if (!dateEnd.equals("")) { queryWrapper.le(field, Long.parseLong(dateEnd)); }
if (!dateStart.equals("")) { queryWrapper.ge(field, Long.parseLong(dateStart)); }
} else {
if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); }
if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); }
if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtils.dateToTimestamp(dateStart)); }
if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtils.dateToTimestamp(dateEnd)); }
}
break;
}
@@ -305,8 +305,8 @@ public interface IBaseMapper<T> extends MPJBaseMapper<T> {
if (!dateStart.equals("")) { queryWrapper.ge(field, Long.parseLong(dateStart)); }
if (!dateEnd.equals("")) { queryWrapper.le(field, Long.parseLong(dateEnd)); }
} else {
if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); }
if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); }
if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtils.dateToTimestamp(dateStart)); }
if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtils.dateToTimestamp(dateEnd)); }
}
break;
}

10
server/like-common/src/main/java/com/mdd/common/plugin/notice/NoticeDriver.java
View File

@@ -6,8 +6,8 @@ import com.mdd.common.exception.OperateException;
import com.mdd.common.mapper.notice.NoticeSettingMapper;
import com.mdd.common.plugin.notice.engine.SmsNotice;
import com.mdd.common.plugin.notice.template.SmsTemplate;
import com.mdd.common.utils.SpringUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.SpringUtils;
import com.mdd.common.util.StringUtils;
/**
* 通知驱动
@@ -16,14 +16,14 @@ public class NoticeDriver {
public void handle(NoticeParams noticeParams) {
// 获取场景模板
NoticeSettingMapper noticeSettingMapper = SpringUtil.getBean(NoticeSettingMapper.class);
NoticeSettingMapper noticeSettingMapper = SpringUtils.getBean(NoticeSettingMapper.class);
NoticeSetting noticeSetting = noticeSettingMapper.selectOne(
new QueryWrapper<NoticeSetting>()
.eq("scene", noticeParams.getScene())
.eq("is_delete", 0)
.last("limit 1"));
if (StringUtil.isNull(noticeSetting)) {
if (StringUtils.isNull(noticeSetting)) {
throw new OperateException("消息场景不存在!");
}
@@ -31,7 +31,7 @@ public class NoticeDriver {
SmsTemplate smsTemplate = new SmsTemplate();
smsTemplate.setType(noticeSetting.getType());
smsTemplate.setParams(noticeSetting.getSmsNotice());
if (StringUtil.isNotNull(smsTemplate.getStatus()) && smsTemplate.getStatus().equals(1)) {
if (StringUtils.isNotNull(smsTemplate.getStatus()) && smsTemplate.getStatus().equals(1)) {
(new SmsNotice()).send(noticeParams, smsTemplate);
}
}

18
server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java
View File

@@ -4,9 +4,9 @@ import com.mdd.common.config.GlobalConfig;
import com.mdd.common.plugin.notice.NoticeParams;
import com.mdd.common.plugin.notice.template.SmsTemplate;
import com.mdd.common.plugin.sms.SmsDriver;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.RedisUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.RedisUtils;
import com.mdd.common.util.StringUtils;
import java.util.*;
@@ -27,7 +27,7 @@ public class SmsNotice {
Integer scene = noticeParams.getScene();
Map<String, String> params = new LinkedHashMap<>();
if (StringUtil.isNotNull(noticeParams.getParams())) {
if (StringUtils.isNotNull(noticeParams.getParams())) {
for (String s : noticeParams.getParams()) {
String[] arr = s.split(":");
String key = arr[0].trim();
@@ -36,7 +36,7 @@ public class SmsNotice {
}
}
if (StringUtil.isNotEmpty(mobile)) {
if (StringUtils.isNotEmpty(mobile)) {
(new SmsDriver())
.setScene(scene)
.setMobile(mobile)
@@ -46,9 +46,9 @@ public class SmsNotice {
.sendSms();
// 通知类型: [1=业务, 2=验证码]
if (smsTemplate.getType().equals(2) && StringUtil.isNotNull(params.get("code"))) {
if (smsTemplate.getType().equals(2) && StringUtils.isNotNull(params.get("code"))) {
String code = params.get("code").toLowerCase();
RedisUtil.set(GlobalConfig.redisSmsCode+scene+":"+mobile, code, 900);
RedisUtils.set(GlobalConfig.redisSmsCode+scene+":"+mobile, code, 900);
}
}
}
@@ -79,7 +79,7 @@ public class SmsNotice {
* @return Map<String, String>
*/
private Map<String, String> getSmsParams(Map<String, String> params, String content) {
String engine = ConfigUtil.get("sms", "default", "");
String engine = ConfigUtils.get("sms", "default", "");
if (!engine.equals("tencent")) {
return params;
}
@@ -114,7 +114,7 @@ public class SmsNotice {
// 取变量对应值
Map<String, String> arr4 = new LinkedHashMap<>();
for (String v : arr3) {
if (StringUtil.isNotNull(params.get(v))) {
if (StringUtils.isNotNull(params.get(v))) {
arr4.put(params.get(v), "");
}
}

4
server/like-common/src/main/java/com/mdd/common/plugin/notice/template/SmsTemplate.java
View File

@@ -1,6 +1,6 @@
package com.mdd.common.plugin.notice.template;
import com.mdd.common.utils.ToolsUtil;
import com.mdd.common.util.ToolsUtils;
import lombok.Data;
import java.util.Map;
@@ -24,7 +24,7 @@ public class SmsTemplate {
* 设置参数
*/
public void setParams(String smsNotice) {
Map<String, String> config = ToolsUtil.jsonToMap(smsNotice);
Map<String, String> config = ToolsUtils.jsonToMap(smsNotice);
this.setTemplateId(config.getOrDefault("templateId", ""));
this.setContent(config.getOrDefault("content", ""));
this.setStatus(Integer.parseInt(config.getOrDefault("status", "0")));

10
server/like-common/src/main/java/com/mdd/common/plugin/sms/SmsDriver.java
View File

@@ -6,8 +6,8 @@ import com.mdd.common.exception.OperateException;
import com.mdd.common.mapper.system.SystemLogSmsMapper;
import com.mdd.common.plugin.sms.engine.AliSms;
import com.mdd.common.plugin.sms.engine.TencentSms;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.SpringUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.SpringUtils;
import java.util.Map;
@@ -27,9 +27,9 @@ public class SmsDriver {
* 构造方法
*/
public SmsDriver() {
this.engine = ConfigUtil.get("sms", "default", "");
this.config = ConfigUtil.getMap("sms", this.engine);
this.systemLogSmsMapper = SpringUtil.getBean(SystemLogSmsMapper.class);
this.engine = ConfigUtils.get("sms", "default", "");
this.config = ConfigUtils.getMap("sms", this.engine);
this.systemLogSmsMapper = SpringUtils.getBean(SystemLogSmsMapper.class);
}
/**

4
server/like-common/src/main/java/com/mdd/common/plugin/sms/engine/HuaweiSms.java
View File

@@ -1,6 +1,6 @@
package com.mdd.common.plugin.sms.engine;
import com.mdd.common.utils.ToolsUtil;
import com.mdd.common.util.ToolsUtils;
import javax.net.ssl.*;
import java.io.*;
@@ -241,7 +241,7 @@ public class HuaweiSms {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
String time = sdf.format(new Date()); //Created
String nonce = ToolsUtil.makeUUID().replace("-", "");
String nonce = ToolsUtils.makeUUID().replace("-", "");
MessageDigest md;
byte[] passwordDigest = null;

14
server/like-common/src/main/java/com/mdd/common/plugin/storage/StorageDriver.java
View File

@@ -6,9 +6,9 @@ import com.mdd.common.plugin.storage.engine.AliyunStorage;
import com.mdd.common.plugin.storage.engine.LocalStorage;
import com.mdd.common.plugin.storage.engine.QcloudStorage;
import com.mdd.common.plugin.storage.engine.QiniuStorage;
import com.mdd.common.utils.ConfigUtil;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.util.ConfigUtils;
import com.mdd.common.util.TimeUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.web.multipart.MultipartFile;
import java.util.*;
@@ -29,10 +29,10 @@ public class StorageDriver {
* 构造方法
*/
public StorageDriver() {
this.engine = ConfigUtil.get("storage", "default", "local");
this.engine = ConfigUtils.get("storage", "default", "local");
Map<String, String> config;
config = ConfigUtil.getMap("storage", this.engine);
config = ConfigUtils.getMap("storage", this.engine);
if (config == null) {
config = new HashMap<>();
}
@@ -81,7 +81,7 @@ public class StorageDriver {
vo.setSize(multipartFile.getSize());
vo.setExt(origFileExt.toLowerCase());
vo.setUrl(newFileName);
vo.setPath(UrlUtil.toAbsoluteUrl(newFileName));
vo.setPath(UrlUtils.toAbsoluteUrl(newFileName));
// Map<String, Object> map = new LinkedHashMap<>();
// map.put("id", 0);
@@ -103,7 +103,7 @@ public class StorageDriver {
private String buildSaveName(MultipartFile multipartFile) {
String name = multipartFile.getOriginalFilename();
String ext = Objects.requireNonNull(name).substring(name.lastIndexOf("."));
String date = TimeUtil.timestampToDate(TimeUtil.timestamp(), "yyyyMMdd");
String date = TimeUtils.timestampToDate(TimeUtils.timestamp(), "yyyyMMdd");
return date + "/" + UUID.randomUUID() + ext.toLowerCase();
}

5
server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java
View File

@@ -1,8 +1,7 @@
package com.mdd.common.plugin.storage.engine;
import com.mdd.common.config.GlobalConfig;
import com.mdd.common.exception.OperateException;
import com.mdd.common.utils.YmlUtil;
import com.mdd.common.util.YmlUtils;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@@ -22,7 +21,7 @@ public class LocalStorage {
*/
public void upload(MultipartFile multipartFile, String key, String folder) {
// 映射目录
String directory = YmlUtil.get("like.upload-directory");
String directory = YmlUtils.get("like.upload-directory");
if (directory == null || directory.equals("")) {
throw new OperateException("请配置上传目录like.upload-directory");
}

6
server/like-common/src/main/java/com/mdd/common/utils/ArithUtil.java → server/like-common/src/main/java/com/mdd/common/util/ArithUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -6,13 +6,13 @@ import java.math.RoundingMode;
/**
* 算术运算工具
*/
public class ArithUtil {
public class ArithUtils {
/** 默认除法运算精度 */
private static final int DEF_DIV_SCALE = 10;
/** 这个类不能实例化 */
private ArithUtil() {}
private ArithUtils() {}
/**
* 提供精确的加法运算

20
server/like-common/src/main/java/com/mdd/common/utils/ArrayUtil.java → server/like-common/src/main/java/com/mdd/common/util/ArrayUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
@@ -11,7 +11,7 @@ import java.util.*;
/**
* 数组工具类
*/
public class ArrayUtil {
public class ArrayUtils {
/**
* JSONArray转树形结构
@@ -151,7 +151,7 @@ public class ArrayUtil {
if (str.contains(regex)){
String[] split = str.split(regex);
for (String value : split) {
if(!StringUtil.isBlank(value)){
if(!StringUtils.isBlank(value)){
list.add(Long.parseLong(value.trim()));
}
}
@@ -177,7 +177,7 @@ public class ArrayUtil {
if (str.contains(regex)){
String[] split = str.split(regex);
for (String value : split) {
if(!StringUtil.isBlank(value)){
if(!StringUtils.isBlank(value)){
list.add(Integer.parseInt(value.trim()));
}
}
@@ -200,7 +200,7 @@ public class ArrayUtil {
if (str.contains(regex)){
String[] split = str.split(regex);
for (String value : split) {
if(!StringUtil.isBlank(value)){
if(!StringUtils.isBlank(value)){
list.add(value.trim());
}
}
@@ -242,7 +242,7 @@ public class ArrayUtil {
* @return Map<String, Object>
*/
public static List<Map<String, Object>> stringToListAsMapObj(String s) {
if (StringUtil.isEmpty(s)) {
if (StringUtils.isEmpty(s)) {
return Collections.emptyList();
}
Type type = new TypeToken<List<Map<String, Object>>>() {}.getType();
@@ -257,7 +257,7 @@ public class ArrayUtil {
* @return Map<String, String>
*/
public static List<Map<String, String>> stringToListAsMapStr(String s) {
if (StringUtil.isEmpty(s)) {
if (StringUtils.isEmpty(s)) {
return Collections.emptyList();
}
Type type = new TypeToken<List<Map<String, String>>>() {}.getType();
@@ -272,7 +272,7 @@ public class ArrayUtil {
* @return List<Long>
*/
public static List<Integer> objectToListAsLong(Object object) {
if (StringUtil.isNull(object)) {
if (StringUtils.isNull(object)) {
return Collections.emptyList();
}
Type type = new TypeToken<List<Long>>() {}.getType();
@@ -287,7 +287,7 @@ public class ArrayUtil {
* @return List<Integer>
*/
public static List<Integer> objectToListAsInt(Object object) {
if (StringUtil.isNull(object)) {
if (StringUtils.isNull(object)) {
return Collections.emptyList();
}
Type type = new TypeToken<List<Integer>>() {}.getType();
@@ -302,7 +302,7 @@ public class ArrayUtil {
* @return List<String>
*/
public static List<String> objectToListAsStr(Object object) {
if (StringUtil.isNull(object)) {
if (StringUtils.isNull(object)) {
return Collections.emptyList();
}
Type type = new TypeToken<List<String>>() {}.getType();

16
server/like-common/src/main/java/com/mdd/common/utils/ConfigUtil.java → server/like-common/src/main/java/com/mdd/common/util/ConfigUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mdd.common.entity.system.SystemConfig;
@@ -11,7 +11,7 @@ import java.util.Map;
/**
* 数据库配置操作工具
*/
public class ConfigUtil {
public class ConfigUtils {
/**
* 根据类型获取配置
@@ -21,7 +21,7 @@ public class ConfigUtil {
* @return Map<String, String>
*/
public static Map<String, String> get(String type) {
SystemConfigMapper model = SpringUtil.getBean(SystemConfigMapper.class);
SystemConfigMapper model = SpringUtils.getBean(SystemConfigMapper.class);
List<SystemConfig> configs = model.selectList(
new QueryWrapper<SystemConfig>()
@@ -45,7 +45,7 @@ public class ConfigUtil {
* @return String
*/
public static String get(String type, String name) {
SystemConfigMapper model = SpringUtil.getBean(SystemConfigMapper.class);
SystemConfigMapper model = SpringUtils.getBean(SystemConfigMapper.class);
SystemConfig config = model.selectOne(
new QueryWrapper<SystemConfig>()
@@ -65,7 +65,7 @@ public class ConfigUtil {
* @return String
*/
public static String get(String type, String name, String defaults) {
SystemConfigMapper model = SpringUtil.getBean(SystemConfigMapper.class);
SystemConfigMapper model = SpringUtils.getBean(SystemConfigMapper.class);
SystemConfig config = model.selectOne(
new QueryWrapper<SystemConfig>()
@@ -89,7 +89,7 @@ public class ConfigUtil {
* @return String
*/
public static Map<String, String> getMap(String type, String name) {
SystemConfigMapper model = SpringUtil.getBean(SystemConfigMapper.class);
SystemConfigMapper model = SpringUtils.getBean(SystemConfigMapper.class);
SystemConfig config = model.selectOne(
new QueryWrapper<SystemConfig>()
@@ -105,7 +105,7 @@ public class ConfigUtil {
return new LinkedHashMap<>();
}
return ToolsUtil.jsonToMap(config.getValue());
return ToolsUtils.jsonToMap(config.getValue());
}
/**
@@ -117,7 +117,7 @@ public class ConfigUtil {
* @param val 值
*/
public static void set(String type, String name, String val) {
SystemConfigMapper model = SpringUtil.getBean(SystemConfigMapper.class);
SystemConfigMapper model = SpringUtils.getBean(SystemConfigMapper.class);
SystemConfig config = model.selectOne(
new QueryWrapper<SystemConfig>()

10
server/like-common/src/main/java/com/mdd/common/utils/HttpUtil.java → server/like-common/src/main/java/com/mdd/common/util/HttpUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -12,9 +12,9 @@ import java.security.cert.X509Certificate;
/**
* HTTP工具类
*/
public class HttpUtil {
public class HttpUtils {
private static final Logger log = LoggerFactory.getLogger(HttpUtil.class);
private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
/**
* 向指定URL发送GET方法的请求 (不带参)
@@ -23,7 +23,7 @@ public class HttpUtil {
* @return 所代表远程资源的响应结果
*/
public static String sendGet(String url) {
return sendGet(url, StringUtil.EMPTY);
return sendGet(url, StringUtils.EMPTY);
}
/**
@@ -49,7 +49,7 @@ public class HttpUtil {
StringBuilder result = new StringBuilder();
BufferedReader in = null;
try {
String urlNameString = StringUtil.isNotBlank(param) ? url + "?" + param : url;
String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url;
log.info("sendGet - {}", urlNameString);
URL realUrl = new URL(urlNameString);
URLConnection connection = realUrl.openConnection();

17
server/like-common/src/main/java/com/mdd/common/utils/IpUtil.java → server/like-common/src/main/java/com/mdd/common/util/IpUtils.java
View File

@@ -1,7 +1,6 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.mdd.common.config.GlobalConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -13,9 +12,9 @@ import java.net.UnknownHostException;
/**
* IP工具类
*/
public class IpUtil {
public class IpUtils {
private static final Logger log = LoggerFactory.getLogger(IpUtil.class);
private static final Logger log = LoggerFactory.getLogger(IpUtils.class);
/**
* 获取客户端IP
@@ -24,7 +23,7 @@ public class IpUtil {
* @return IP地址 (113.67.10.194)
*/
public static String getIpAddress() {
HttpServletRequest request = RequestUtil.handler();
HttpServletRequest request = RequestUtils.handler();
if (request == null) {
return "unknown";
}
@@ -61,13 +60,13 @@ public class IpUtil {
String UNKNOWN = "XX XX";
// 内网不查询
if (IpUtil.internalIp(ip)) {
if (IpUtils.internalIp(ip)) {
return "内网IP";
}
if (GlobalConfig.isAddressEnabled) {
try {
String rspStr = HttpUtil.sendGet(IP_URL, "ip=" + ip + "&json=true", "GBK");
if (StringUtil.isEmpty(rspStr)) {
String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", "GBK");
if (StringUtils.isEmpty(rspStr)) {
log.error("获取地理位置异常 {}", ip);
return UNKNOWN;
}
@@ -263,7 +262,7 @@ public class IpUtil {
* @return 是否未知
*/
public static boolean isUnknown(String checkString) {
return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString);
return com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString);
}
}

8
server/like-common/src/main/java/com/mdd/common/utils/RedisUtil.java → server/like-common/src/main/java/com/mdd/common/util/RedisUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import com.mdd.common.config.GlobalConfig;
import org.springframework.data.redis.connection.RedisConnection;
@@ -14,7 +14,7 @@ import java.util.*;
import java.util.concurrent.TimeUnit;
@Component
public class RedisUtil {
public class RedisUtils {
private static RedisTemplate<String, Object> redisTemplate;
private static final String redisPrefix = GlobalConfig.redisPrefix;
@@ -27,7 +27,7 @@ public class RedisUtil {
*/
@Resource
public void setRedisTemplate(RedisTemplate<String, Object> redisTemplate) {
RedisUtil.redisTemplate = redisTemplate;
RedisUtils.redisTemplate = redisTemplate;
}
/**
@@ -190,7 +190,7 @@ public class RedisUtil {
*/
public static Set<String> matchSet(String pattern) {
Set<String> keys = new LinkedHashSet<>();
RedisUtil.handler().execute((RedisConnection connection) -> {
RedisUtils.handler().execute((RedisConnection connection) -> {
try (Cursor<byte[]> cursor = connection.scan(
ScanOptions.scanOptions()
.count(Long.MAX_VALUE)

18
server/like-common/src/main/java/com/mdd/common/utils/RequestUtil.java → server/like-common/src/main/java/com/mdd/common/util/RequestUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* 请求工具类
*/
public class RequestUtil {
public class RequestUtils {
/**
* 获取请求对象
@@ -34,7 +34,7 @@ public class RequestUtil {
* @return String
*/
public static String url() {
HttpServletRequest request = RequestUtil.handler();
HttpServletRequest request = RequestUtils.handler();
if (request != null) {
return request.getRequestURL().toString();
}
@@ -49,9 +49,9 @@ public class RequestUtil {
* @return String
*/
public static String uri() {
String domain = RequestUtil.domain();
if (!Arrays.asList(443,80,0).contains(RequestUtil.port())) {
domain += ":" + RequestUtil.port();
String domain = RequestUtils.domain();
if (!Arrays.asList(443,80,0).contains(RequestUtils.port())) {
domain += ":" + RequestUtils.port();
}
return domain;
@@ -65,7 +65,7 @@ public class RequestUtil {
* @return String
*/
public static String route() {
HttpServletRequest request = RequestUtil.handler();
HttpServletRequest request = RequestUtils.handler();
if (request != null) {
return request.getRequestURI();
}
@@ -80,7 +80,7 @@ public class RequestUtil {
* @return Integer
*/
public static Integer port() {
HttpServletRequest request = RequestUtil.handler();
HttpServletRequest request = RequestUtils.handler();
if (request != null) {
return request.getServerPort();
}
@@ -95,7 +95,7 @@ public class RequestUtil {
* @return String
*/
public static String domain() {
HttpServletRequest request = RequestUtil.handler();
HttpServletRequest request = RequestUtils.handler();
if (request != null) {
String requestUrl = request.getRequestURL().toString();
List<String> urls = Arrays.asList(requestUrl.split("/"));

8
server/like-common/src/main/java/com/mdd/common/utils/SpringUtil.java → server/like-common/src/main/java/com/mdd/common/util/SpringUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
@@ -6,7 +6,7 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
@Component
public class SpringUtil implements ApplicationContextAware {
public class SpringUtils implements ApplicationContextAware {
private static ApplicationContext applicationContext;
@@ -18,8 +18,8 @@ public class SpringUtil implements ApplicationContextAware {
*/
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
if(SpringUtil.applicationContext == null) {
SpringUtil.applicationContext = applicationContext;
if(SpringUtils.applicationContext == null) {
SpringUtils.applicationContext = applicationContext;
}
}

10
server/like-common/src/main/java/com/mdd/common/utils/StringUtil.java → server/like-common/src/main/java/com/mdd/common/util/StringUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import org.springframework.util.AntPathMatcher;
@@ -7,7 +7,7 @@ import java.util.*;
/**
* 字符串工具类
*/
public class StringUtil extends org.apache.commons.lang3.StringUtils {
public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
* 空字符串
*/
@@ -235,18 +235,18 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils {
*/
public static List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
List<String> list = new ArrayList<String>();
if (StringUtil.isEmpty(str)) {
if (StringUtils.isEmpty(str)) {
return list;
}
// 过滤空白字符串
if (filterBlank && StringUtil.isBlank(str)) {
if (filterBlank && StringUtils.isBlank(str)) {
return list;
}
String[] split = str.split(sep);
for (String string : split) {
if (filterBlank && StringUtil.isBlank(string)) {
if (filterBlank && StringUtils.isBlank(string)) {
continue;
}
if (trim) {

18
server/like-common/src/main/java/com/mdd/common/utils/TimeUtil.java → server/like-common/src/main/java/com/mdd/common/util/TimeUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import java.lang.management.ManagementFactory;
@@ -8,7 +8,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
public class TimeUtil {
public class TimeUtils {
/**
* 时间戳转日期(默认格式)
@@ -69,7 +69,7 @@ public class TimeUtil {
* @return Long
*/
public static Long dateToTimestamp(String date) {
String dateTime = TimeUtil.formatDate(date);
String dateTime = TimeUtils.formatDate(date);
return (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).parse(dateTime, new ParsePosition(0)).getTime() / 1000;
}
@@ -234,7 +234,7 @@ public class TimeUtil {
* @return List
*/
public static List<Long> yesterday() {
List<Long> today = TimeUtil.today();
List<Long> today = TimeUtils.today();
List<Long> list = new ArrayList<>();
list.add(today.get(0) - 86400);
list.add(today.get(1) - 86400);
@@ -266,7 +266,7 @@ public class TimeUtil {
* @return List
*/
public static List<Long> lastWeek() {
List<Long> week = TimeUtil.week();
List<Long> week = TimeUtils.week();
List<Long> list = new ArrayList<>();
list.add(week.get(0) - 604800);
list.add(week.get(1) - 604800);
@@ -412,7 +412,7 @@ public class TimeUtil {
* @return List
*/
public static List<Long> dayToNow(int day) {
List<Long> today = TimeUtil.today();
List<Long> today = TimeUtils.today();
List<Long> list = new ArrayList<>();
list.add(today.get(0) - day * 86400L);
list.add(today.get(0) -1);
@@ -464,7 +464,7 @@ public class TimeUtil {
* @return [2022-03-29, 2022-03-30, 2022-03-31, 2022-04-01]
*/
public static List<String> daysAgoDate(Integer day) {
long time = TimeUtil.today().get(0);
long time = TimeUtils.today().get(0);
List<String> data = new ArrayList<>();
for (int i=0; i<day; i++) {
@@ -472,7 +472,7 @@ public class TimeUtil {
time -= 86400;
}
data.add(TimeUtil.timestampToDate(time, "yyyy-MM-dd"));
data.add(TimeUtils.timestampToDate(time, "yyyy-MM-dd"));
}
Collections.reverse(data);
@@ -487,7 +487,7 @@ public class TimeUtil {
* @return [1648483200, 1648569600, 1648656000, 1648742400]
*/
public static List<Long> daysAgoTime(Integer day) {
long time = TimeUtil.today().get(0);
long time = TimeUtils.today().get(0);
List<Long> data = new ArrayList<>();
for (int i=0; i<day; i++) {

10
server/like-common/src/main/java/com/mdd/common/utils/ToolsUtil.java → server/like-common/src/main/java/com/mdd/common/util/ToolsUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
@@ -13,7 +13,7 @@ import java.util.*;
/**
* 常用工具集合
*/
public class ToolsUtil {
public class ToolsUtils {
/**
* 制作UUID
@@ -55,10 +55,10 @@ public class ToolsUtil {
*/
public static String makeToken() {
long millisecond = System.currentTimeMillis();
String randStr = ToolsUtil.randomString(8);
String randStr = ToolsUtils.randomString(8);
String secret = GlobalConfig.secret;
String token = ToolsUtil.makeMd5(ToolsUtil.makeUUID() + millisecond + randStr);
return ToolsUtil.makeMd5(token + secret) + ToolsUtil.randomString(6);
String token = ToolsUtils.makeMd5(ToolsUtils.makeUUID() + millisecond + randStr);
return ToolsUtils.makeMd5(token + secret) + ToolsUtils.randomString(6);
}
/**

24
server/like-common/src/main/java/com/mdd/common/utils/UrlUtil.java → server/like-common/src/main/java/com/mdd/common/util/UrlUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import com.mdd.common.config.GlobalConfig;
@@ -7,7 +7,7 @@ import java.util.Map;
/**
* 文件路径处理工具
*/
public class UrlUtil {
public class UrlUtils {
/**
* 访问前缀
@@ -33,16 +33,16 @@ public class UrlUtil {
}
if (url.startsWith("/api/static/")) {
return RequestUtil.uri() + url;
return RequestUtils.uri() + url;
}
String engine = ConfigUtil.get("storage", "default", "local");
String engine = ConfigUtils.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) {
return RequestUtil.uri() + "/" + uploadPrefix + url;
return RequestUtils.uri() + "/" + uploadPrefix + url;
}
Map<String, String> config = ConfigUtil.getMap("storage", engine);
Map<String, String> config = ConfigUtils.getMap("storage", engine);
if (config != null) {
return config.getOrDefault("domain", "") + url;
}
@@ -63,14 +63,14 @@ public class UrlUtil {
return "";
}
String engine = ConfigUtil.get("storage", "default", "local");
String engine = ConfigUtils.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) {
return url.replace(RequestUtil.uri(), "")
return url.replace(RequestUtils.uri(), "")
.replace("/" + uploadPrefix + "/", "");
}
Map<String, String> config = ConfigUtil.getMap("storage", engine);
Map<String, String> config = ConfigUtils.getMap("storage", engine);
if (config != null) {
return url.replace(config.getOrDefault("domain", ""), "")
.replace( "/" + uploadPrefix + "/", "");
@@ -87,13 +87,13 @@ public class UrlUtil {
* @return String
*/
public static String domain() {
String engine = ConfigUtil.get("storage", "default", "local");
String engine = ConfigUtils.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) {
return RequestUtil.uri() + "/";
return RequestUtils.uri() + "/";
}
Map<String, String> config = ConfigUtil.getMap("storage", engine);
Map<String, String> config = ConfigUtils.getMap("storage", engine);
if (config != null) {
return config.getOrDefault("domain", "") + "/";
}

9
server/like-common/src/main/java/com/mdd/common/utils/WeChatUtil.java → server/like-common/src/main/java/com/mdd/common/util/WeChatUtils.java
View File

@@ -1,16 +1,15 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import com.qcloud.cos.model.ciModel.auditing.Conf;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
import java.util.Map;
public class WeChatUtil {
public class WeChatUtils {
/**
* 微信小程序
@@ -19,7 +18,7 @@ public class WeChatUtil {
* @return WxMaService
*/
public static WxMaService mnp() {
Map<String, String> config = ConfigUtil.get("mp_channel");
Map<String, String> config = ConfigUtils.get("mp_channel");
WxMaService service = new WxMaServiceImpl();
WxMaDefaultConfigImpl wxConfig = new WxMaDefaultConfigImpl();
@@ -37,7 +36,7 @@ public class WeChatUtil {
* @return WxMpService
*/
public static WxMpService official() {
Map<String, String> config = ConfigUtil.get("oa_channel");
Map<String, String> config = ConfigUtils.get("oa_channel");
WxMpDefaultConfigImpl wxMpDefaultConfig = new WxMpDefaultConfigImpl();
wxMpDefaultConfig.setAppId(config.getOrDefault("appId", "").trim());

6
server/like-common/src/main/java/com/mdd/common/utils/YmlUtil.java → server/like-common/src/main/java/com/mdd/common/util/YmlUtils.java
View File

@@ -1,4 +1,4 @@
package com.mdd.common.utils;
package com.mdd.common.util;
import org.springframework.context.EnvironmentAware;
import org.springframework.core.env.Environment;
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
* 系统文件配置操作工具
*/
@Component
public class YmlUtil implements EnvironmentAware {
public class YmlUtils implements EnvironmentAware {
private static Environment env;
@@ -20,7 +20,7 @@ public class YmlUtil implements EnvironmentAware {
*/
@Override
public void setEnvironment(Environment environment) {
YmlUtil.env = environment;
YmlUtils.env = environment;
}
/**

25
server/like-front/src/main/java/com/mdd/front/LikeFrontInterceptor.java
View File

@@ -2,14 +2,13 @@ package com.mdd.front;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.entity.user.User;
import com.mdd.common.enums.HttpEnum;
import com.mdd.common.mapper.user.UserMapper;
import com.mdd.common.utils.RedisUtil;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.YmlUtil;
import com.mdd.common.util.RedisUtils;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.YmlUtils;
import com.mdd.front.config.FrontConfig;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
@@ -46,8 +45,8 @@ public class LikeFrontInterceptor implements HandlerInterceptor {
token = FrontConfig.frontendTokenKey + token;
List<String> notLoginUri = Arrays.asList(FrontConfig.notLoginUri);
if (notLoginUri.contains(request.getRequestURI())) {
if (StringUtil.isNotEmpty(token)) {
Object uid = RedisUtil.get(token);
if (StringUtils.isNotEmpty(token)) {
Object uid = RedisUtils.get(token);
if (uid != null) {
Integer userId = Integer.parseInt(uid.toString());
LikeFrontThreadLocal.put("userId", userId);
@@ -57,21 +56,21 @@ public class LikeFrontInterceptor implements HandlerInterceptor {
}
// Token是否为空
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;
}
// Token是否过期
if (!RedisUtil.exists(token)) {
if (!RedisUtils.exists(token)) {
AjaxResult<Object> result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg());
response.getWriter().print(JSON.toJSONString(result));
return false;
}
// 用户信息缓存
Object uid = RedisUtil.get(token);
Object uid = RedisUtils.get(token);
Integer userId = Integer.parseInt(uid.toString());
User user = userMapper.selectOne(new QueryWrapper<User>()
.select("id,sn,username,nickname,mobile,is_disable,is_delete")
@@ -93,10 +92,10 @@ public class LikeFrontInterceptor implements HandlerInterceptor {
}
// 令牌自动续签
int tokenRenewTime = Integer.parseInt(YmlUtil.get("like.token-renew-time"));
if (RedisUtil.ttl(token) < tokenRenewTime) {
long tokenValidTime = Long.parseLong(YmlUtil.get("like.token-valid-time"));
RedisUtil.expire(token, tokenValidTime);
int tokenRenewTime = Integer.parseInt(YmlUtils.get("like.token-renew-time"));
if (RedisUtils.ttl(token) < tokenRenewTime) {
long tokenValidTime = Long.parseLong(YmlUtils.get("like.token-valid-time"));
RedisUtils.expire(token, tokenValidTime);
}
// 写入本地线程

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

@@ -1,7 +1,7 @@
package com.mdd.front.config;
import com.mdd.common.config.GlobalConfig;
import com.mdd.common.utils.YmlUtil;
import com.mdd.common.util.YmlUtils;
import com.mdd.front.LikeFrontInterceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.lang.NonNull;
@@ -43,7 +43,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
*/
@Override
public void addResourceHandlers(@NonNull 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-front/src/main/java/com/mdd/front/controller/SmsController.java
View File

@@ -8,8 +8,8 @@ import com.mdd.common.exception.OperateException;
import com.mdd.common.mapper.system.SystemLogSmsMapper;
import com.mdd.common.plugin.notice.NoticeDriver;
import com.mdd.common.plugin.notice.NoticeParams;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.ToolsUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.ToolsUtils;
import com.mdd.front.validate.commons.SmsValidate;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -49,7 +49,7 @@ public class SmsController {
.orderByDesc("id")
.last("limit 1"));
if (StringUtil.isNotNull(systemLogSms)) {
if (StringUtils.isNotNull(systemLogSms)) {
if (systemLogSms.getCreateTime() >= (System.currentTimeMillis() / 1000 - 60)){
throw new OperateException("操作频繁,请稍后再试!");
}
@@ -59,7 +59,7 @@ public class SmsController {
.setScene(smsValidate.getScene())
.setMobile(smsValidate.getMobile())
.setParams(new String[] {
"code:" + ToolsUtil.randomInt(4)
"code:" + ToolsUtils.randomInt(4)
});
(new NoticeDriver()).handle(params);

4
server/like-front/src/main/java/com/mdd/front/controller/UploadController.java
View File

@@ -5,7 +5,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;
@@ -42,7 +42,7 @@ public class UploadController {
}
String folder = "image";
if (StringUtil.isNotEmpty(request.getParameter("dir"))) {
if (StringUtils.isNotEmpty(request.getParameter("dir"))) {
folder += "/" + request.getParameter("dir");
}

20
server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java
View File

@@ -13,9 +13,9 @@ import com.mdd.common.entity.article.ArticleCollect;
import com.mdd.common.mapper.article.ArticleCategoryMapper;
import com.mdd.common.mapper.article.ArticleCollectMapper;
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 com.mdd.front.service.IArticleService;
import com.mdd.front.validate.commons.PageValidate;
import com.mdd.front.vo.article.ArticleCateVo;
@@ -101,8 +101,8 @@ public class ArticleServiceImpl implements IArticleService {
ArticleListedVo vo = new ArticleListedVo();
BeanUtils.copyProperties(article, vo);
vo.setCollect(false);
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);
ids.add(article.getId());
@@ -156,8 +156,8 @@ public class ArticleServiceImpl implements IArticleService {
ArticleDetailVo vo = new ArticleDetailVo();
BeanUtils.copyProperties(article, vo);
vo.setCollect(articleCollect != null);
vo.setImage(UrlUtil.toAbsoluteUrl(article.getImage()));
vo.setCreateTime(TimeUtil.timestampToDate(article.getCreateTime()));
vo.setImage(UrlUtils.toAbsoluteUrl(article.getImage()));
vo.setCreateTime(TimeUtils.timestampToDate(article.getCreateTime()));
article.setVisit(article.getVisit() + 1);
articleMapper.updateById(article);
@@ -192,8 +192,8 @@ public class ArticleServiceImpl implements IArticleService {
mpjQueryWrapper);
for (ArticleCollectVo vo : iPage.getRecords()) {
vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage()));
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setImage(UrlUtils.toAbsoluteUrl(vo.getImage()));
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
}
return PageResult.iPageHandle(iPage);
@@ -214,7 +214,7 @@ public class ArticleServiceImpl implements IArticleService {
.eq("user_id", userId)
.last("limit 1"));
if (StringUtil.isNotNull(articleCollect)) {
if (StringUtils.isNotNull(articleCollect)) {
articleCollect.setIsDelete(0);
articleCollect.setUpdateTime(System.currentTimeMillis() / 1000);
articleCollectMapper.updateById(articleCollect);

40
server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java
View File

@@ -15,7 +15,7 @@ import com.mdd.common.mapper.article.ArticleMapper;
import com.mdd.common.mapper.DecoratePageMapper;
import com.mdd.common.mapper.DecorateTabbarMapper;
import com.mdd.common.mapper.setting.HotSearchMapper;
import com.mdd.common.utils.*;
import com.mdd.common.util.*;
import com.mdd.front.service.IIndexService;
import com.mdd.front.validate.commons.PageValidate;
import com.mdd.front.vo.article.ArticleListedVo;
@@ -69,14 +69,14 @@ public class IndexServiceImpl implements IIndexService {
map.put("title", article.getTitle());
map.put("intro", article.getIntro());
map.put("summary", article.getSummary());
map.put("image", UrlUtil.toAbsoluteUrl(article.getImage()));
map.put("image", UrlUtils.toAbsoluteUrl(article.getImage()));
map.put("author", article.getAuthor());
map.put("visit", article.getVisit());
map.put("createTime", TimeUtil.timestampToDate(article.getCreateTime()));
map.put("createTime", TimeUtils.timestampToDate(article.getCreateTime()));
articleList.add(map);
}
response.put("domain", UrlUtil.domain());
response.put("domain", UrlUtils.domain());
response.put("pages", decoratePage.getPageData());
response.put("article", articleList);
return response;
@@ -121,42 +121,42 @@ public class IndexServiceImpl implements IIndexService {
for (DecorateTabbar tab: decorateTabbars) {
Map<String, String> map = new LinkedHashMap<>();
map.put("name", tab.getName());
map.put("selected", UrlUtil.toAbsoluteUrl(tab.getSelected()));
map.put("unselected", UrlUtil.toAbsoluteUrl(tab.getUnselected()));
map.put("selected", UrlUtils.toAbsoluteUrl(tab.getSelected()));
map.put("unselected", UrlUtils.toAbsoluteUrl(tab.getUnselected()));
map.put("link", tab.getLink());
tabs.add(map);
}
// 导航颜色
String tabbarStyle = ConfigUtil.get("tabbar", "style", "{}");
String tabbarStyle = ConfigUtils.get("tabbar", "style", "{}");
// 登录配置
Map<String, Object> loginMap = new LinkedHashMap<>();
Map<String, String> loginConfig = ConfigUtil.get("login");
loginMap.put("loginWay", ArrayUtil.stringToListAsInt(loginConfig.getOrDefault("loginWay", ""), ","));
Map<String, String> loginConfig = ConfigUtils.get("login");
loginMap.put("loginWay", ArrayUtils.stringToListAsInt(loginConfig.getOrDefault("loginWay", ""), ","));
loginMap.put("forceBindMobile", Integer.parseInt(loginConfig.getOrDefault("forceBindMobile", "0")));
loginMap.put("openAgreement", Integer.parseInt(loginConfig.getOrDefault("openAgreement", "0")));
loginMap.put("openOtherAuth", Integer.parseInt(loginConfig.getOrDefault("openOtherAuth", "0")));
loginMap.put("autoLoginAuth", ArrayUtil.stringToListAsInt(loginConfig.getOrDefault("autoLoginAuth", ""), ","));
loginMap.put("autoLoginAuth", ArrayUtils.stringToListAsInt(loginConfig.getOrDefault("autoLoginAuth", ""), ","));
// 网址信息
Map<String, Object> websiteMap = new LinkedHashMap<>();
Map<String, String> websiteConfig = ConfigUtil.get("website");
Map<String, String> websiteConfig = ConfigUtils.get("website");
websiteMap.put("name", websiteConfig.getOrDefault("shopName", "LikeAdmin"));
websiteMap.put("logo", UrlUtil.toAbsoluteUrl(websiteConfig.getOrDefault("shopLogo", "")));
websiteMap.put("logo", UrlUtils.toAbsoluteUrl(websiteConfig.getOrDefault("shopLogo", "")));
// H5配置
Map<String, Object> h5Map = new LinkedHashMap<>();
Map<String, String> h5Config = ConfigUtil.get("h5_channel");
Map<String, String> h5Config = ConfigUtils.get("h5_channel");
h5Map.put("status", Integer.parseInt(h5Config.getOrDefault("status", "0")));
h5Map.put("close", Integer.parseInt(h5Config.getOrDefault("close", "0")));
h5Map.put("url", h5Config.getOrDefault("url", "0"));
h5Map.put("accessLink", RequestUtil.uri());
h5Map.put("accessLink", RequestUtils.uri());
// 响应数据
response.put("version", GlobalConfig.version);
response.put("domain", UrlUtil.domain());
response.put("style", ToolsUtil.jsonToMap(tabbarStyle));
response.put("domain", UrlUtils.domain());
response.put("style", ToolsUtils.jsonToMap(tabbarStyle));
response.put("tabbar", tabs);
response.put("login", loginMap);
response.put("website", websiteMap);
@@ -173,7 +173,7 @@ public class IndexServiceImpl implements IIndexService {
*/
@Override
public Map<String, String> policy(String type) {
Map<String, String> map = ConfigUtil.getMap("protocol", type);
Map<String, String> map = ConfigUtils.getMap("protocol", type);
if (map == null) {
Map<String, String> m = new LinkedHashMap<>();
m.put("name", "");
@@ -191,7 +191,7 @@ public class IndexServiceImpl implements IIndexService {
*/
@Override
public List<String> hotSearch() {
String isHotSearch = ConfigUtil.get("search", "isHotSearch", "0");
String isHotSearch = ConfigUtils.get("search", "isHotSearch", "0");
List<String> list = new LinkedList<>();
if (Integer.parseInt(isHotSearch) == 1) {
@@ -234,8 +234,8 @@ public class IndexServiceImpl implements IIndexService {
for (ArticleListedVo vo : iPage.getRecords()) {
vo.setCollect(false);
vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage()));
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setImage(UrlUtils.toAbsoluteUrl(vo.getImage()));
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
}
return PageResult.iPageHandle(iPage);

86
server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
View File

@@ -12,7 +12,7 @@ import com.mdd.common.enums.NoticeEnum;
import com.mdd.common.exception.OperateException;
import com.mdd.common.mapper.user.UserAuthMapper;
import com.mdd.common.mapper.user.UserMapper;
import com.mdd.common.utils.*;
import com.mdd.common.util.*;
import com.mdd.front.config.FrontConfig;
import com.mdd.front.service.ILoginService;
import com.mdd.front.validate.UserRegisterValidate;
@@ -59,8 +59,8 @@ public class LoginServiceImpl implements ILoginService {
Assert.isNull(model, "账号已存在,换一个吧!");
Integer sn = this.randMakeSn();
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5(userRegisterValidate.getPassword()+salt);
String salt = ToolsUtils.randomString(5);
String pwd = ToolsUtils.makeMd5(userRegisterValidate.getPassword()+salt);
User user = new User();
user.setSn(sn);
@@ -93,7 +93,7 @@ public class LoginServiceImpl implements ILoginService {
Integer client = Integer.parseInt(params.getOrDefault("client", "1"));
try {
WxMaService wxMaService = WeChatUtil.mnp();
WxMaService wxMaService = WeChatUtils.mnp();
WxMaJscode2SessionResult sessionResult = wxMaService.getUserService().getSessionInfo(code);
String openId = sessionResult.getOpenid();
String uniId = sessionResult.getUnionid();
@@ -107,14 +107,14 @@ public class LoginServiceImpl implements ILoginService {
User user = null;
Integer userId;
if (StringUtil.isNotNull(userAuth)) {
if (StringUtils.isNotNull(userAuth)) {
user = userMapper.selectOne(new QueryWrapper<User>()
.eq("id", userAuth.getUserId())
.eq("is_delete", 0)
.last("limit 1"));
}
if (StringUtil.isNull(user)) {
if (StringUtils.isNull(user)) {
Integer sn = this.randMakeSn();
User model = new User();
model.setSn(sn);
@@ -123,7 +123,7 @@ public class LoginServiceImpl implements ILoginService {
model.setUsername("u"+sn);
model.setSex(Integer.parseInt(gender));
model.setChannel(client);
model.setLastLoginIp(IpUtil.getHostIp());
model.setLastLoginIp(IpUtils.getHostIp());
model.setLastLoginTime(System.currentTimeMillis() / 1000);
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
@@ -131,7 +131,7 @@ public class LoginServiceImpl implements ILoginService {
user = model;
userId = model.getId();
if (StringUtil.isNull(userAuth)) {
if (StringUtils.isNull(userAuth)) {
UserAuth auth = new UserAuth();
auth.setUserId(model.getId());
auth.setOpenid(openId);
@@ -144,27 +144,27 @@ public class LoginServiceImpl implements ILoginService {
} else {
// 更新微信标识
userId = user.getId();
if (StringUtil.isEmpty(userAuth.getUnionid()) && StringUtil.isNotEmpty(sessionResult.getUnionid())) {
if (StringUtils.isEmpty(userAuth.getUnionid()) && StringUtils.isNotEmpty(sessionResult.getUnionid())) {
userAuth.setUnionid(sessionResult.getUnionid());
userAuthMapper.updateById(userAuth);
}
// 更新用户信息
if (StringUtil.isEmpty(user.getAvatar()) && StringUtil.isNotEmpty(avatarUrl)) {
if (StringUtils.isEmpty(user.getAvatar()) && StringUtils.isNotEmpty(avatarUrl)) {
user.setAvatar(avatarUrl);
user.setNickname(nickName);
user.setSex(Integer.parseInt(gender));
}
// 更新登录信息
user.setLastLoginIp(IpUtil.getHostIp());
user.setLastLoginIp(IpUtils.getHostIp());
user.setLastLoginTime(System.currentTimeMillis() / 1000);
userMapper.updateById(user);
}
String token = ToolsUtil.makeToken();
int tokenValidTime = Integer.parseInt(YmlUtil.get("like.token-valid-time"));
RedisUtil.set(FrontConfig.frontendTokenKey+token, userId, tokenValidTime);
String token = ToolsUtils.makeToken();
int tokenValidTime = Integer.parseInt(YmlUtils.get("like.token-valid-time"));
RedisUtils.set(FrontConfig.frontendTokenKey+token, userId, tokenValidTime);
LoginTokenVo vo = new LoginTokenVo();
vo.setId(userId);
@@ -192,13 +192,13 @@ public class LoginServiceImpl implements ILoginService {
// 校验验证码
int typeCode = NoticeEnum.SMS_LOGIN_CODE.getCode();
Object smsCode = RedisUtil.get(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
if (StringUtil.isNull(smsCode) || !smsCode.toString().equals(code)) {
Object smsCode = RedisUtils.get(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
if (StringUtils.isNull(smsCode) || !smsCode.toString().equals(code)) {
throw new OperateException("验证码错误!");
}
// 删除验证码
RedisUtil.del(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
RedisUtils.del(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
// 查询手机号
User user = userMapper.selectOne(new QueryWrapper<User>()
@@ -211,13 +211,13 @@ public class LoginServiceImpl implements ILoginService {
Assert.isFalse(user.getIsDisable() != 0, "账号已禁用!");
// 更新登录信息
user.setLastLoginIp(IpUtil.getHostIp());
user.setLastLoginIp(IpUtils.getHostIp());
user.setLastLoginTime(System.currentTimeMillis() / 1000);
userMapper.updateById(user);
String token = ToolsUtil.makeToken();
int tokenValidTime = Integer.parseInt(YmlUtil.get("like.token-valid-time"));
RedisUtil.set(FrontConfig.frontendTokenKey+token, user.getId(), tokenValidTime);
String token = ToolsUtils.makeToken();
int tokenValidTime = Integer.parseInt(YmlUtils.get("like.token-valid-time"));
RedisUtils.set(FrontConfig.frontendTokenKey+token, user.getId(), tokenValidTime);
LoginTokenVo vo = new LoginTokenVo();
vo.setId(user.getId());
@@ -247,18 +247,18 @@ public class LoginServiceImpl implements ILoginService {
.last("limit 1"));
Assert.notNull(user, "账号不存在!");
String pwd = ToolsUtil.makeMd5(password+user.getSalt());
String pwd = ToolsUtils.makeMd5(password+user.getSalt());
Assert.isFalse(!pwd.equals(user.getPassword()), "账号或密码错误!");
Assert.isFalse(user.getIsDisable() != 0, "账号已被禁用!");
// 更新登录信息
user.setLastLoginIp(IpUtil.getHostIp());
user.setLastLoginIp(IpUtils.getHostIp());
user.setLastLoginTime(System.currentTimeMillis() / 1000);
userMapper.updateById(user);
String token = ToolsUtil.makeToken();
int tokenValidTime = Integer.parseInt(YmlUtil.get("like.token-valid-time"))+1;
RedisUtil.set(FrontConfig.frontendTokenKey+token, user.getId(), tokenValidTime-1);
String token = ToolsUtils.makeToken();
int tokenValidTime = Integer.parseInt(YmlUtils.get("like.token-valid-time"))+1;
RedisUtils.set(FrontConfig.frontendTokenKey+token, user.getId(), tokenValidTime-1);
LoginTokenVo vo = new LoginTokenVo();
vo.setId(user.getId());
@@ -279,7 +279,7 @@ public class LoginServiceImpl implements ILoginService {
String code = params.get("code");
try {
WxMpService wxMpService = WeChatUtil.official();
WxMpService wxMpService = WeChatUtils.official();
WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code);
String uniId = wxOAuth2AccessToken.getUnionId();
String openId = wxOAuth2AccessToken.getOpenId();
@@ -293,14 +293,14 @@ public class LoginServiceImpl implements ILoginService {
Integer userId;
User user = null;
if (StringUtil.isNotNull(userAuth)) {
if (StringUtils.isNotNull(userAuth)) {
user = userMapper.selectOne(new QueryWrapper<User>()
.eq("is_delete", 0)
.eq("id", userAuth.getUserId())
.last("limit 1"));
}
if (StringUtil.isNull(user)) {
if (StringUtils.isNull(user)) {
Integer sn = this.randMakeSn();
User model = new User();
model.setSn(sn);
@@ -309,7 +309,7 @@ public class LoginServiceImpl implements ILoginService {
model.setUsername("u"+sn);
model.setChannel(ClientEnum.OA.getCode());
model.setSex(0);
model.setLastLoginIp(IpUtil.getHostIp());
model.setLastLoginIp(IpUtils.getHostIp());
model.setLastLoginTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
model.setCreateTime(System.currentTimeMillis() / 1000);
@@ -317,7 +317,7 @@ public class LoginServiceImpl implements ILoginService {
userId = model.getId();
user = model;
if (StringUtil.isNull(userAuth)) {
if (StringUtils.isNull(userAuth)) {
UserAuth auth = new UserAuth();
auth.setUserId(model.getId());
auth.setUnionid(unionId);
@@ -330,20 +330,20 @@ public class LoginServiceImpl implements ILoginService {
} else {
// 更新微信标识
userId = user.getId();
if (StringUtil.isEmpty(userAuth.getUnionid()) && StringUtil.isNotEmpty(unionId)) {
if (StringUtils.isEmpty(userAuth.getUnionid()) && StringUtils.isNotEmpty(unionId)) {
userAuth.setUnionid(unionId);
userAuthMapper.updateById(userAuth);
}
// 更新登录信息
user.setLastLoginIp(IpUtil.getHostIp());
user.setLastLoginIp(IpUtils.getHostIp());
user.setLastLoginTime(System.currentTimeMillis() / 1000);
userMapper.updateById(user);
}
String token = ToolsUtil.makeToken();
int tokenValidTime = Integer.parseInt(YmlUtil.get("like.token-valid-time"))+1;
RedisUtil.set(FrontConfig.frontendTokenKey+token, userId, tokenValidTime-1);
String token = ToolsUtils.makeToken();
int tokenValidTime = Integer.parseInt(YmlUtils.get("like.token-valid-time"))+1;
RedisUtils.set(FrontConfig.frontendTokenKey+token, userId, tokenValidTime-1);
LoginTokenVo vo = new LoginTokenVo();
vo.setId(user.getId());
@@ -364,7 +364,7 @@ public class LoginServiceImpl implements ILoginService {
*/
@Override
public String codeUrl(String url) {
WxMpService wxMpService = WeChatUtil.official();
WxMpService wxMpService = WeChatUtils.official();
WxMpOAuth2ServiceImpl wxMpOAuth2Service = new WxMpOAuth2ServiceImpl(wxMpService);
return wxMpOAuth2Service.buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_USERINFO, null);
}
@@ -386,13 +386,13 @@ public class LoginServiceImpl implements ILoginService {
// 校验验证码
int typeCode = NoticeEnum.SMS_FORGOT_PASSWORD_CODE.getCode();
Object smsCode = RedisUtil.get(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
if (StringUtil.isNull(smsCode) || !smsCode.toString().equals(code)) {
Object smsCode = RedisUtils.get(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
if (StringUtils.isNull(smsCode) || !smsCode.toString().equals(code)) {
throw new OperateException("验证码错误!");
}
// 删除验证码
RedisUtil.del(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
RedisUtils.del(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
// 查询手机号
User user = userMapper.selectOne(new QueryWrapper<User>()
@@ -404,8 +404,8 @@ public class LoginServiceImpl implements ILoginService {
// 验证账号
Assert.notNull(user, "账号不存在!");
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5(password.trim()+salt);
String salt = ToolsUtils.randomString(5);
String pwd = ToolsUtils.makeMd5(password.trim()+salt);
// 更新密码
user.setPassword(pwd);
@@ -423,7 +423,7 @@ public class LoginServiceImpl implements ILoginService {
private Integer randMakeSn() {
Integer sn;
while (true) {
sn = Integer.parseInt(ToolsUtil.randomInt(8));
sn = Integer.parseInt(ToolsUtils.randomInt(8));
User snModel = userMapper.selectOne(new QueryWrapper<User>()
.select("id,sn,username")
.eq("sn", sn)

36
server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
View File

@@ -13,7 +13,7 @@ import com.mdd.common.enums.NoticeEnum;
import com.mdd.common.exception.OperateException;
import com.mdd.common.mapper.user.UserAuthMapper;
import com.mdd.common.mapper.user.UserMapper;
import com.mdd.common.utils.*;
import com.mdd.common.util.*;
import com.mdd.front.LikeFrontThreadLocal;
import com.mdd.front.service.IUserService;
import com.mdd.front.validate.UserBindMobileValidate;
@@ -57,10 +57,10 @@ public class UserServiceImpl implements IUserService {
UserCenterVo vo = new UserCenterVo();
BeanUtils.copyProperties(user, vo);
if (user.getAvatar().equals("")) {
String avatar = ConfigUtil.get("user", "defaultAvatar", "");
vo.setAvatar(UrlUtil.toAbsoluteUrl(avatar));
String avatar = ConfigUtils.get("user", "defaultAvatar", "");
vo.setAvatar(UrlUtils.toAbsoluteUrl(avatar));
} else {
vo.setAvatar(UrlUtil.toAbsoluteUrl(user.getAvatar()));
vo.setAvatar(UrlUtils.toAbsoluteUrl(user.getAvatar()));
}
return vo;
@@ -92,13 +92,13 @@ public class UserServiceImpl implements IUserService {
vo.setIsBindMnp(userAuth != null);
vo.setVersion(GlobalConfig.version);
vo.setSex(user.getSex());
vo.setCreateTime(TimeUtil.timestampToDate(user.getCreateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(user.getCreateTime()));
if (!user.getAvatar().equals("")) {
vo.setAvatar(UrlUtil.toAbsoluteUrl(user.getAvatar()));
vo.setAvatar(UrlUtils.toAbsoluteUrl(user.getAvatar()));
} else {
String avatar = ConfigUtil.get("user", "defaultAvatar", "");
vo.setAvatar(UrlUtil.toAbsoluteUrl(avatar));
String avatar = ConfigUtils.get("user", "defaultAvatar", "");
vo.setAvatar(UrlUtils.toAbsoluteUrl(avatar));
}
return vo;
@@ -120,7 +120,7 @@ public class UserServiceImpl implements IUserService {
case "avatar":
User avatarUser = new User();
avatarUser.setId(userId);
avatarUser.setAvatar(UrlUtil.toRelativeUrl(value));
avatarUser.setAvatar(UrlUtils.toRelativeUrl(value));
avatarUser.setUpdateTime(System.currentTimeMillis() / 1000);
userMapper.updateById(avatarUser);
break;
@@ -131,11 +131,11 @@ public class UserServiceImpl implements IUserService {
.eq("is_delete", 0)
.last("limit 1"));
if (StringUtil.isNotNull(usernameUser) && !usernameUser.getId().equals(userId)) {
if (StringUtils.isNotNull(usernameUser) && !usernameUser.getId().equals(userId)) {
throw new OperateException("账号已被使用!");
}
if (StringUtil.isNotNull(usernameUser) && usernameUser.getUsername().equals(value)) {
if (StringUtils.isNotNull(usernameUser) && usernameUser.getUsername().equals(value)) {
throw new OperateException("新账号与旧账号一致,修改失败!");
}
@@ -183,14 +183,14 @@ public class UserServiceImpl implements IUserService {
if (!user.getPassword().equals("")) {
Assert.notNull(oldPassword, "oldPassword参数缺失");
String oldPwd = ToolsUtil.makeMd5(oldPassword.trim() + user.getSalt());
String oldPwd = ToolsUtils.makeMd5(oldPassword.trim() + user.getSalt());
if (!oldPwd.equals(user.getPassword())) {
throw new OperateException("原密码不正确!");
}
}
String salt = ToolsUtil.randomString(5);
String pwd = ToolsUtil.makeMd5(password.trim()+salt);
String salt = ToolsUtils.randomString(5);
String pwd = ToolsUtils.makeMd5(password.trim()+salt);
User u = new User();
u.setId(userId);
@@ -215,8 +215,8 @@ public class UserServiceImpl implements IUserService {
// 校验验证码
int typeCode = type.equals("bind") ? NoticeEnum.SMS_BIND_MOBILE_CODE.getCode() : NoticeEnum.SMS_CHANGE_MOBILE_CODE.getCode() ;
Object smsCode = RedisUtil.get(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
if (StringUtil.isNull(smsCode) || !smsCode.toString().equals(code)) {
Object smsCode = RedisUtils.get(GlobalConfig.redisSmsCode+typeCode+":"+mobile);
if (StringUtils.isNull(smsCode) || !smsCode.toString().equals(code)) {
throw new OperateException("验证码错误!");
}
@@ -226,7 +226,7 @@ public class UserServiceImpl implements IUserService {
.eq("is_delete", 0)
.last("limit 1"));
if (StringUtil.isNotNull(user) && user.getId().equals(userId)) {
if (StringUtils.isNotNull(user) && user.getId().equals(userId)) {
throw new OperateException("手机号已被其它账号绑定!");
}
@@ -245,7 +245,7 @@ public class UserServiceImpl implements IUserService {
*/
@Override
public void mnpMobile(String code) {
Map<String, String> config = ConfigUtil.get("mp_channel");
Map<String, String> config = ConfigUtils.get("mp_channel");
WxMaService wxMaService = new WxMaServiceImpl();
WxMaDefaultConfigImpl wxConfig = new WxMaDefaultConfigImpl();
wxConfig.setSecret(config.getOrDefault("appSecret", ""));

8
server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java
View File

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.core.PageResult;
import com.mdd.common.exception.OperateException;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.utils.YmlUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.common.util.YmlUtils;
import com.mdd.common.validator.annotation.IDMust;
import com.mdd.generator.service.IGenerateService;
import com.mdd.generator.validate.GenParam;
@@ -145,8 +145,8 @@ public class GenController {
*/
@GetMapping("/genCode")
public Object genCode(String tables) {
String production = YmlUtil.get("like.production");
if (StringUtil.isNotEmpty(production) && production.equals("true")) {
String production = YmlUtils.get("like.production");
if (StringUtils.isNotEmpty(production) && production.equals("true")) {
throw new OperateException("抱歉,演示环境不允许操作！");
}

22
server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java
View File

@@ -9,8 +9,8 @@ import com.mdd.common.config.GlobalConfig;
import com.mdd.common.core.PageResult;
import com.mdd.common.exception.OperateException;
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 com.mdd.generator.constant.GenConstants;
import com.mdd.generator.entity.GenTable;
import com.mdd.generator.entity.GenTableColumn;
@@ -113,8 +113,8 @@ public class GenerateServiceImpl implements IGenerateService {
for (GenTable item : iPage.getRecords()) {
GenTableVo vo = new GenTableVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime()));
list.add(vo);
}
@@ -141,8 +141,8 @@ public class GenerateServiceImpl implements IGenerateService {
base.put("entityName", genTable.getEntityName());
base.put("authorName", genTable.getAuthorName());
base.put("remarks", genTable.getRemarks());
base.put("createTime", TimeUtil.timestampToDate(genTable.getCreateTime()));
base.put("updateTime", TimeUtil.timestampToDate(genTable.getUpdateTime()));
base.put("createTime", TimeUtils.timestampToDate(genTable.getCreateTime()));
base.put("updateTime", TimeUtils.timestampToDate(genTable.getUpdateTime()));
maps.put("base", base);
// 生成信息
@@ -167,8 +167,8 @@ public class GenerateServiceImpl implements IGenerateService {
for (GenTableColumn item : genTableColumnMapper.selectList(queryWrapper)) {
GenColumnVo vo = new GenColumnVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime()));
vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime()));
columns.add(vo);
}
@@ -298,7 +298,7 @@ public class GenerateServiceImpl implements IGenerateService {
new QueryWrapper<GenTableColumn>()
.eq("table_id", id)
.orderByAsc("sort"));
Assert.isFalse(StringUtil.isEmpty(genTableColumns), "旧数据异常！");
Assert.isFalse(StringUtils.isEmpty(genTableColumns), "旧数据异常！");
// 原表转Map
Map<String, GenTableColumn> tableColumnMap = genTableColumns
@@ -307,7 +307,7 @@ public class GenerateServiceImpl implements IGenerateService {
// 新表数据
List<GenTableColumn> columns = genTableMapper.selectDbTableColumnsByName(genTable.getTableName());
if (StringUtil.isNull(columns)) {
if (StringUtils.isNull(columns)) {
throw new OperateException("同步结构失败,原表结构不存在！");
}
@@ -341,7 +341,7 @@ public class GenerateServiceImpl implements IGenerateService {
List<GenTableColumn> delColumns = genTableColumns.stream()
.filter(column -> !dbTableColumnNames.contains(column.getColumnName()))
.collect(Collectors.toList());
if (StringUtil.isNotEmpty(delColumns)) {
if (StringUtils.isNotEmpty(delColumns)) {
for (GenTableColumn item : delColumns) {
genTableColumnMapper.deleteById(item);
}

36
server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java
View File

@@ -2,7 +2,7 @@ package com.mdd.generator.util;
import com.mdd.common.config.GlobalConfig;
import com.mdd.generator.constant.GenConstants;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.generator.config.GenConfig;
import com.mdd.generator.constant.HtmlConstants;
import com.mdd.generator.constant.JavaConstants;
@@ -48,7 +48,7 @@ public class GenUtil {
String columnName = column.getColumnName();
String columnType = GenUtil.getDbType(column.getColumnType());
column.setColumnLength(GenUtil.getColumnLength(column.getColumnType()));
column.setJavaField(StringUtil.toCamelCase(columnName));
column.setJavaField(StringUtils.toCamelCase(columnName));
column.setJavaType(JavaConstants.TYPE_STRING);
column.setQueryType(GenConstants.QUERY_EQ);
column.setUpdateTime(table.getUpdateTime());
@@ -79,7 +79,7 @@ public class GenUtil {
// 数字字段
else if (GenUtil.isArraysContains(SqlConstants.COLUMN_TYPE_NUMBER, columnType)) {
column.setHtmlType(HtmlConstants.HTML_INPUT); // 输入框
String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ",");
String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
column.setJavaType(JavaConstants.TYPE_BIG_DECIMAL); // 浮点形
} else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 11) {
@@ -116,7 +116,7 @@ public class GenUtil {
}
// 模糊查字段
if (StringUtil.endsWithIgnoreCase(columnName, "name") ||
if (StringUtils.endsWithIgnoreCase(columnName, "name") ||
columnName.equals("nickname") ||
columnName.equals("username") ||
columnName.equals("title") ||
@@ -125,22 +125,22 @@ public class GenUtil {
}
// 根据字段设置
if (StringUtil.endsWithIgnoreCase(columnName, "status")
if (StringUtils.endsWithIgnoreCase(columnName, "status")
|| columnName.equals("isShow")
|| columnName.equals("isDisable")) {
// 状态字段设置单选框
column.setHtmlType(HtmlConstants.HTML_RADIO);
} else if (StringUtil.endsWithIgnoreCase(columnName, "type") ||
StringUtil.endsWithIgnoreCase(columnName, "sex")) {
} else if (StringUtils.endsWithIgnoreCase(columnName, "type") ||
StringUtils.endsWithIgnoreCase(columnName, "sex")) {
// 类型&性别字段设置下拉框
column.setHtmlType(HtmlConstants.HTML_SELECT);
} else if (StringUtil.endsWithIgnoreCase(columnName, "image")) {
} else if (StringUtils.endsWithIgnoreCase(columnName, "image")) {
// 图片字段设置图片上传控件
column.setHtmlType(HtmlConstants.HTML_IMAGE_UPLOAD);
} else if (StringUtil.endsWithIgnoreCase(columnName, "file")) {
} else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
// 文件字段设置文件上传控件
column.setHtmlType(HtmlConstants.HTML_FILE_UPLOAD);
} else if (StringUtil.endsWithIgnoreCase(columnName, "content")) {
} else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
// 内容字段的设置富文本控件
column.setHtmlType(HtmlConstants.HTML_EDITOR);
}
@@ -156,7 +156,7 @@ public class GenUtil {
public static String toModuleName(String tableName) {
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
return StringUtil.substring(tableName, lastIndex + 1, nameLength);
return StringUtils.substring(tableName, lastIndex + 1, nameLength);
}
/**
@@ -168,11 +168,11 @@ public class GenUtil {
*/
public static String toClassName(String tableName) {
String tablePrefix = GlobalConfig.tablePrefix;
if (GenConfig.isRemoveTablePrefix && StringUtil.isNotEmpty(tablePrefix)) {
String[] searchList = StringUtil.split(tablePrefix, ",");
if (GenConfig.isRemoveTablePrefix && StringUtils.isNotEmpty(tablePrefix)) {
String[] searchList = StringUtils.split(tablePrefix, ",");
tableName = replaceFirst(tableName, searchList);
}
return StringUtil.convertToCamelCase(tableName);
return StringUtils.convertToCamelCase(tableName);
}
/**
@@ -225,8 +225,8 @@ public class GenUtil {
* @return String
*/
public static String getDbType(String columnType) {
if (StringUtil.indexOf(columnType, "(") > 0) {
return StringUtil.substringBefore(columnType, "(");
if (StringUtils.indexOf(columnType, "(") > 0) {
return StringUtils.substringBefore(columnType, "(");
}
else {
return columnType;
@@ -241,8 +241,8 @@ public class GenUtil {
* @return 截取后的列类型
*/
public static String getColumnLength(String columnType) {
if (StringUtil.indexOf(columnType, "(") > 0) {
return StringUtil.substringBetween(columnType, "(", ")");
if (StringUtils.indexOf(columnType, "(") > 0) {
return StringUtils.substringBetween(columnType, "(", ")");
} else {
return "0";
}

38
server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java
View File

@@ -1,6 +1,6 @@
package com.mdd.generator.util;
import com.mdd.common.utils.StringUtil;
import com.mdd.common.util.StringUtils;
import com.mdd.generator.config.GenConfig;
import com.mdd.generator.constant.GenConstants;
import com.mdd.generator.constant.SqlConstants;
@@ -62,7 +62,7 @@ public class VelocityUtil {
primaryKey = column.getJavaField();
primaryField = column.getColumnName();
}
if (StringUtil.isNotEmpty(column.getDictType()) && !dictFields.contains(column.getDictType())) {
if (StringUtils.isNotEmpty(column.getDictType()) && !dictFields.contains(column.getDictType())) {
dictFields.add(column.getDictType());
}
}
@@ -74,9 +74,9 @@ public class VelocityUtil {
velocityContext.put("authorName", table.getAuthorName());
velocityContext.put("packageName", GenConfig.packageName);
velocityContext.put("EntityName", table.getEntityName());
velocityContext.put("entityName", StringUtil.uncapitalize(table.getEntityName()));
velocityContext.put("entityName", StringUtils.uncapitalize(table.getEntityName()));
velocityContext.put("moduleName", table.getModuleName());
velocityContext.put("functionName", StringUtil.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】");
velocityContext.put("functionName", StringUtils.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】");
velocityContext.put("notesType", GenConfig.notesType);
velocityContext.put("table", table);
velocityContext.put("columns", columns);
@@ -100,7 +100,7 @@ public class VelocityUtil {
*/
public static String getGenPath(GenTable table) {
String genPath = table.getGenPath();
if (StringUtil.equals(genPath, "/")) {
if (StringUtils.equals(genPath, "/")) {
return System.getProperty("user.dir") + File.separator + "src" + File.separator;
}
return genPath + File.separator;
@@ -146,59 +146,59 @@ public class VelocityUtil {
String moduleName = genTable.getModuleName();
if (template.contains("controller.java.vm")) {
fileName = StringUtil.format("java/{}/controller/{}Controller.java", GenConfig.adminPackage, entityName);
fileName = StringUtils.format("java/{}/controller/{}Controller.java", GenConfig.adminPackage, entityName);
}
else if (template.contains("service.java.vm")) {
fileName = StringUtil.format("java/{}/service/I{}Service.java", GenConfig.adminPackage, entityName);
fileName = StringUtils.format("java/{}/service/I{}Service.java", GenConfig.adminPackage, entityName);
}
else if (template.contains("serviceImpl.java.vm")) {
fileName = StringUtil.format("java/{}/service/impl/{}ServiceImpl.java", GenConfig.adminPackage, entityName);
fileName = StringUtils.format("java/{}/service/impl/{}ServiceImpl.java", GenConfig.adminPackage, entityName);
}
else if (template.contains("validateCreate.java.vm")) {
fileName = StringUtil.format("java/{}/validate/{}CreateValidate.java", GenConfig.adminPackage, entityName);
fileName = StringUtils.format("java/{}/validate/{}CreateValidate.java", GenConfig.adminPackage, entityName);
}
else if (template.contains("validateUpdate.java.vm")) {
fileName = StringUtil.format("java/{}/validate/{}UpdateValidate.java", GenConfig.adminPackage, entityName);
fileName = StringUtils.format("java/{}/validate/{}UpdateValidate.java", GenConfig.adminPackage, entityName);
}
else if (template.contains("validateSearch.java.vm")) {
fileName = StringUtil.format("java/{}/validate/{}SearchValidate.java", GenConfig.adminPackage, entityName);
fileName = StringUtils.format("java/{}/validate/{}SearchValidate.java", GenConfig.adminPackage, entityName);
}
else if (template.contains("voListed.java.vm")) {
fileName = StringUtil.format("java/{}/vo/{}ListedVo.java", GenConfig.adminPackage, entityName);
fileName = StringUtils.format("java/{}/vo/{}ListedVo.java", GenConfig.adminPackage, entityName);
}
else if (template.contains("voDetail.java.vm")) {
fileName = StringUtil.format("java/{}/vo/{}DetailVo.java", GenConfig.adminPackage, entityName);
fileName = StringUtils.format("java/{}/vo/{}DetailVo.java", GenConfig.adminPackage, entityName);
}
else if (template.contains("entity.java.vm")) {
fileName = StringUtil.format("java/{}/entity/{}.java", GenConfig.commonPackage, entityName);
fileName = StringUtils.format("java/{}/entity/{}.java", GenConfig.commonPackage, entityName);
}
else if (template.contains("mapper.java.vm")) {
fileName = StringUtil.format("java/{}/mapper/{}Mapper.java", GenConfig.commonPackage, entityName);
fileName = StringUtils.format("java/{}/mapper/{}Mapper.java", GenConfig.commonPackage, entityName);
}
else if (template.contains("vue/api.ts.vm")) {
fileName = StringUtil.format("vue/api/{}.ts", moduleName);
fileName = StringUtils.format("vue/api/{}.ts", moduleName);
}
else if (template.contains("vue/edit.vue.vm")) {
fileName = StringUtil.format("vue/views/{}/edit.vue", moduleName);
fileName = StringUtils.format("vue/views/{}/edit.vue", moduleName);
}
else if (template.contains("vue/index.vue.vm")) {
fileName = StringUtil.format("vue/views/{}/index.vue", moduleName);
fileName = StringUtils.format("vue/views/{}/index.vue", moduleName);
}
else if (template.contains("vue/index-tree.vue.vm")) {
fileName = StringUtil.format("vue/views/{}/index.vue", moduleName);
fileName = StringUtils.format("vue/views/{}/index.vue", moduleName);
}
return fileName;