gitee/mall4j
1
1
Fork 0
mirror of https://gitee.com/gz-yami/mall4j.git synced 2026-03-22 09:17:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

最低版本要求jdk17, 升级spring boot3.0

Browse Source
This commit is contained in:
FrozenWatermelon
2023-03-16 15:37:04 +08:00
parent 07f919b8ab
commit 324d91bc0a
84 changed files with 248 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysConfigController.java
View File

@@ -11,7 +11,7 @@
package com.yami.shop.sys.controller;
import javax.validation.Valid;
import jakarta.validation.Valid;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -47,7 +47,7 @@ import cn.hutool.core.util.StrUtil;
public class SysConfigController{
@Autowired
private SysConfigService sysConfigService;
/**
* 所有配置列表
*/
@@ -57,8 +57,8 @@ public class SysConfigController{
IPage<SysConfig> sysConfigs = sysConfigService.page(page, new LambdaQueryWrapper<SysConfig>().like(StrUtil.isNotBlank(paramKey),SysConfig::getParamKey,paramKey));
return ServerResponseEntity.success(sysConfigs);
}
/**
* 配置信息
*/
@@ -68,7 +68,7 @@ public class SysConfigController{
SysConfig config = sysConfigService.getById(id);
return ServerResponseEntity.success(config);
}
/**
* 保存配置
*/
@@ -79,7 +79,7 @@ public class SysConfigController{
sysConfigService.save(config);
return ServerResponseEntity.success();
}
/**
* 修改配置
*/
@@ -90,7 +90,7 @@ public class SysConfigController{
sysConfigService.updateById(config);
return ServerResponseEntity.success();
}
/**
* 删除配置
*/

2
yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysMenuController.java
View File

@@ -25,7 +25,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.List;
import java.util.Map;
import java.util.Objects;

2
yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java
View File

@@ -34,7 +34,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.List;
import java.util.Objects;

6
yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java
View File

@@ -13,8 +13,8 @@ package com.yami.shop.sys.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
/**
* @author lanhai
*/
@@ -26,7 +26,7 @@ public class UpdatePasswordDto {
@Size(max = 50)
@Schema(description = "旧密码" ,required=true)
private String password;
@NotBlank(message="新密码不能为空")
@Size(max = 50)
@Schema(description = "新密码" ,required=true)

8
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java
View File

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
/**
* 系统配置信息
@@ -25,13 +25,13 @@ import javax.validation.constraints.NotBlank;
public class SysConfig {
@TableId
private Long id;
@NotBlank(message="参数名不能为空")
private String paramKey;
@NotBlank(message="参数值不能为空")
private String paramValue;
private String remark;
}

12
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java
View File

@@ -16,8 +16,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
@@ -29,7 +29,7 @@ import java.util.List;
@TableName("tz_sys_menu")
public class SysMenu implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 菜单ID
*/
@@ -41,13 +41,13 @@ public class SysMenu implements Serializable {
*/
@NotNull(message="上级菜单不能为空")
private Long parentId;
/**
* 父菜单名称
*/
@TableField(exist=false)
private String parentName;
/**
* 菜单名称
*/
@@ -78,7 +78,7 @@ public class SysMenu implements Serializable {
* 排序
*/
private Integer orderNum;
@TableField(exist=false)
private List<?> list;

6
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java
View File

@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -30,7 +30,7 @@ import java.util.List;
@TableName("tz_sys_role")
public class SysRole implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 角色ID
*
@@ -52,7 +52,7 @@ public class SysRole implements Serializable {
@TableField(exist=false)
private List<Long> menuIdList;
/**
* 创建时间
*/

16
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java
View File

@@ -18,10 +18,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -34,7 +34,7 @@ import java.util.List;
@TableName("tz_sys_user")
public class SysUser implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 用户ID
*
@@ -72,18 +72,18 @@ public class SysUser implements Serializable {
* 状态 0：禁用 1：正常
*/
private Integer status;
/**
* 用户所在店铺id
*/
private Long shopId;
/**
* 角色ID列表
*/
@TableField(exist=false)
private List<Long> roleIdList;
/**
* 创建时间
*/