dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dyf-device'

Browse Source
This commit is contained in:
daiyongfei
2025-07-12 14:01:00 +08:00
parent fbbe90207e fdb64b1dcc
commit cfafbc54f7
18 changed files with 652 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fys-admin/src/main/java/com/fuyuanshen/app/model/AppSmsLoginBody.java
View File

@ -22,4 +22,5 @@ public class AppSmsLoginBody {
*/
@NotBlank(message = "租户ID不能为空")
private String tenantId;
}

102
fys-admin/src/main/java/com/fuyuanshen/mp/controller/MPAuthController.java Normal file
View File

@ -0,0 +1,102 @@
package com.fuyuanshen.mp.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.exception.NotLoginException;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.fuyuanshen.app.model.AppSmsLoginBody;
import com.fuyuanshen.app.service.AppLoginService;
import com.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.domain.R;
import com.fuyuanshen.common.core.domain.model.AppLoginUser;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.domain.model.RegisterBody;
import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
import com.fuyuanshen.common.core.utils.*;
import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.equipment.domain.UserApp;
import com.fuyuanshen.equipment.enums.AppUserTypeEnum;
import com.fuyuanshen.mp.domian.dto.AuthUserDto;
import com.fuyuanshen.mp.service.MPAuthService;
import com.fuyuanshen.mp.service.MPService;
import com.fuyuanshen.system.domain.bo.SysTenantBo;
import com.fuyuanshen.system.domain.vo.SysClientVo;
import com.fuyuanshen.system.domain.vo.SysTenantVo;
import com.fuyuanshen.system.domain.vo.SysUserVo;
import com.fuyuanshen.system.service.ISysClientService;
import com.fuyuanshen.system.service.ISysConfigService;
import com.fuyuanshen.system.service.ISysTenantService;
import com.fuyuanshen.web.domain.vo.LoginTenantVo;
import com.fuyuanshen.web.domain.vo.LoginVo;
import com.fuyuanshen.web.domain.vo.TenantListVo;
import com.fuyuanshen.web.service.IAuthStrategy;
import com.fuyuanshen.web.service.SysRegisterService;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.core.factory.SmsFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* APP认证
*
* @author Lion Li
*/
@Slf4j
@SaIgnore
@RequiredArgsConstructor
@RestController
@RequestMapping("/mp")
public class MPAuthController {
private final AppLoginService loginService;
private final SysRegisterService registerService;
private final ISysConfigService configService;
private final ISysTenantService tenantService;
private final ISysClientService clientService;
private final MPAuthService mpAuthService;
private final MPService mpService;
@Operation(summary = "小程序登录授权")
@PostMapping(value = "/login")
public ResponseEntity<Object> login(@RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
Long phoneNumber = authUser.getPhoneNumber();
// 判断小程序用户是否存在，不存在创建
UserApp mpUser = mpService.getMpUser(phoneNumber);
if (mpUser == null) {
RegisterBody registerBody = new RegisterBody();
registerBody.setUsername(phoneNumber.toString());
registerBody.setUserType(AppUserTypeEnum.XCX_USER.getCode());
registerBody.setTenantId("894078");
registerBody.setPassword("123456");
mpAuthService.register(registerBody);
}
// 去登录
SysClientVo client = clientService.queryByClientId("ca839698e245d60aa2f0e59bd52b34f8");
UserApp user = mpService.loadUserByUsername(phoneNumber.toString());
LoginUser loginUser = mpAuthService.buildLoginUser(user);
LoginVo login = mpAuthService.login(loginUser, client);
// 返回登录信息
return ResponseEntity.ok(login);
}
}

37
fys-admin/src/main/java/com/fuyuanshen/mp/controller/MPController.java Normal file
View File

@ -0,0 +1,37 @@
package com.fuyuanshen.mp.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import com.fuyuanshen.common.core.domain.ResponseVO;
import com.fuyuanshen.equipment.service.DeviceService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author: 默苍璃
* @date: 2025-07-1208:36
*/
@Slf4j
@RestController
@RequestMapping("/mp")
@RequiredArgsConstructor
@Tag(name = "小程序：相关接口")
@SaIgnore
public class MPController {
private final DeviceService deviceService;
@GetMapping("/queryDevice")
@Operation(summary = "检查是否存在设备MAC号")
public ResponseVO<Boolean> queryDevice(@Parameter(name = "设备mac值") String mac) {
return ResponseVO.success(deviceService.queryDevice(mac));
}
}

