lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增微信小程序登录,新增白名单设置,新增白名单修改接口

master
徐杰盟 2024-06-03 14:14:30 +08:00
parent b19832d9bd
commit 0060bd7b1a
16 changed files with 304 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -215,6 +215,14 @@
<version>4.4.13</version>
</dependency>
<!--微信小程序-->
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
<version>4.6.0</version>
</dependency>
</dependencies>
<build>

7
sql/data.sql
View File

@ -26,4 +26,9 @@ insert into "FXKH_TXL"."ADDRESS_BOOK"("NAME", "PHONE", "ORGANIZATION", "POSITION
alter table "FXKH_TXL"."AB_INFO" add column("ADCD" VARCHAR(50));
comment on column "FXKH_TXL"."AB_INFO"."ADCD" is '行政区划';
comment on column "FXKH_TXL"."AB_INFO"."ADCD" is '行政区划';
alter table "FXKH_TXL"."ADDRESS_BOOK" add column("IS_PASS" TINYINT default (FALSE));
comment on column "FXKH_TXL"."ADDRESS_BOOK"."IS_PASS" is '是否放行, 放行:true,拦截:false';

56
src/main/java/com/whdc/config/WxMiniappConfiguration.java Normal file
View File

@ -0,0 +1,56 @@
package com.whdc.config;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import lombok.Data;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* Description:
* Created by XuSan on 2024/6/3.
* 微信小程序 配置
*
* @author XuSan
* @version 1.0
*/
@Data
@Configuration
@ConditionalOnClass(WxMaService.class)
@ConfigurationProperties(prefix = "wx.miniapp.configs")
public class WxMiniappConfiguration {
/**
* 设置微信小程序的appId
*/
private String appId;
/**
* 设置微信小程序的Secret
*/
private String secret;
@Bean
@ConditionalOnMissingBean(WxMaService.class)
public WxMaService wxMaService() {
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
config.setAppid(this.getAppId());
config.setSecret(this.getSecret());
WxMaService service = new WxMaServiceImpl();
service.setWxMaConfig(config);
return service;
}
}

39
src/main/java/com/whdc/controller/AddressBookController.java
View File

@ -403,6 +403,45 @@ public class AddressBookController {
}
@ApiOperation(value = "设置白名单")
@PostMapping(value = "setWhitelists")
public ResultJson setWhitelists(@RequestBody @Validated(Update.class) AddressBook model) {
Integer loginId = Integer.valueOf(String.valueOf(StpUtil.getLoginId()));
User user = userService.getRole(loginId);
switch (Objects.requireNonNull(Role.getByName(user.getRole()))) {
case R000:
case R001:
return ResultJson.error("权限不足");
case R099: {
break;
}
default:
return ResultJson.error("权限不足!!");
}
AddressBook byId = service.getById(model.getId());
if (Objects.isNull(byId)) {
return ResultJson.error("当前数据不存在");
}
byId.setIsPass(model.getIsPass());
versionsService.saveInfo(model, VersionsType.WHITE, byId.getAdcd());
boolean update = service.lambdaUpdate()
.set(AddressBook::getIsPass, model.getIsPass())
.eq(AddressBook::getId, model.getId())
.update();
if (!update){
throw new MyException("操作数据库失败");
}
return ResultJson.ok(update);
}
@ApiOperation(value = "删除")
@GetMapping(value = "del/{id}")
@CacheEvict(value = ADDRESS_BOOK_REDIS_KEY, allEntries = true)

17
src/main/java/com/whdc/controller/AdinfoController.java
View File

@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@ -86,9 +87,21 @@ public class AdinfoController {
// 确保查的是县
List<Adinfo> list = service.lambdaQuery()
.likeRight(Adinfo::getAdcd, adcd.replace("00000000000", ""))
.likeLeft(Adinfo::getAdcd, "000000000")
.likeRight(Adinfo::getAdcd, adcd.substring(0,4))
.ne(Adinfo::getAdcd,adcd.substring(0,4) + "00000000000")
.list();
if (CollectionUtils.isNotEmpty(list)){
return ResultJson.ok(list.stream().map(ad -> {
if ("市辖区".equals(ad.getAdnm())){
Adinfo adinfo = service.lambdaQuery().eq(Adinfo::getAdcd, ad.getAdcd().substring(0, 4) + "00000000000")
.one();
if (Objects.nonNull(adinfo)){
ad.setAdnm(adinfo.getAdnm());
}
}
return ad;
}).sorted(Comparator.comparing(Adinfo::getAdcd)).collect(Collectors.toList()));
}
return ResultJson.ok(list);
}

43
src/main/java/com/whdc/controller/UserController.java
View File

@ -4,13 +4,13 @@ package com.whdc.controller;
import cn.dev33.satoken.stp.StpUtil;
import com.whdc.model.dto.LoginDto;
import com.whdc.model.dto.UserDto;
import com.whdc.model.dto.VxLoginDto;
import com.whdc.model.entity.User;
import com.whdc.model.group.Insert;
import com.whdc.model.group.Update;
import com.whdc.model.vo.AuthToken;
import com.whdc.model.vo.LoginVo;
import com.whdc.service.IUserService;
import com.whdc.utils.HttpUtil;
import com.whdc.service.impl.UserServiceImpl;
import com.whdc.utils.ResultJson;
import io.swagger.annotations.Api;
@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
import java.lang.reflect.InvocationTargetException;
import java.util.Objects;
import java.util.UUID;
import static com.whdc.service.impl.UserServiceImpl.getPassword;
@ -41,8 +40,8 @@ public class UserController {
private IUserService service;
@ApiOperation(value = "登录", notes = "登录后，从 tokenInfo 中获取 token 相关信息。headers[tokenName] = tokenValue ")
@PostMapping("doLogin")
// @ApiOperation(value = "登录", notes = "登录后，从 tokenInfo 中获取 token 相关信息。headers[tokenName] = tokenValue ")
// @PostMapping("doLogin")
public ResultJson<LoginVo> doLogin(@RequestBody @Validated LoginDto obj) throws InvocationTargetException, IllegalAccessException {
LoginVo loginVo = service.login(obj);
@ -60,6 +59,26 @@ public class UserController {
}
}
@ApiOperation(value = "wx登录", notes = "登录后，从 tokenInfo 中获取 token 相关信息。headers[tokenName] = tokenValue ")
@PostMapping("wxLogin")
public ResultJson<LoginVo> wxLogin(@RequestBody @Validated VxLoginDto obj) throws InvocationTargetException, IllegalAccessException {
LoginVo loginVo = service.wxLogin(obj);
if (loginVo == null || loginVo.getId() == null) {
return ResultJson.error("登录失败");
} else {
StpUtil.login(loginVo.getId()); // 使用 user id 登录
// 获取 Token 相关参数
loginVo.setTokenInfo(new AuthToken(StpUtil.getTokenInfo()));
// 更新最后登录时间
service.updateLastDate(loginVo.getId());
return ResultJson.ok(loginVo);
}
}
@ApiOperation(value = "查询登录状态")
@PostMapping("isLogin")
public ResultJson<AuthToken> isLogin() {
@ -146,16 +165,16 @@ public class UserController {
}
@ApiOperation(value = "修改密码")
@PostMapping(value = "updatePw")
// @ApiOperation(value = "修改密码")
// @PostMapping(value = "updatePw")
public ResultJson updatePwd(@RequestBody UserDto dto) {
return service.updatePwd(dto);
}
@ApiOperation(value = "忘记密码")
@GetMapping(value = "forgotPassword/{username}")
// @ApiOperation(value = "忘记密码")
// @GetMapping(value = "forgotPassword/{username}")
public ResultJson updatePwd(@PathVariable("username") String username) {
User one = service.lambdaQuery().eq(User::getUsername, username)
.one();
@ -173,16 +192,16 @@ public class UserController {
}
@ApiOperation(value = "发送验证码")
@GetMapping(value = "pushCode/{phone}")
// @ApiOperation(value = "发送验证码")
// @GetMapping(value = "pushCode/{phone}")
public ResultJson pushCode(@PathVariable("phone") String phone) {
return ResultJson.ok(service.pushCode(phone));
}
@ApiOperation(value = "手机验证码登录")
@GetMapping(value = "loginByCode/{phone}/{code}")
// @ApiOperation(value = "手机验证码登录")
// @GetMapping(value = "loginByCode/{phone}/{code}")
public ResultJson loginByCode(@PathVariable("phone") String phone,@PathVariable("code") String code) throws InvocationTargetException, IllegalAccessException {
LoginVo loginVo = service.loginByCode(phone, code.toUpperCase());

2
src/main/java/com/whdc/mapper/AddressBookMapper.java
View File

@ -19,7 +19,7 @@ public interface AddressBookMapper extends BaseMapper<AddressBook> {
List<AddressBook> find(@Param("dto") AddressBook dto);
List<AddressBook> getListByAdnm(@Param("adnm") String adnm);
List<AddressBook> getListByAdnm(@Param("adcd") String adcd);
AddressBookVo getVoById(@Param("id") Integer id);
}

22
src/main/java/com/whdc/model/dto/VxLoginDto.java Normal file
View File

@ -0,0 +1,22 @@
package com.whdc.model.dto;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
/**
* @author 李赛
* @date 2022-07-01 1:21
*/
@Data
public class VxLoginDto {
@ApiParam(value = "微信编码")
@NotEmpty(message = "微信编码不能为空")
private String wxcode;
@ApiParam(value = "手机编码")
@NotEmpty(message = "手机编码不能为空")
private String phoneCode;
}

5
src/main/java/com/whdc/model/entity/AddressBook.java
View File

@ -101,4 +101,9 @@ public class AddressBook extends Model<AddressBook> implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "0:组织,1:单位")
private String type;
@TableField("IS_PASS")
@ApiModelProperty(value = "是否放行, 放行:true,拦截:false")
private Boolean isPass;
}

3
src/main/java/com/whdc/model/enums/VersionsType.java
View File

@ -16,7 +16,8 @@ public enum VersionsType {
ADD("0", "添加用户"),
UPDATE("1", "修改用户"),
UPDATE_ROLE("2", "修改权限"),
DEL("3", "删除用户");
DEL("3", "删除用户"),
WHITE("4", "设置白名单");
private String name;

2
src/main/java/com/whdc/service/IAddressBookService.java
View File

@ -24,7 +24,7 @@ public interface IAddressBookService extends IService<AddressBook> {
// 获取所有规则
List<AddressBook> find(AddressBook dto);
List<AddressBook> getListByAdnm(String adnm);
List<AddressBook> getListByAdnm(String adcd);
}

3
src/main/java/com/whdc/service/IUserService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.whdc.model.dto.LoginDto;
import com.whdc.model.dto.UserDto;
import com.whdc.model.dto.VxLoginDto;
import com.whdc.model.entity.User;
import com.whdc.model.vo.LoginVo;
import com.whdc.utils.ResultJson;
@ -27,6 +28,8 @@ public interface IUserService extends IService<User> {
LoginVo login(LoginDto obj);
LoginVo wxLogin(VxLoginDto obj);
boolean register(User entity);
User getRole(Integer id);

13
src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java
View File

@ -32,6 +32,13 @@ public class AddressBookServiceImpl extends ServiceImpl<AddressBookMapper, Addre
String adcd = dto.getAdcd();
if (null != dto.getAdlevel()) {
switch (dto.getAdlevel()){
case 1:adcd = adcd.substring(0,4); break;
case 2:adcd = adcd.substring(0,6); break;
default:break;
}
}
if (StringUtils.isNotBlank(adcd)) {
if (adcd.length() < 15) {
dto.setV("LIKE ");
@ -52,10 +59,10 @@ public class AddressBookServiceImpl extends ServiceImpl<AddressBookMapper, Addre
return baseMapper.find(dto);
}
@Cacheable(value = ADDRESS_BOOK_REDIS_KEY, key = "#root.method.name+':'+#adnm")
@Cacheable(value = ADDRESS_BOOK_REDIS_KEY, key = "#root.method.name+':'+#adcd")
@Override
public List<AddressBook> getListByAdnm(String adnm) {
return baseMapper.getListByAdnm(adnm);
public List<AddressBook> getListByAdnm(String adcd) {
return baseMapper.getListByAdnm(adcd);
}

108
src/main/java/com/whdc/service/impl/UserServiceImpl.java
View File

@ -1,5 +1,9 @@
package com.whdc.service.impl;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.api.WxMaUserService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -11,6 +15,7 @@ import com.whdc.mapper.AddressBookMapper;
import com.whdc.mapper.UserMapper;
import com.whdc.model.dto.LoginDto;
import com.whdc.model.dto.UserDto;
import com.whdc.model.dto.VxLoginDto;
import com.whdc.model.entity.AddressBook;
import com.whdc.model.entity.User;
import com.whdc.model.vo.AddressBookVo;
@ -19,6 +24,7 @@ import com.whdc.service.IUserService;
import com.whdc.utils.HttpUtil;
import com.whdc.utils.ResultJson;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpStatus;
@ -38,6 +44,7 @@ import static com.whdc.model.MyConstant.REDIS_KEY;
* <p>
* 服务实现类
* </p>
*
* @author xusan
* @date 2024-05-11
*/
@ -53,6 +60,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
@Autowired
private RedisTemplate stringRedisTemplate;
@Autowired
private WxMaService wxMaService;
@Override
public IPage<User> page(User dto) {
return baseMapper.page(new Page<>(), dto);
@ -65,7 +75,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
}
@Override
public LoginVo login(LoginDto dto) {
@ -75,12 +84,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
throw new MyException("用户名或密码错误");
}
if (getPassword(sysUser.getSalt() ,dto.getPassword()).equals(sysUser.getPassword())) {
if (getPassword(sysUser.getSalt(), dto.getPassword()).equals(sysUser.getPassword())) {
LoginVo out = new LoginVo();
BeanUtils.copyProperties(sysUser, out);
AddressBookVo book = addressBookMapper.getVoById(sysUser.getAbId());
if (Objects.nonNull(book)){
if (Objects.nonNull(book)) {
String adcd = book.getAdcd();
if (StringUtils.isNotBlank(adcd)) {
// if ("00000000000".equals(adcd.substring(4))) { // 市
@ -93,12 +102,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
// out.setAdcd(adcd);
// }
out.setAdlevel(2);
out.setAdcd(adcd.substring(0,4));
out.setAdcd(adcd.substring(0, 4));
}
out.setName(book.getName());
out.setOname(book.getOname());
if (StringUtils.isNotBlank(book.getAdnm())){
if (StringUtils.isNotBlank(book.getAdnm())) {
out.setOname(book.getAdnm());
}
}
@ -109,6 +118,75 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
throw new MyException("用户名或密码错误");
}
@Override
public LoginVo wxLogin(VxLoginDto dto) {
WxMaUserService userService = wxMaService.getUserService();
WxMaPhoneNumberInfo phoneNoInfo = null;
try {
phoneNoInfo = userService.getPhoneNoInfo(dto.getPhoneCode());
} catch (WxErrorException e) {
throw new MyException("获取手机号失败," + e.getMessage(), e);
}
if (phoneNoInfo == null) {
throw new MyException("获取微信数据为空1");
}
// 获取手机号
String phone = phoneNoInfo.getPurePhoneNumber();
if (StringUtils.isBlank(phone)) {
throw new MyException("获取手机号失败");
}
WxMaJscode2SessionResult sessionInfo = null;
try {
sessionInfo = userService.getSessionInfo(dto.getWxcode());
} catch (WxErrorException e) {
throw new RuntimeException(e);
}
if (sessionInfo == null) {
throw new MyException("获取微信数据为空2");
}
String openid = sessionInfo.getOpenid();
if (StringUtils.isBlank(openid)) {
throw new MyException("获取微信openid失败");
}
User sysUser = findByLoginName(phone);
if (sysUser == null) {
throw new MyException("用户名或密码错误");
}
LoginVo out = new LoginVo();
BeanUtils.copyProperties(sysUser, out);
AddressBookVo book = addressBookMapper.getVoById(sysUser.getAbId());
if (Objects.nonNull(book)) {
if (!book.getIsPass()){
throw new MyException("当前账号无法登录,请联系上级管理员!");
}
String adcd = book.getAdcd();
if (StringUtils.isNotBlank(adcd)) {
out.setAdlevel(2);
out.setAdcd(adcd.substring(0, 4));
}
out.setName(book.getName());
out.setOname(book.getOname());
if (StringUtils.isNotBlank(book.getAdnm())) {
out.setOname(book.getAdnm());
}
}
return out;
}
@Override
public boolean register(User entity) {
// 生成盐值
@ -123,7 +201,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
public User getRole(Integer id) {
User byId = this.getById(id);
if (byId == null){
if (byId == null) {
throw new MyException("该用户不存在");
}
@ -142,8 +220,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
@Override
public boolean updateLastDate(Integer id) {
return this.lambdaUpdate()
.set(User::getLastLoginDate,new Date())
.eq(User::getId,id)
.set(User::getLastLoginDate, new Date())
.eq(User::getId, id)
.update();
}
@ -214,14 +292,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
// out.setAdcd(adcd);
// }
out.setAdlevel(2);
out.setAdcd(adcd.substring(0,4));
out.setAdcd(adcd.substring(0, 4));
}
out.setName(addressBook.getName());
out.setOname(addressBook.getOname());
AddressBookVo book = addressBookMapper.getVoById(sysUser.getAbId());
if (StringUtils.isNotBlank(book.getAdnm())){
if (StringUtils.isNotBlank(book.getAdnm())) {
out.setOname(book.getAdnm());
}
return out;
@ -294,7 +372,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
String s = HttpUtil.sendPost("http://223.75.53.141:82/shpush/v1/push/", body);
log.info("发送结果: " + s);
JSONObject jsonObject = JSON.parseObject(s);
if (jsonObject.getInteger("code") != HttpStatus.SC_OK){
if (jsonObject.getInteger("code") != HttpStatus.SC_OK) {
throw new MyException(jsonObject.getString("message"));
}
}
@ -312,10 +390,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
}
if (getPassword(sysUser.getSalt() ,dto.getOldPassword()).equals(sysUser.getPassword())) {
if (getPassword(sysUser.getSalt(), dto.getOldPassword()).equals(sysUser.getPassword())) {
// 更新密码
sysUser.setPassword(getPassword(sysUser.getSalt() ,dto.getNewPassword()));
log.info("修改密码" + sysUser.getUsername() + "_" + dto.getNewPassword());
sysUser.setPassword(getPassword(sysUser.getSalt(), dto.getNewPassword()));
log.info("修改密码" + sysUser.getUsername() + "_" + dto.getNewPassword());
return ResultJson.ok(sysUser.updateById());
}
@ -331,7 +409,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
}
public static String getPassword(String salt,String password) {
public static String getPassword(String salt, String password) {
return DigestUtils.md5DigestAsHex((salt + password).getBytes());
}

6
src/main/resources/application.yml
View File

@ -74,3 +74,9 @@ mybatis-plus:
db-config:
update-strategy: not_empty
insert-strategy: not_empty
wx:
miniapp:
configs:
appid: wxb9b07668d1ba20fe
secret: 99a1b89ac30e28bcc9bba8be973027f4

12
src/main/resources/mapper/AddressBookMapper.xml
View File

@ -28,7 +28,7 @@
AND AB.NAME LIKE CONCAT('%', #{dto.name}, '%')
</if>
<if test="dto.adcd != null and dto.adcd != '' ">
AND R.DICT_ID ${dto.v} #{dto.adcd}
AND AB.ADCD ${dto.v} #{dto.adcd}
</if>
<if test="dto.phone != null and dto.phone != '' ">
AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%')
@ -54,12 +54,12 @@
AB.*,
A.ADNM
FROM
ADINFO A
LEFT JOIN ADDRESS_BOOK AB ON AB.ADCD = A.ADCD AND AB.ADCD IS NOT NULL
LEFT JOIN AB_UD_R R ON R.AD_ID = AB.ID
ADDRESS_BOOK AB
LEFT JOIN ADINFO A ON AB.ADCD = A.ADCD AND AB.ADCD IS NOT NULL
LEFT JOIN AB_UD_R R ON R.AD_ID = AB.ID
<where>
<if test="adnm != null and adnm != '' ">
A.ADNM = #{adnm}
<if test="adcd != null and adcd != '' ">
A.ADCD = #{adcd}
</if>
</where>
ORDER BY R.SORT