dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

Browse Source
This commit is contained in:
PQZ 2024-10-11 16:55:08 +08:00
commit ce7393652a
4 changed files with 1877 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dl-module-base/src/main/java/cn/iocoder/yudao/module/app/wechat/service/impl/WechatServiceImpl.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.app.wechat.service.impl; package cn.iocoder.yudao.module.app.wechat.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.common.SystemEnum; import cn.iocoder.yudao.common.SystemEnum;
@ -8,7 +7,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.app.wechat.service.WechatService; import cn.iocoder.yudao.module.app.wechat.service.WechatService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthLoginReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; import cn.iocoder.yudao.module.system.service.auth.AdminAuthService;
@ -158,7 +156,8 @@ public class WechatServiceImpl implements WechatService {
Long uid = userService.createUser(user); Long uid = userService.createUser(user);
wxUser = new AdminUserDO(); wxUser = new AdminUserDO();
wxUser.setId(uid); wxUser.setId(uid);
wxUser.setUsername(phoneNumber); wxUser.setUsername(user.getUsername());
wxUser.setNickname(user.getNickname());
} }
return wxUser; return wxUser;
} }

1
dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/LoginController.java
View File

@ -91,6 +91,7 @@ public class LoginController {
AuthLoginRespVO loginVO = loginService.wxLoginByUserId(adminUserDO.getId(),adminUserDO.getUsername()); AuthLoginRespVO loginVO = loginService.wxLoginByUserId(adminUserDO.getId(),adminUserDO.getUsername());
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("token", loginVO.getAccessToken()); map.put("token", loginVO.getAccessToken());
map.put("userinfo", adminUserDO);
return success(map); return success(map);
} else { } else {
return error(500, "微信登录失败！"); return error(500, "微信登录失败！");

6
yudao-server/pom.xml
View File

@ -36,6 +36,12 @@
<groupId>cn.iocoder.boot</groupId> <groupId>cn.iocoder.boot</groupId>
<artifactId>dl-module-base</artifactId> <artifactId>dl-module-base</artifactId>
<version>${revision}</version> <version>${revision}</version>
<exclusions>
<exclusion>
<artifactId>commons-fileupload</artifactId>
<groupId>commons-fileupload</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- 企业管理包 --> <!-- 企业管理包 -->
<dependency> <dependency>

1944
数据库设计/蓝安集团一体化平台.pdma.json
View File

File diff suppressed because it is too large Load Diff