46
fys-admin/src/main/java/com/fuyuanshen/mp/domian/dto/AuthUserDto.java Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright 2019-2025 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.fuyuanshen.mp.domian.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
/**
* @author Zheng Jie
* @date 2018-11-30
*/
@Getter
@Setter
public class AuthUserDto {
@Schema(name = "用户名")
private String username;
@Schema(name = "手机号（APP/小程序 登录）")
private Long phoneNumber;
@Schema(name = "密码")
private String password;
@Schema(name = "验证码")
private String code;
@Schema(name = "验证码的key")
private String uuid = "";
}

8
fys-admin/src/main/java/com/fuyuanshen/mp/mapper/MPMapper.java Normal file
View File

@ -0,0 +1,8 @@
package com.fuyuanshen.mp.mapper;
/**
* @author: 默苍璃
* @date: 2025-07-1210:16
*/
public interface MPMapper {
}

164
fys-admin/src/main/java/com/fuyuanshen/mp/service/MPAuthService.java Normal file
View File

@ -0,0 +1,164 @@
package com.fuyuanshen.mp.service;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Opt;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.digest.BCrypt;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuyuanshen.app.domain.vo.AppUserVo;
import com.fuyuanshen.app.service.IAppRoleService;
import com.fuyuanshen.common.core.constant.Constants;
import com.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.constant.TenantConstants;
import com.fuyuanshen.common.core.domain.dto.PostDTO;
import com.fuyuanshen.common.core.domain.dto.RoleDTO;
import com.fuyuanshen.common.core.domain.model.AppLoginUser;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
import com.fuyuanshen.common.core.domain.model.RegisterBody;
import com.fuyuanshen.common.core.enums.LoginType;
import com.fuyuanshen.common.core.enums.UserType;
import com.fuyuanshen.common.core.exception.user.UserException;
import com.fuyuanshen.common.core.utils.*;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.log.event.LogininforEvent;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.tenant.exception.TenantException;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.equipment.domain.Device;
import com.fuyuanshen.equipment.domain.UserApp;
import com.fuyuanshen.equipment.service.AppUserService;
import com.fuyuanshen.system.domain.SysUser;
import com.fuyuanshen.system.domain.bo.SysUserBo;
import com.fuyuanshen.system.domain.vo.*;
import com.fuyuanshen.system.service.ISysTenantService;
import com.fuyuanshen.system.service.ISysUserService;
import com.fuyuanshen.web.domain.vo.LoginVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.time.Duration;
import java.util.*;
import java.util.function.Supplier;
/**
* 登录校验方法
*
* @author Lion Li
*/
@RequiredArgsConstructor
@Slf4j
@Service
public class MPAuthService {
private final ISysUserService userService;
private final AppUserService appUserService;
/**
* 小程序注册
*/
public void register(RegisterBody registerBody) {
String tenantId = registerBody.getTenantId();
String username = registerBody.getUsername();
String password = registerBody.getPassword();
// 校验用户类型是否存在
String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
UserApp sysUser = new UserApp();
sysUser.setUserName(username);
sysUser.setNickName(username);
sysUser.setPhonenumber(username);
sysUser.setTenantId(tenantId);
sysUser.setUserType(registerBody.getUserType());
sysUser.setPassword(BCrypt.hashpw(password));
sysUser.setUserType(userType);
appUserService.saveMpUser(sysUser);
}
/**
* 记录登录信息
*
* @param tenantId 租户ID
* @param username 用户名
* @param status 状态
* @param message 消息内容
* @return
*/
private void recordLogininfor(String tenantId, String username, String status, String message) {
LogininforEvent logininforEvent = new LogininforEvent();
logininforEvent.setTenantId(tenantId);
logininforEvent.setUsername(username);
logininforEvent.setStatus(status);
logininforEvent.setMessage(message);
logininforEvent.setRequest(ServletUtils.getRequest());
// com.fuyuanshen.web.listener.UserActionListener
SpringUtils.context().publishEvent(logininforEvent);
}
public LoginVo login(LoginUser loginUser, SysClientVo client) {
loginUser.setClientKey(client.getClientKey());
loginUser.setDeviceType(client.getDeviceType());
SaLoginParameter model = new SaLoginParameter();
model.setDeviceType(client.getDeviceType());
// 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
// 例如: 后台用户30分钟过期 app用户1天过期
model.setTimeout(client.getTimeout());
model.setActiveTimeout(client.getActiveTimeout());
model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
// 生成token
LoginHelper.login(loginUser, model);
LoginVo loginVo = new LoginVo();
loginVo.setAccessToken(StpUtil.getTokenValue());
loginVo.setExpireIn(StpUtil.getTokenTimeout());
loginVo.setClientId(client.getClientId());
return loginVo;
}
/**
* 构建登录用户
*/
public LoginUser buildLoginUser(UserApp user) {
LoginUser loginUser = new LoginUser();
Long userId = user.getUserId();
loginUser.setTenantId(user.getTenantId());
loginUser.setUserId(userId);
loginUser.setDeptId(user.getDeptId());
loginUser.setUsername(user.getUserName());
loginUser.setNickname(user.getNickName());
loginUser.setUserType(user.getUserType());
// 用户级别
// loginUser.setUserLevel(user.getUserLevel());
// pid
// loginUser.setPid(user.getPid());
// loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
// loginUser.setRolePermission(permissionService.getRolePermission(userId));
// if (ObjectUtil.isNotNull(user.getDeptId())) {
// Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
// loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
// loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
// }
// List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
// // List<SysPostVo> posts = postService.selectPostsByUserId(userId);
// loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
// loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
return loginUser;
}
}

