From b6872aa0e3979653d4a8c2ef8a2149bb4a1123ff Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 13 二月 2025 16:11:24 +0800
Subject: [PATCH] 小程序登录
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java | 5 ++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TTenantResp.java | 70 +++++++++++++++++++++++++++++++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java | 20 ++++------
3 files changed, 83 insertions(+), 12 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 7f39fab..658b4f5 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.TTenantResp;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
@@ -29,6 +30,7 @@
import com.ruoyi.system.utils.wx.tools.WxUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -128,6 +130,9 @@
tTenantService.save(tenant);
}
LoginUserApplet loginUserApplet = new LoginUserApplet();
+ TTenantResp tTenantResp = new TTenantResp();
+ BeanUtils.copyProperties(tenant, tTenantResp);
+ loginUserApplet.setUser(tTenantResp);
loginUserApplet.setUserId(Long.valueOf(tenant.getId()));
Map<String, Object> tokenInfos = new HashMap<>();
tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TTenantResp.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TTenantResp.java
new file mode 100644
index 0000000..33b6fec
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TTenantResp.java
@@ -0,0 +1,70 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 租户
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TTenant对象", description="登录返回")
+public class TTenantResp {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @ApiModelProperty(value = "住户名称")
+ private String residentName;
+
+ @ApiModelProperty(value = "入住时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate checkinTime;
+
+ @ApiModelProperty(value = "租户属性")
+ private String tenantAttributes;
+
+ @ApiModelProperty(value = "租户类型")
+ private String tenantType;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "证件号码")
+ private String idCard;
+
+ @ApiModelProperty(value = "邮箱")
+ private String email;
+
+ @ApiModelProperty(value = "银行转账专号")
+ private String bankNumber;
+
+ @ApiModelProperty(value = "通讯地址")
+ private String mailAddress;
+
+ @ApiModelProperty(value = "登录账号")
+ private String account;
+
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+ @ApiModelProperty(value = "微信openid")
+ private String openId;
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
index 963aa01..2dceb2e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TTenantResp;
+import lombok.Data;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@@ -13,6 +15,7 @@
*
* @author ruoyi
*/
+@Data
public class LoginUserApplet implements UserDetails
{
private static final long serialVersionUID = 1L;
@@ -70,19 +73,20 @@
/**
* 用户信息
*/
- private SysUser user;
+ private TTenantResp user;
+
public LoginUserApplet()
{
}
- public LoginUserApplet(SysUser user, Set<String> permissions)
+ public LoginUserApplet(TTenantResp user, Set<String> permissions)
{
this.user = user;
this.permissions = permissions;
}
- public LoginUserApplet(Long userId, Long deptId, SysUser user, Set<String> permissions)
+ public LoginUserApplet(Long userId, Long deptId, TTenantResp user, Set<String> permissions)
{
this.userId = userId;
this.deptId = deptId;
@@ -130,7 +134,7 @@
@Override
public String getUsername()
{
- return user.getUserName();
+ return user.getResidentName();
}
/**
@@ -249,15 +253,7 @@
this.permissions = permissions;
}
- public SysUser getUser()
- {
- return user;
- }
- public void setUser(SysUser user)
- {
- this.user = user;
- }
@Override
public Collection<? extends GrantedAuthority> getAuthorities()
--
Gitblit v1.7.1