WFC/be.wfc
2
0
Fork 0
Code Activity

feat: upgrade framework 3.6.5

Browse Source
This commit is contained in:
caiyuchao
2024-11-22 17:24:07 +08:00
parent 64abc8d59a 235c029bac
commit 749471b1dd
93 changed files with 2220 additions and 1324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wfc-api/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.wfc</groupId>
<artifactId>wfc</artifactId>
<version>3.6.4</version>
<version>3.6.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
wfc-api/wfc-api-omada/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<groupId>org.wfc</groupId>
<artifactId>wfc-api</artifactId>
<version>3.6.4</version>
<version>3.6.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
wfc-api/wfc-api-system/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.wfc</groupId>
<artifactId>wfc-api</artifactId>
<version>3.6.4</version>
<version>3.6.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>

11
wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteUserService.java
View File

@@ -4,6 +4,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.wfc.common.core.constant.SecurityConstants;
@@ -40,4 +41,14 @@ public interface RemoteUserService
*/
@PostMapping("/user/register")
public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
* 记录用户登录IP地址和登录时间
*
* @param sysUser 用户信息
* @param source 请求来源
* @return 结果
*/
@PutMapping("/user/recordlogin")
public R<Boolean> recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}

179
wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDept.java
View File

@@ -1,8 +1,8 @@
package org.wfc.system.api.domain;
import org.wfc.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.wfc.common.core.web.domain.BaseEntity;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
@@ -13,179 +13,168 @@ import java.util.List;
/**
* 部门表 sys_dept
*
*
* @author ruoyi
*/
public class SysDept extends BaseEntity {
public class SysDept extends BaseEntity
{
private static final long serialVersionUID = 1L;
/**
* 部门ID
*/
/** 部门ID */
private Long deptId;
/**
* 父部门ID
*/
/** 父部门ID */
private Long parentId;
/**
* 祖级列表
*/
/** 祖级列表 */
private String ancestors;
/**
* 部门名称
*/
/** 部门名称 */
private String deptName;
/**
* 显示顺序
*/
/** 显示顺序 */
private Integer orderNum;
/**
* 负责人
*/
/** 负责人 */
private String leader;
/**
* 联系电话
*/
/** 联系电话 */
private String phone;
/**
* 邮箱
*/
/** 邮箱 */
private String email;
/**
* 部门状态:0正常,1停用
*/
/** 部门状态:0正常,1停用 */
private String status;
/**
* 删除标志（0代表存在 2代表删除）
*/
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/**
* 父部门名称
*/
/** 父部门名称 */
private String parentName;
/**
* 备注
*/
/** 备注 */
private String remark;
/**
* 子部门
*/
/** 子部门 */
private List<SysDept> children = new ArrayList<SysDept>();
public Long getDeptId() {
public Long getDeptId()
{
return deptId;
}
public void setDeptId(Long deptId) {
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getParentId() {
public Long getParentId()
{
return parentId;
}
public void setParentId(Long parentId) {
public void setParentId(Long parentId)
{
this.parentId = parentId;
}
public String getAncestors() {
public String getAncestors()
{
return ancestors;
}
public void setAncestors(String ancestors) {
public void setAncestors(String ancestors)
{
this.ancestors = ancestors;
}
@NotBlank(message = "部门名称不能为空")
@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
public String getDeptName() {
public String getDeptName()
{
return deptName;
}
public void setDeptName(String deptName) {
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
@NotNull(message = "显示顺序不能为空")
public Integer getOrderNum() {
public Integer getOrderNum()
{
return orderNum;
}
public void setOrderNum(Integer orderNum) {
public void setOrderNum(Integer orderNum)
{
this.orderNum = orderNum;
}
public String getLeader() {
public String getLeader()
{
return leader;
}
public void setLeader(String leader) {
public void setLeader(String leader)
{
this.leader = leader;
}
@Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
public String getPhone() {
public String getPhone()
{
return phone;
}
public void setPhone(String phone) {
public void setPhone(String phone)
{
this.phone = phone;
}
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
public String getEmail() {
public String getEmail()
{
return email;
}
public void setEmail(String email) {
public void setEmail(String email)
{
this.email = email;
}
public String getStatus() {
public String getStatus()
{
return status;
}
public void setStatus(String status) {
public void setStatus(String status)
{
this.status = status;
}
public String getDelFlag() {
public String getDelFlag()
{
return delFlag;
}
public void setDelFlag(String delFlag) {
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getParentName() {
public String getParentName()
{
return parentName;
}
public void setParentName(String parentName) {
public void setParentName(String parentName)
{
this.parentName = parentName;
}
public List<SysDept> getChildren() {
return children;
}
public void setChildren(List<SysDept> children) {
this.children = children;
}
public String getRemark() {
return remark;
}
@@ -194,24 +183,34 @@ public class SysDept extends BaseEntity {
this.remark = remark;
}
public List<SysDept> getChildren()
{
return children;
}
public void setChildren(List<SysDept> children)
{
this.children = children;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("deptId", getDeptId())
.append("parentId", getParentId())
.append("ancestors", getAncestors())
.append("deptName", getDeptName())
.append("orderNum", getOrderNum())
.append("leader", getLeader())
.append("phone", getPhone())
.append("email", getEmail())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("deptId", getDeptId())
.append("parentId", getParentId())
.append("ancestors", getAncestors())
.append("deptName", getDeptName())
.append("orderNum", getOrderNum())
.append("leader", getLeader())
.append("phone", getPhone())
.append("email", getEmail())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

16
wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysRole.java
View File

@@ -31,6 +31,10 @@ public class SysRole extends BaseEntity
@Excel(name = "角色权限")
private String roleKey;
/** 角色排序 */
@Excel(name = "角色排序")
private Integer roleSort;
/** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
@Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
private String dataScope;
@@ -114,6 +118,17 @@ public class SysRole extends BaseEntity
this.roleKey = roleKey;
}
@NotNull(message = "显示顺序不能为空")
public Integer getRoleSort()
{
return roleSort;
}
public void setRoleSort(Integer roleSort)
{
this.roleSort = roleSort;
}
public String getDataScope()
{
return dataScope;
@@ -210,6 +225,7 @@ public class SysRole extends BaseEntity
.append("roleId", getRoleId())
.append("roleName", getRoleName())
.append("roleKey", getRoleKey())
.append("roleSort", getRoleSort())
.append("dataScope", getDataScope())
.append("menuCheckStrictly", isMenuCheckStrictly())
.append("deptCheckStrictly", isDeptCheckStrictly())

4
wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysUser.java
View File

@@ -22,7 +22,7 @@ public class SysUser extends BaseEntity
private static final long serialVersionUID = 1L;
/** 用户ID */
@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
private Long userId;
/** 部门ID */
@@ -59,7 +59,7 @@ public class SysUser extends BaseEntity
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
private String status;
/** 删除标志（0-代表存在 2-代表删除） */
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/** 最后登录IP */

6
wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteUserFallbackFactory.java
View File

@@ -36,6 +36,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
{
return R.fail("注册用户失败:" + throwable.getMessage());
}
@Override
public R<Boolean> recordUserLogin(SysUser sysUser, String source)
{
return R.fail("记录用户登录信息失败:" + throwable.getMessage());
}
};
}
}