From 8c0c2dce34cfacfe76f8a55f57c73471771b0e94 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 29 Nov 2024 15:57:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?pom=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/pom.xml b/pom.xml index 2371ef3..159fc53 100644 --- a/pom.xml +++ b/pom.xml @@ -157,32 +157,6 @@ 1.1 - - - org.apache.commons - commons-lang3 - - - - - com.aliyun - alibaba-dingtalk-service-sdk - 2.0.0 - - - - - - - - - - - - - - - org.redisson redisson From 2239c6556c8ab98347bb53fa25f3135964409dcd Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 3 Dec 2024 15:35:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../req/AddOrUpdateAdminUserReqVO.java | 4 ++++ .../pc/adminUser/req/AdminUserListReqVO.java | 8 ++------ .../pc/adminUser/resp/AdminUserListRespVO.java | 18 ++++++++---------- .../entity/RenderWorkerEntity.java | 2 +- .../renderWorker/req/RenderWorkerReqQuery.java | 2 +- .../renderWorker/resp/RenderWorkerRespVO.java | 2 +- .../basic/model/pc/role/req/RoleListReqVO.java | 2 -- .../resources/mapper/pc/AdminUserMapper.xml | 9 ++++++++- 8 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java index 46afeb0..4a8df87 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java @@ -16,4 +16,8 @@ public class AddOrUpdateAdminUserReqVO { private String account; @ApiModelProperty(value = "密码") private String password; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty(value = "手机号") + private String phone; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java index 135b85d..8c33105 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java @@ -11,13 +11,9 @@ public class AdminUserListReqVO extends BaseQueryParameterReq { @ApiModelProperty(value = "姓名") private String name; @ApiModelProperty(value = "账号") + private String account; + @ApiModelProperty(value = "手机号") private String phone; - @ApiModelProperty(value = "工号") - private String jobNo; - @ApiModelProperty(value = "组织ID") - private String companyId; - //@ApiModelProperty(value = "部门ID") - //private String departmentId; @ApiModelProperty(value = "角色ID") private String roleId; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java index 813c5b7..381d3c1 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java @@ -4,27 +4,25 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data @ApiModel(value = "后台管理人员返回列表VO") public class AdminUserListRespVO { @ApiModelProperty(value = "id") private String id; + @ApiModelProperty(value = "账号") + private String account; @ApiModelProperty(value = "昵称") private String name; -// @ApiModelProperty(value = "员工ID") -// private String staffId; -// @ApiModelProperty(value = "员工姓名") -// private String staffName; @ApiModelProperty(value = "手机号") private String phone; -// @ApiModelProperty(value = "工号") -// private String jobNo; -// @ApiModelProperty(value = "组织") -// private String companyName; -// @ApiModelProperty(value = "组织ID") -// private String companyId; @ApiModelProperty(value = "角色") private String roleName; @ApiModelProperty(value = "角色ID") private String roleId; + @ApiModelProperty(value = "状态") + private Integer status; + @ApiModelProperty(value = "创建时间") + private Date createTime; } diff --git a/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java index 2276736..42e34fe 100644 --- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java @@ -28,7 +28,7 @@ public class RenderWorkerEntity { /** * 运行环境 */ - private String runTimeVersion; + private String runtimeVersion; /** * 版本 */ diff --git a/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java index 520be7e..26d1102 100644 --- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java @@ -34,7 +34,7 @@ public class RenderWorkerReqQuery extends BaseQueryParameterReq { * 运行环境 */ @ApiModelProperty("运行环境") - private String runTimeVersion; + private String runtimeVersion; /** * 版本 */ diff --git a/src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java index 2590305..9175685 100644 --- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java @@ -31,7 +31,7 @@ public class RenderWorkerRespVO { * 运行环境 */ @ApiModelProperty("运行环境") - private String runTimeVersion; + private String runtimeVersion; /** * 版本 */ diff --git a/src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java b/src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java index a364330..97342d6 100644 --- a/src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java @@ -10,6 +10,4 @@ import lombok.Data; public class RoleListReqVO extends BaseQueryParameterReq { @ApiModelProperty(value = "名字") private String name; -// @ApiModelProperty(value = "0系统角色 1业务角色") -// private Integer type; } diff --git a/src/main/resources/mapper/pc/AdminUserMapper.xml b/src/main/resources/mapper/pc/AdminUserMapper.xml index a6ce0fc..6db54dc 100644 --- a/src/main/resources/mapper/pc/AdminUserMapper.xml +++ b/src/main/resources/mapper/pc/AdminUserMapper.xml @@ -27,7 +27,7 @@ update admin_user - set `role_id` =#{roleId} + set `role_id` =#{roleId}, `account`=#{account}, `name`=#{name}, `phone`=#{phone} where id = #{id} @@ -44,6 +44,9 @@ au.id, au.phone, au.name, + au.account, + au.create_time, + au.status, r.id as roleId, r.name as roleName from admin_user au, @@ -54,6 +57,10 @@ and locate(#{name},au.`name`) > 0 + + and + locate(#{account},au.`account`) > 0 + and locate(#{phone},au.`phone`) > 0 From 58301128fa8607efc45698db3add92d0a3fd3ae8 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 4 Dec 2024 16:47:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E4=BA=91OSS=E3=80=81=E4=BA=BA=E8=84=B8=E6=A3=80=E7=B4=A2SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index 159fc53..ecabfb7 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,24 @@ 3.14.1 + + + com.aliyun.oss + aliyun-sdk-oss + 3.17.4 + + + + + com.aliyun + aliyun-java-sdk-core + 4.6.1 + + + com.aliyun + aliyun-java-sdk-facebody + 2.0.12 +