From c54a9d92b957f657da219519de17da1fd8b77db6 Mon Sep 17 00:00:00 2001 From: Fxz <2235602974@qq.com> Date: Mon, 25 Apr 2022 20:00:32 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20[=E5=AF=86=E9=92=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E5=A2=9E=E5=8A=A0=E6=89=A9=E5=B1=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20&=20=E6=95=8F=E6=84=9F=E6=95=B0=E6=8D=AE=E8=84=B1?= =?UTF-8?q?=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2pigxx.sql | 1 + .../pigx/admin/api/entity/SysSocialDetails.java | 9 +++++++++ .../pigx/admin/service/impl/ConnectServiceImpl.java | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/db/2pigxx.sql b/db/2pigxx.sql index d18caeb95..64ff058cf 100644 --- a/db/2pigxx.sql +++ b/db/2pigxx.sql @@ -803,6 +803,7 @@ CREATE TABLE `sys_social_details` ( `app_id` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL, `app_secret` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL, `redirect_url` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL, + `ext` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '拓展字段', `create_by` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT ' ' COMMENT '创建人', `update_by` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT ' ' COMMENT '修改人', `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java index 5bd5cef89..732ae5742 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.pig4cloud.pigx.common.core.sensitive.Sensitive; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -63,6 +64,7 @@ public class SysSocialDetails extends Model { /** * appid */ + @Sensitive(prefixNoMaskLen = 4, suffixNoMaskLen = 4) @NotBlank(message = "账号不能为空") @ApiModelProperty(value = "appId") private String appId; @@ -70,6 +72,7 @@ public class SysSocialDetails extends Model { /** * app_secret */ + @Sensitive(prefixNoMaskLen = 9, suffixNoMaskLen = 9) @NotBlank(message = "密钥不能为空") @ApiModelProperty(value = "app secret") private String appSecret; @@ -80,6 +83,12 @@ public class SysSocialDetails extends Model { @ApiModelProperty(value = "回调地址") private String redirectUrl; + /** + * 拓展字段 + */ + @ApiModelProperty(value = "拓展字段") + private String ext; + /** * 创建人 */ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/ConnectServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/ConnectServiceImpl.java index d184d2fb4..26f956af7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/ConnectServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/ConnectServiceImpl.java @@ -145,7 +145,7 @@ public class ConnectServiceImpl implements ConnectService { // 用户信息 UserDTO userDTO = new UserDTO(); - userDTO.setDeptId(Convert.toLong(deptInfo.get("dept_id"))); + userDTO.setDeptId(deptInfo.getLong("dept_id")); userDTO.setAvatar(userObj.getStr("avatar")); userDTO.setUsername(userObj.getStr("mobile")); userDTO.setPhone(userObj.getStr("mobile"));