|
@@ -1,30 +1,30 @@
|
|
package com.ruoyi.web.work.service.impl;
|
|
package com.ruoyi.web.work.service.impl;
|
|
|
|
|
|
|
|
+import java.rmi.ServerException;
|
|
|
|
+import java.util.List;
|
|
|
|
+
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.http.HttpUtils;
|
|
import com.ruoyi.common.utils.http.HttpUtils;
|
|
import com.ruoyi.web.work.api.config.TokenServices;
|
|
import com.ruoyi.web.work.api.config.TokenServices;
|
|
import com.ruoyi.web.work.api.util.AppUtil;
|
|
import com.ruoyi.web.work.api.util.AppUtil;
|
|
-import com.ruoyi.web.work.domain.User;
|
|
|
|
import com.ruoyi.web.work.domain.dto.LoginDto;
|
|
import com.ruoyi.web.work.domain.dto.LoginDto;
|
|
import com.ruoyi.web.work.domain.dto.UserEditDto;
|
|
import com.ruoyi.web.work.domain.dto.UserEditDto;
|
|
-import com.ruoyi.web.work.mapper.UserMapper;
|
|
|
|
-import com.ruoyi.web.work.service.IUserService;
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.core.env.Environment;
|
|
import org.springframework.core.env.Environment;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
-
|
|
|
|
-import java.rmi.ServerException;
|
|
|
|
-import java.util.List;
|
|
|
|
|
|
+import com.ruoyi.web.work.mapper.UserMapper;
|
|
|
|
+import com.ruoyi.web.work.domain.User;
|
|
|
|
+import com.ruoyi.web.work.service.IUserService;
|
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @author lsw
|
|
* @author lsw
|
|
- * @date 2024-07-16
|
|
|
|
|
|
+ * @date 2024-07-19
|
|
*/
|
|
*/
|
|
@Service
|
|
@Service
|
|
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
|
|
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
|
|
@@ -42,6 +42,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
return userMapper.selectList(user);
|
|
return userMapper.selectList(user);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public AjaxResult login(LoginDto dto) throws ServerException {
|
|
public AjaxResult login(LoginDto dto) throws ServerException {
|
|
JSONObject res = JSON.parseObject(HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session?appid=" + env.getProperty("wx.appid") + "&secret=" + env.getProperty("wx.appSecret") + "&js_code=" + dto.getCode() + "&grant_type=authorization_code", null));
|
|
JSONObject res = JSON.parseObject(HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session?appid=" + env.getProperty("wx.appid") + "&secret=" + env.getProperty("wx.appSecret") + "&js_code=" + dto.getCode() + "&grant_type=authorization_code", null));
|
|
@@ -52,7 +53,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
if (user == null) {
|
|
if (user == null) {
|
|
user = new User();
|
|
user = new User();
|
|
user.setOpenId(res.getString("openid"));
|
|
user.setOpenId(res.getString("openid"));
|
|
- user.setState(0);
|
|
|
|
|
|
+ user.setState(0L);
|
|
if (!save(user)) {
|
|
if (!save(user)) {
|
|
throw new ServerException("登录失败,请联系管理员");
|
|
throw new ServerException("登录失败,请联系管理员");
|
|
}
|
|
}
|
|
@@ -92,4 +93,5 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
public AjaxResult info() {
|
|
public AjaxResult info() {
|
|
return AjaxResult.success(getById(AppUtil.getUser().getId()));
|
|
return AjaxResult.success(getById(AppUtil.getUser().getId()));
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|