26
fys-admin/src/main/java/com/fuyuanshen/mp/service/MPService.java Normal file
View File

@ -0,0 +1,26 @@
package com.fuyuanshen.mp.service;
import com.fuyuanshen.equipment.domain.UserApp;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* 登录校验方法
*
* @author Lion Li
*/
public interface MPService {
/**
* 获取小程序用户信息
*
* @param phoneNumber 手机号
*/
UserApp getMpUser(Long phoneNumber);
UserApp loadUserByUsername(String username);
}

12
fys-admin/src/main/java/com/fuyuanshen/mp/service/impl/MPAuthServiceImpl.java Normal file
View File

@ -0,0 +1,12 @@
package com.fuyuanshen.mp.service.impl;
/**
* 登录校验方法
*
* @author Lion Li
*/
public class MPAuthServiceImpl {
}

43
fys-admin/src/main/java/com/fuyuanshen/mp/service/impl/MPServiceImpl.java Normal file
View File

@ -0,0 +1,43 @@
package com.fuyuanshen.mp.service.impl;
import com.fuyuanshen.equipment.domain.UserApp;
import com.fuyuanshen.equipment.mapper.UserAppMapper;
import com.fuyuanshen.equipment.service.AppUserService;
import com.fuyuanshen.mp.service.MPService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* 登录校验方法
*
* @author Lion Li
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class MPServiceImpl implements MPService {
private final AppUserService appUserService;
/**
* 获取小程序用户信息
*
* @param phoneNumber 手机号
*/
@Override
public UserApp getMpUser(Long phoneNumber) {
return appUserService.getMpUser(phoneNumber);
}
@Override
public UserApp loadUserByUsername(String username) {
return appUserService.loadUserByUsername(username);
}
}

2
fys-admin/src/main/java/com/fuyuanshen/web/controller/AuthController.java
View File

@ -111,6 +111,7 @@ public class AuthController {
return R.ok(loginVo);
}
/**
* 获取跳转URL
*
@ -133,6 +134,7 @@ public class AuthController {
return R.ok("操作成功", authorizeUrl);
}
/**
* 前端回调绑定授权(需要token)
*