From 0f7d2075a95691fdc87c94dad8690e98722ff0de Mon Sep 17 00:00:00 2001 From: ls Date: Tue, 26 Nov 2024 11:41:19 +0800 Subject: [PATCH] update --- docker-compose-prod.yml | 34 +- docker-compose.yml | 30 +- .../src/main/resources/application-dev.yml | 37 +- .../src/main/resources/application-prod.yml | 25 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 6 +- .../cas/controller/CasClientController.java | 108 -- .../controller/SysCommentController.java | 16 +- .../controller/ThirdLoginController.java | 1080 ++++++++--------- 9 files changed, 584 insertions(+), 754 deletions(-) delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 14083db..0cde4e0 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -65,6 +65,8 @@ services: - "28080:8080" networks: - physical-boot + volumes: + - ./logs:/app/logs # physical-kkfileview: # restart: on-failure # container_name: physical-kkfileview @@ -83,22 +85,22 @@ services: - physical-boot ports: - "80:80" - physical-crawler: - container_name: physical-crawler - restart: on-failure - depends_on: - - physical-mysql - - physical-minio - image: registry.cn-shanghai.aliyuncs.com/physical/physical-crawler - networks: - - physical-boot - ports: - - "25000:5000" - environment: - - FLASK_ENV=production - - PYTHON-UNBUFFERED=1 # 禁用 Python 输出缓冲 - volumes: - - ./crawler_files:/app/downloaded_files +# physical-crawler: +# container_name: physical-crawler +# restart: on-failure +# depends_on: +# - physical-mysql +# - physical-minio +# image: registry.cn-shanghai.aliyuncs.com/physical/physical-crawler +# networks: +# - physical-boot +# ports: +# - "25000:5000" +# environment: +# - FLASK_ENV=production +# - PYTHON-UNBUFFERED=1 # 禁用 Python 输出缓冲 +# volumes: +# - ./crawler_files:/app/downloaded_files networks: physical-boot: diff --git a/docker-compose.yml b/docker-compose.yml index 98657ea..4191027 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,6 +65,8 @@ services: - 28080:8080 networks: - physical-boot + volumes: + - ./logs:/app/logs # physical-kkfileview: # restart: on-failure # container_name: physical-kkfileview @@ -83,20 +85,20 @@ services: - physical-boot ports: - 8005:80 - physical-crawler: - container_name: physical-crawler - restart: on-failure - depends_on: - - physical-mysql - - physical-minio - image: registry.cn-shanghai.aliyuncs.com/physical/physical-crawler - ports: - - "25000:5000" - environment: - - FLASK_ENV=production - - PYTHONUNBUFFERED=1 # 禁用 Python 输出缓冲 - volumes: - - ./crawler_files:/app/downloaded_files +# physical-crawler: +# container_name: physical-crawler +# restart: on-failure +# depends_on: +# - physical-mysql +# - physical-minio +# image: registry.cn-shanghai.aliyuncs.com/physical/physical-crawler +# ports: +# - "25000:5000" +# environment: +# - FLASK_ENV=production +# - PYTHONUNBUFFERED=1 # 禁用 Python 输出缓冲 +# volumes: +# - ./crawler_files:/app/downloaded_files networks: physical-boot: diff --git a/physical-launcher/src/main/resources/application-dev.yml b/physical-launcher/src/main/resources/application-dev.yml index 0243f8a..68ab513 100644 --- a/physical-launcher/src/main/resources/application-dev.yml +++ b/physical-launcher/src/main/resources/application-dev.yml @@ -28,7 +28,7 @@ spring: # flyway配置 flyway: # 是否启用flyway - enabled: true + enabled: false # 编码格式，默认UTF-8 encoding: UTF-8 # 迁移sql脚本文件存放路径，官方默认db/migration @@ -129,7 +129,7 @@ spring: datasource: druid: stat-view-servlet: - enabled: true + enabled: false loginUsername: admin loginPassword: 123456 allow: @@ -237,13 +237,6 @@ jeecg: secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev - # ElasticSearch 6设置 - elasticsearch: - cluster-name: jeecg-ES - cluster-nodes: 127.0.0.1:9200 - check-enabled: false - # 在线预览文件服务器地址配置 - file-view-domain: http://fileview.jeecg.com # minio文件上传 minio: minio_url: http://192.168.50.100:29000 @@ -251,27 +244,6 @@ jeecg: minio_name: root minio_pass: 12345678 bucketName: physical - #大屏报表参数设置 - jmreport: - #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增) - saasMode: - # 平台上线安全配置(v1.6.2+ 新增) - firewall: - # 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库) - dataSourceSafe: false - # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制） - lowCodeMode: dev - #xxl-job配置 - xxljob: - enabled: false - adminAddresses: http://127.0.0.1:9080/xxl-job-admin - appname: ${spring.application.name} - accessToken: '' - address: 127.0.0.1:30007 - ip: 127.0.0.1 - port: 30007 - logPath: logs/jeecg/job/jobhandler/ - logRetentionDays: 30 #分布式锁配置 redisson: address: 127.0.0.1:6379 @@ -292,9 +264,6 @@ jeecg: # proxy: # host: "http://127.0.0.1" # port: "7890" -#cas单点登录 -cas: - prefixUrl: http://cas.example.org:8443/cas #Mybatis输出sql日志 logging: level: @@ -312,7 +281,7 @@ knife4j: password: jeecg1314 #第三方登录 justauth: - enabled: true + enabled: false type: GITHUB: client-id: ?? diff --git a/physical-launcher/src/main/resources/application-prod.yml b/physical-launcher/src/main/resources/application-prod.yml index 3d44243..78fcc83 100644 --- a/physical-launcher/src/main/resources/application-prod.yml +++ b/physical-launcher/src/main/resources/application-prod.yml @@ -129,7 +129,7 @@ spring: datasource: druid: stat-view-servlet: - enabled: true + enabled: false loginUsername: admin loginPassword: 123456 allow: @@ -239,13 +239,6 @@ jeecg: endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev staticDomain: https://static.jeecg.com - # ElasticSearch 设置 - elasticsearch: - cluster-name: jeecg-ES - cluster-nodes: 127.0.0.1:9200 - check-enabled: true - # 在线预览文件服务器地址配置 - file-view-domain: http://fileview.jeecg.com # minio文件上传 minio: minio_url: http://physical-minio:9000 @@ -263,26 +256,12 @@ jeecg: dataSourceSafe: true # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制） lowCodeMode: prod - #xxl-job配置 - xxljob: - enabled: false - adminAddresses: http://127.0.0.1:9080/xxl-job-admin - appname: ${spring.application.name} - accessToken: '' - address: 127.0.0.1:30007 - ip: 127.0.0.1 - port: 30007 - logPath: logs/jeecg/job/jobhandler/ - logRetentionDays: 30 #分布式锁配置 redisson: address: physical-redis:6379 password: type: STANDALONE enabled: true -#cas单点登录 -cas: - prefixUrl: http://cas.example.org:8443/cas #Mybatis输出sql日志 logging: level: @@ -300,7 +279,7 @@ knife4j: password: jeecg1314 #第三方登录 justauth: - enabled: true + enabled: false type: GITHUB: client-id: ?? diff --git a/physical-launcher/src/main/resources/application.yml b/physical-launcher/src/main/resources/application.yml index 67562f1..a4c2942 100644 --- a/physical-launcher/src/main/resources/application.yml +++ b/physical-launcher/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: application: - name: jeecg-system + name: physical-boot profiles: active: '@profile.name@' \ No newline at end of file diff --git a/physical-launcher/src/main/resources/logback-spring.xml b/physical-launcher/src/main/resources/logback-spring.xml index acad24b..1673886 100644 --- a/physical-launcher/src/main/resources/logback-spring.xml +++ b/physical-launcher/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - + @@ -17,7 +17,7 @@ - ${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/physical-%d{yyyy-MM-dd}.%i.log 30 10MB @@ -47,7 +47,7 @@ - ${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.html + ${LOG_HOME}/physical-%d{yyyy-MM-dd}.%i.html 30 10MB diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java deleted file mode 100644 index 3ab8936..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java +++ /dev/null @@ -1,108 +0,0 @@ -package org.jeecg.modules.cas.controller; - -import com.alibaba.fastjson.JSONObject; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.cas.util.CasServiceUtil; -import org.jeecg.modules.cas.util.XmlUtils; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.service.ISysDepartService; -import org.jeecg.modules.system.service.ISysUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - *

- * CAS单点登录客户端登录认证 - *

- * - * @Author zhoujf - * @since 2018-12-20 - */ -@Slf4j -@RestController -@RequestMapping("/sys/cas/client") -public class CasClientController { - - @Autowired - private ISysUserService sysUserService; - @Autowired - private ISysDepartService sysDepartService; - @Autowired - private RedisUtil redisUtil; - - @Value("${cas.prefixUrl}") - private String prefixUrl; - - - @GetMapping("/validateLogin") - public Object validateLogin(@RequestParam(name = "ticket") String ticket, - @RequestParam(name = "service") String service, - HttpServletRequest request, - HttpServletResponse response) throws Exception { - Result result = new Result(); - log.info("Rest api login."); - try { - String validateUrl = prefixUrl + "/p3/serviceValidate"; - String res = CasServiceUtil.getStValidate(validateUrl, ticket, service); - log.info("res." + res); - final String error = XmlUtils.getTextForElement(res, "authenticationFailure"); - if (StringUtils.isNotEmpty(error)) { - throw new Exception(error); - } - final String principal = XmlUtils.getTextForElement(res, "user"); - if (StringUtils.isEmpty(principal)) { - throw new Exception("No principal was found in the response from the CAS server."); - } - log.info("-------token----username---" + principal); - //1. 校验用户是否有效 - SysUser sysUser = sysUserService.getUserByName(principal); - result = sysUserService.checkUserIsEffective(sysUser); - if (!result.isSuccess()) { - return result; - } - String token = JwtUtil.sign(sysUser.getUsername(), sysUser.getPassword()); - // 设置超时时间 - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000); - - //获取用户部门信息 - JSONObject obj = new JSONObject(); - List departs = sysDepartService.queryUserDeparts(sysUser.getId()); - obj.put("departs", departs); - if (departs == null || departs.size() == 0) { - obj.put("multi_depart", 0); - } else if (departs.size() == 1) { - sysUserService.updateUserDepart(principal, departs.get(0).getOrgCode(), null); - obj.put("multi_depart", 1); - } else { - obj.put("multi_depart", 2); - } - obj.put("token", token); - obj.put("userInfo", sysUser); - result.setResult(obj); - result.success("登录成功"); - - } catch (Exception e) { - //e.printStackTrace(); - result.error500(e.getMessage()); - } - return new HttpEntity<>(result); - } - - -} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java index 4c08210..e547cfd 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java @@ -47,12 +47,6 @@ public class SysCommentController extends JeecgController getFileViewDomain() { - return Result.OK(onlinePreviewDomain); - } + /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java index cabf1ba..973e1b7 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java @@ -1,540 +1,540 @@ -package org.jeecg.modules.system.controller; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.RandomUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.xkcoding.justauth.AuthRequestFactory; -import io.swagger.v3.oas.annotations.Operation; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import me.zhyd.oauth.model.AuthCallback; -import me.zhyd.oauth.model.AuthResponse; -import me.zhyd.oauth.request.AuthRequest; -import me.zhyd.oauth.utils.AuthStateUtils; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.constant.enums.MessageTypeEnum; -import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.util.CommonUtils; -import org.jeecg.common.util.PasswordUtil; -import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.SysThirdAccount; -import org.jeecg.modules.system.entity.SysThirdAppConfig; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.model.ThirdLoginModel; -import org.jeecg.modules.system.service.ISysDictService; -import org.jeecg.modules.system.service.ISysThirdAccountService; -import org.jeecg.modules.system.service.ISysThirdAppConfigService; -import org.jeecg.modules.system.service.ISysUserService; -import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl; -import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Date; -import java.util.List; - -/** - * @Author scott - * @since 2018-12-17 - */ -@Controller -@RequestMapping("/sys/thirdLogin") -@Slf4j -public class ThirdLoginController { - @Autowired - private ISysUserService sysUserService; - @Autowired - private ISysThirdAccountService sysThirdAccountService; - @Autowired - private ISysDictService sysDictService; - @Autowired - private BaseCommonService baseCommonService; - @Autowired - private RedisUtil redisUtil; - @Autowired - private AuthRequestFactory factory; - - @Autowired - private ThirdAppWechatEnterpriseServiceImpl thirdAppWechatEnterpriseService; - @Autowired - private ThirdAppDingtalkServiceImpl thirdAppDingtalkService; - - @Autowired - private ISysThirdAppConfigService appConfigService; - - @RequestMapping("/render/{source}") - public void render(@PathVariable("source") String source, HttpServletResponse response) throws IOException { - log.info("第三方登录进入render：" + source); - AuthRequest authRequest = factory.get(source); - String authorizeUrl = authRequest.authorize(AuthStateUtils.createState()); - log.info("第三方登录认证地址：" + authorizeUrl); - response.sendRedirect(authorizeUrl); - } - - @RequestMapping("/{source}/callback") - public String loginThird(@PathVariable("source") String source, AuthCallback callback, ModelMap modelMap) { - log.info("第三方登录进入callback：" + source + " params：" + JSONObject.toJSONString(callback)); - AuthRequest authRequest = factory.get(source); - AuthResponse response = authRequest.login(callback); - log.info(JSONObject.toJSONString(response)); - Result result = new Result(); - if (response.getCode() == 2000) { - - JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(response.getData())); - String username = data.getString("username"); - String avatar = data.getString("avatar"); - String uuid = data.getString("uuid"); - //构造第三方登录信息存储对象 - ThirdLoginModel tlm = new ThirdLoginModel(source, uuid, username, avatar); - //判断有没有这个人 - //update-begin-author:wangshuai date:20201118 for:修改成查询第三方账户表 - LambdaQueryWrapper query = new LambdaQueryWrapper(); - query.eq(SysThirdAccount::getThirdType, source); - //update-begin---author:wangshuai---date:2023-10-07---for:【QQYUN-6667】敲敲云，线上解绑重新绑定一直提示这个--- - query.eq(SysThirdAccount::getTenantId, CommonConstant.TENANT_ID_DEFAULT_VALUE); - //update-end---author:wangshuai---date:2023-10-07---for:【QQYUN-6667】敲敲云，线上解绑重新绑定一直提示这个--- - query.and(q -> q.eq(SysThirdAccount::getThirdUserUuid, uuid).or().eq(SysThirdAccount::getThirdUserId, uuid)); - List thridList = sysThirdAccountService.list(query); - SysThirdAccount user = null; - if (thridList == null || thridList.size() == 0) { - //否则直接创建新账号 - user = sysThirdAccountService.saveThirdUser(tlm, CommonConstant.TENANT_ID_DEFAULT_VALUE); - } else { - //已存在 只设置用户名 不设置头像 - user = thridList.get(0); - } - // 生成token - //update-begin-author:wangshuai date:20201118 for:从第三方登录查询是否存在用户id，不存在绑定手机号 - if (oConvertUtils.isNotEmpty(user.getSysUserId())) { - String sysUserId = user.getSysUserId(); - SysUser sysUser = sysUserService.getById(sysUserId); - String token = saveToken(sysUser); - modelMap.addAttribute("token", token); - } else { - modelMap.addAttribute("token", "绑定手机号," + "" + uuid); - } - //update-end-author:wangshuai date:20201118 for:从第三方登录查询是否存在用户id，不存在绑定手机号 - //update-begin--Author:wangshuai Date:20200729 for：接口在签名校验失败时返回失败的标识码 issues#1441-------------------- - } else { - modelMap.addAttribute("token", "登录失败"); - } - //update-end--Author:wangshuai Date:20200729 for：接口在签名校验失败时返回失败的标识码 issues#1441-------------------- - result.setSuccess(false); - result.setMessage("第三方登录异常,请联系管理员"); - return "thirdLogin"; - } - - /** - * 创建新账号 - * - * @param model - * @return - */ - @PostMapping("/user/create") - @ResponseBody - public Result thirdUserCreate(@RequestBody ThirdLoginModel model) { - log.info("第三方登录创建新账号："); - Result res = new Result<>(); - Object operateCode = redisUtil.get(CommonConstant.THIRD_LOGIN_CODE); - if (operateCode == null || !operateCode.toString().equals(model.getOperateCode())) { - res.setSuccess(false); - res.setMessage("校验失败"); - return res; - } - //创建新账号 - //update-begin-author:wangshuai date:20201118 for:修改成从第三方登录查出来的user_id，在查询用户表尽行token - SysThirdAccount user = sysThirdAccountService.saveThirdUser(model, CommonConstant.TENANT_ID_DEFAULT_VALUE); - if (oConvertUtils.isNotEmpty(user.getSysUserId())) { - String sysUserId = user.getSysUserId(); - SysUser sysUser = sysUserService.getById(sysUserId); - // 生成token - String token = saveToken(sysUser); - //update-end-author:wangshuai date:20201118 for:修改成从第三方登录查出来的user_id，在查询用户表尽行token - res.setResult(token); - res.setSuccess(true); - } - return res; - } - - /** - * 绑定账号 需要设置密码 需要走一遍校验 - * - * @param json - * @return - */ - @PostMapping("/user/checkPassword") - @ResponseBody - public Result checkPassword(@RequestBody JSONObject json) { - Result result = new Result<>(); - Object operateCode = redisUtil.get(CommonConstant.THIRD_LOGIN_CODE); - if (operateCode == null || !operateCode.toString().equals(json.getString("operateCode"))) { - result.setSuccess(false); - result.setMessage("校验失败"); - return result; - } - String username = json.getString("uuid"); - SysUser user = this.sysUserService.getUserByName(username); - if (user == null) { - result.setMessage("用户未找到"); - result.setSuccess(false); - return result; - } - String password = json.getString("password"); - String salt = user.getSalt(); - String passwordEncode = PasswordUtil.encrypt(user.getUsername(), password, salt); - if (!passwordEncode.equals(user.getPassword())) { - result.setMessage("密码不正确"); - result.setSuccess(false); - return result; - } - - sysUserService.updateById(user); - result.setSuccess(true); - // 生成token - String token = saveToken(user); - result.setResult(token); - return result; - } - - private String saveToken(SysUser user) { - // 生成token - String token = JwtUtil.sign(user.getUsername(), user.getPassword()); - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - // 设置超时时间 - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000); - return token; - } - - /** - * 第三方登录回调接口 - * - * @param token - * @param thirdType - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - @RequestMapping(value = "/getLoginUser/{token}/{thirdType}/{tenantId}", method = RequestMethod.GET) - @ResponseBody - public Result getThirdLoginUser(@PathVariable("token") String token, @PathVariable("thirdType") String thirdType, @PathVariable("tenantId") String tenantId) throws Exception { - Result result = new Result(); - String username = JwtUtil.getUsername(token); - - //1. 校验用户是否有效 - SysUser sysUser = sysUserService.getUserByName(username); - result = sysUserService.checkUserIsEffective(sysUser); - if (!result.isSuccess()) { - return result; - } - //update-begin-author:wangshuai date:20201118 for:如果真实姓名和头像不存在就取第三方登录的 - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(SysThirdAccount::getSysUserId, sysUser.getId()); - query.eq(SysThirdAccount::getThirdType, thirdType); - query.eq(SysThirdAccount::getTenantId, oConvertUtils.getInt(tenantId, CommonConstant.TENANT_ID_DEFAULT_VALUE)); - //update-begin---author:wangshuai ---date:20230328 for：[QQYUN-4883]钉钉auth登录同一个租户下有同一个用户id------------ - List accountList = sysThirdAccountService.list(query); - SysThirdAccount account = new SysThirdAccount(); - if (CollectionUtil.isNotEmpty(accountList)) { - account = accountList.get(0); - } - //update-end---author:wangshuai ---date:20230328 for：[QQYUN-4883]钉钉auth登录同一个租户下有同一个用户id------------ - if (oConvertUtils.isEmpty(sysUser.getRealname())) { - sysUser.setRealname(account.getRealname()); - } - if (oConvertUtils.isEmpty(sysUser.getAvatar())) { - sysUser.setAvatar(account.getAvatar()); - } - //update-end-author:wangshuai date:20201118 for:如果真实姓名和头像不存在就取第三方登录的 - JSONObject obj = new JSONObject(); - //TODO 第三方登确定登录租户和部门逻辑 - - //用户登录信息 - obj.put("userInfo", sysUser); - //获取字典缓存【解决 #jeecg-boot/issues/3998】 - obj.put("sysAllDictItems", sysDictService.queryAllDictItems()); - //token 信息 - obj.put("token", token); - result.setResult(obj); - result.setSuccess(true); - result.setCode(200); - baseCommonService.addLog("用户名: " + username + ",登录成功[第三方用户]！", CommonConstant.LOG_TYPE_1, null); - return result; - } - - /** - * 第三方绑定手机号返回token - * - * @param jsonObject - * @return - */ - @Operation(summary = "手机号登录接口") - @PostMapping("/bindingThirdPhone") - @ResponseBody - public Result bindingThirdPhone(@RequestBody JSONObject jsonObject) { - Result result = new Result(); - String phone = jsonObject.getString("mobile"); - String thirdUserUuid = jsonObject.getString("thirdUserUuid"); - // 校验验证码 - String captcha = jsonObject.getString("captcha"); - //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 - String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE + phone; - Object captchaCache = redisUtil.get(redisKey); - //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 - if (oConvertUtils.isEmpty(captcha) || !captcha.equals(captchaCache)) { - result.setMessage("验证码错误"); - result.setSuccess(false); - return result; - } - //校验用户有效性 - SysUser sysUser = sysUserService.getUserByPhone(phone); - if (sysUser != null) { - // 存在用户，直接绑定 - sysThirdAccountService.updateThirdUserId(sysUser, thirdUserUuid); - } else { - // 不存在手机号，创建用户 - sysUser = sysThirdAccountService.createUser(phone, thirdUserUuid, CommonConstant.TENANT_ID_DEFAULT_VALUE); - } - String token = saveToken(sysUser); - result.setSuccess(true); - result.setResult(token); - return result; - } - - /** - * 企业微信/钉钉 OAuth2登录 - * - * @param source - * @param state - * @return - */ - @ResponseBody - @GetMapping("/oauth2/{source}/login") - public String oauth2LoginCallback(@PathVariable("source") String source, @RequestParam("state") String state, HttpServletRequest request, HttpServletResponse response, - @RequestParam(value = "tenantId", required = false, defaultValue = "0") String tenantId) throws Exception { - String url; - //应用id为空，说明没有配置lowAppId - if (oConvertUtils.isEmpty(tenantId)) { - return "租户编码未配置"; - } - if (CommonConstant.WECHAT_ENTERPRISE.equalsIgnoreCase(source)) { - //换成第三方app配置表 - SysThirdAppConfig config = appConfigService.getThirdConfigByThirdType(Integer.valueOf(tenantId), MessageTypeEnum.QYWX.getType()); - if (null == config) { - return "还未配置企业微信应用，请配置企业微信应用"; - } - StringBuilder builder = new StringBuilder(); - // 构造企业微信OAuth2登录授权地址 - builder.append("https://open.weixin.qq.com/connect/oauth2/authorize"); - // 企业的CorpID - builder.append("?appid=").append(config.getClientId()); - // 授权后重定向的回调链接地址，请使用urlencode对链接进行处理 - String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/wechat_enterprise/callback?tenantId=" + tenantId; - ; - builder.append("&redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8")); - // 返回类型，此时固定为：code - builder.append("&response_type=code"); - // 应用授权作用域。 - // snsapi_base：静默授权，可获取成员的的基础信息（UserId与DeviceId）； - builder.append("&scope=snsapi_base"); - // 重定向后会带上state参数，长度不可超过128个字节 - builder.append("&state=").append(state); - // 终端使用此参数判断是否需要带上身份信息 - builder.append("#wechat_redirect"); - url = builder.toString(); - } else if (CommonConstant.DINGTALK.equalsIgnoreCase(source)) { - //update-begin---author:wangshuai ---date:20230224 for：[QQYUN-3440]新建企业微信和钉钉配置表，通过租户模式隔离------------ - //换成第三方app配置表 - SysThirdAppConfig appConfig = appConfigService.getThirdConfigByThirdType(Integer.valueOf(tenantId), MessageTypeEnum.DD.getType()); - if (null == appConfig) { - return "还未配置钉钉应用，请配置钉钉应用"; - } - //update-end---author:wangshuai ---date:20230224 for：[QQYUN-3440]新建企业微信和钉钉配置表，通过租户模式隔离------------ - StringBuilder builder = new StringBuilder(); - // 构造钉钉OAuth2登录授权地址 - builder.append("https://login.dingtalk.com/oauth2/auth"); - // 授权通过/拒绝后回调地址。 - // 注意 需要与注册应用时登记的域名保持一致。 - String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/dingtalk/callback?tenantId=" + tenantId; - builder.append("?redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8")); - // 固定值为code。 - // 授权通过后返回authCode。 - builder.append("&response_type=code"); - // 步骤一中创建的应用详情中获取。 - // 企业内部应用：client_id为应用的AppKey。 - builder.append("&client_id=").append(appConfig.getClientId()); - // 授权范围，授权页面显示的授权信息以应用注册时配置的为准。 - // openid：授权后可获得用户userid - builder.append("&scope=openid"); - // 跟随authCode原样返回。 - builder.append("&state=").append(state); - //update-begin---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ - builder.append("&prompt=").append("consent"); - //update-end---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录-------------- - url = builder.toString(); - } else { - return "不支持的source"; - } - log.info("oauth2 login url:" + url); - response.sendRedirect(url); - return "login…"; - } - - /** - * 企业微信/钉钉 OAuth2登录回调 - * - * @param code - * @param state - * @param response - * @return - */ - @ResponseBody - @GetMapping("/oauth2/{source}/callback") - public String oauth2LoginCallback( - @PathVariable("source") String source, - // 企业微信返回的code - @RequestParam(value = "code", required = false) String code, - // 钉钉返回的code - @RequestParam(value = "authCode", required = false) String authCode, - @RequestParam("state") String state, - @RequestParam(name = "tenantId", defaultValue = "0") String tenantId, - HttpServletResponse response) { - SysUser loginUser; - if (CommonConstant.WECHAT_ENTERPRISE.equalsIgnoreCase(source)) { - log.info("【企业微信】OAuth2登录进入callback：code=" + code + ", state=" + state); - loginUser = thirdAppWechatEnterpriseService.oauth2Login(code, Integer.valueOf(tenantId)); - if (loginUser == null) { - return "登录失败"; - } - } else if (CommonConstant.DINGTALK.equalsIgnoreCase(source)) { - log.info("【钉钉】OAuth2登录进入callback：authCode=" + authCode + ", state=" + state); - loginUser = thirdAppDingtalkService.oauth2Login(authCode, Integer.valueOf(tenantId)); - if (loginUser == null) { - return "登录失败"; - } - } else { - return "不支持的source"; - } - try { - - //update-begin-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面 - String redirect = ""; - if (state.indexOf("?") > 0) { - String[] arr = state.split("\\?"); - state = arr[0]; - if (arr.length > 1) { - redirect = arr[1]; - } - } - - String token = saveToken(loginUser); - state += "/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, "UTF-8") + "&tenantId=" + URLEncoder.encode(tenantId, "UTF-8"); - //update-begin---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ - state += "&thirdType=" + source; - //state += "&thirdType=" + "wechat_enterprise"; - if (redirect != null && redirect.length() > 0) { - state += "&" + redirect; - } - //update-end-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面 - - //update-end---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ - log.info("OAuth2登录重定向地址: " + state); - try { - response.sendRedirect(state); - return "ok"; - } catch (IOException e) { - e.printStackTrace(); - return "重定向失败"; - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return "解码失败"; - } - } - - /** - * 注册账号并绑定第三方账号 【低代码应用专用接口】 - * - * @param jsonObject - * @param user - * @return - */ - @ResponseBody - @PutMapping("/registerBindThirdAccount") - public Result registerBindThirdAccount(@RequestBody JSONObject jsonObject, SysUser user) { - //手机号 - String phone = jsonObject.getString("phone"); - //验证码 - String smscode = jsonObject.getString("smscode"); - String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE + phone; - Object code = redisUtil.get(redisKey); - //第三方uuid - String thirdUserUuid = jsonObject.getString("thirdUserUuid"); - String username = jsonObject.getString("username"); - //未设置用户名，则用手机号作为用户名 - if (oConvertUtils.isEmpty(username)) { - username = phone; - } - //未设置密码，则随机生成一个密码 - String password = jsonObject.getString("password"); - if (oConvertUtils.isEmpty(password)) { - password = RandomUtil.randomString(8); - } - String email = jsonObject.getString("email"); - SysUser sysUser1 = sysUserService.getUserByName(username); - if (sysUser1 != null) { - return Result.error("用户名已注册"); - } - SysUser sysUser2 = sysUserService.getUserByPhone(phone); - if (sysUser2 != null) { - return Result.error("该手机号已注册"); - } - if (oConvertUtils.isNotEmpty(email)) { - SysUser sysUser3 = sysUserService.getUserByEmail(email); - if (sysUser3 != null) { - return Result.error("邮箱已被注册"); - } - } - if (null == code) { - return Result.error("手机验证码失效，请重新获取"); - } - if (!smscode.equals(code.toString())) { - return Result.error("手机验证码错误"); - } - String realname = jsonObject.getString("realname"); - if (oConvertUtils.isEmpty(realname)) { - realname = username; - } - try { - //保存用户表 - user.setCreateTime(new Date()); - String salt = oConvertUtils.randomGen(8); - String passwordEncode = PasswordUtil.encrypt(username, password, salt); - user.setSalt(salt); - user.setUsername(username); - user.setRealname(realname); - user.setPassword(passwordEncode); - user.setEmail(email); - user.setPhone(phone); - user.setStatus(CommonConstant.USER_UNFREEZE); - user.setDelFlag(CommonConstant.DEL_FLAG_0); - user.setActivitiSync(CommonConstant.ACT_SYNC_1); - sysUserService.addUserWithRole(user, ""); - //保存第三方用户表 - sysThirdAccountService.updateThirdUserId(user, thirdUserUuid); - String token = saveToken(user); - return Result.ok(token); - } catch (Exception e) { - return Result.error("注册失败"); - } - } -} \ No newline at end of file +//package org.jeecg.modules.system.controller; +// +//import cn.hutool.core.collection.CollectionUtil; +//import cn.hutool.core.util.RandomUtil; +//import com.alibaba.fastjson.JSONObject; +//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +//import com.xkcoding.justauth.AuthRequestFactory; +//import io.swagger.v3.oas.annotations.Operation; +//import jakarta.servlet.http.HttpServletRequest; +//import jakarta.servlet.http.HttpServletResponse; +//import lombok.extern.slf4j.Slf4j; +//import me.zhyd.oauth.model.AuthCallback; +//import me.zhyd.oauth.model.AuthResponse; +//import me.zhyd.oauth.request.AuthRequest; +//import me.zhyd.oauth.utils.AuthStateUtils; +//import org.jeecg.common.api.vo.Result; +//import org.jeecg.common.constant.CommonConstant; +//import org.jeecg.common.constant.enums.MessageTypeEnum; +//import org.jeecg.common.system.util.JwtUtil; +//import org.jeecg.common.util.CommonUtils; +//import org.jeecg.common.util.PasswordUtil; +//import org.jeecg.common.util.RedisUtil; +//import org.jeecg.common.util.oConvertUtils; +//import org.jeecg.modules.base.service.BaseCommonService; +//import org.jeecg.modules.system.entity.SysThirdAccount; +//import org.jeecg.modules.system.entity.SysThirdAppConfig; +//import org.jeecg.modules.system.entity.SysUser; +//import org.jeecg.modules.system.model.ThirdLoginModel; +//import org.jeecg.modules.system.service.ISysDictService; +//import org.jeecg.modules.system.service.ISysThirdAccountService; +//import org.jeecg.modules.system.service.ISysThirdAppConfigService; +//import org.jeecg.modules.system.service.ISysUserService; +//import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl; +//import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Controller; +//import org.springframework.ui.ModelMap; +//import org.springframework.web.bind.annotation.*; +// +//import java.io.IOException; +//import java.io.UnsupportedEncodingException; +//import java.net.URLEncoder; +//import java.util.Date; +//import java.util.List; +// +///** +// * @Author scott +// * @since 2018-12-17 +// */ +//@Controller +//@RequestMapping("/sys/thirdLogin") +//@Slf4j +//public class ThirdLoginController { +// @Autowired +// private ISysUserService sysUserService; +// @Autowired +// private ISysThirdAccountService sysThirdAccountService; +// @Autowired +// private ISysDictService sysDictService; +// @Autowired +// private BaseCommonService baseCommonService; +// @Autowired +// private RedisUtil redisUtil; +// @Autowired +// private AuthRequestFactory factory; +// +// @Autowired +// private ThirdAppWechatEnterpriseServiceImpl thirdAppWechatEnterpriseService; +// @Autowired +// private ThirdAppDingtalkServiceImpl thirdAppDingtalkService; +// +// @Autowired +// private ISysThirdAppConfigService appConfigService; +// +// @RequestMapping("/render/{source}") +// public void render(@PathVariable("source") String source, HttpServletResponse response) throws IOException { +// log.info("第三方登录进入render：" + source); +// AuthRequest authRequest = factory.get(source); +// String authorizeUrl = authRequest.authorize(AuthStateUtils.createState()); +// log.info("第三方登录认证地址：" + authorizeUrl); +// response.sendRedirect(authorizeUrl); +// } +// +// @RequestMapping("/{source}/callback") +// public String loginThird(@PathVariable("source") String source, AuthCallback callback, ModelMap modelMap) { +// log.info("第三方登录进入callback：" + source + " params：" + JSONObject.toJSONString(callback)); +// AuthRequest authRequest = factory.get(source); +// AuthResponse response = authRequest.login(callback); +// log.info(JSONObject.toJSONString(response)); +// Result result = new Result(); +// if (response.getCode() == 2000) { +// +// JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(response.getData())); +// String username = data.getString("username"); +// String avatar = data.getString("avatar"); +// String uuid = data.getString("uuid"); +// //构造第三方登录信息存储对象 +// ThirdLoginModel tlm = new ThirdLoginModel(source, uuid, username, avatar); +// //判断有没有这个人 +// //update-begin-author:wangshuai date:20201118 for:修改成查询第三方账户表 +// LambdaQueryWrapper query = new LambdaQueryWrapper(); +// query.eq(SysThirdAccount::getThirdType, source); +// //update-begin---author:wangshuai---date:2023-10-07---for:【QQYUN-6667】敲敲云，线上解绑重新绑定一直提示这个--- +// query.eq(SysThirdAccount::getTenantId, CommonConstant.TENANT_ID_DEFAULT_VALUE); +// //update-end---author:wangshuai---date:2023-10-07---for:【QQYUN-6667】敲敲云，线上解绑重新绑定一直提示这个--- +// query.and(q -> q.eq(SysThirdAccount::getThirdUserUuid, uuid).or().eq(SysThirdAccount::getThirdUserId, uuid)); +// List thridList = sysThirdAccountService.list(query); +// SysThirdAccount user = null; +// if (thridList == null || thridList.size() == 0) { +// //否则直接创建新账号 +// user = sysThirdAccountService.saveThirdUser(tlm, CommonConstant.TENANT_ID_DEFAULT_VALUE); +// } else { +// //已存在 只设置用户名 不设置头像 +// user = thridList.get(0); +// } +// // 生成token +// //update-begin-author:wangshuai date:20201118 for:从第三方登录查询是否存在用户id，不存在绑定手机号 +// if (oConvertUtils.isNotEmpty(user.getSysUserId())) { +// String sysUserId = user.getSysUserId(); +// SysUser sysUser = sysUserService.getById(sysUserId); +// String token = saveToken(sysUser); +// modelMap.addAttribute("token", token); +// } else { +// modelMap.addAttribute("token", "绑定手机号," + "" + uuid); +// } +// //update-end-author:wangshuai date:20201118 for:从第三方登录查询是否存在用户id，不存在绑定手机号 +// //update-begin--Author:wangshuai Date:20200729 for：接口在签名校验失败时返回失败的标识码 issues#1441-------------------- +// } else { +// modelMap.addAttribute("token", "登录失败"); +// } +// //update-end--Author:wangshuai Date:20200729 for：接口在签名校验失败时返回失败的标识码 issues#1441-------------------- +// result.setSuccess(false); +// result.setMessage("第三方登录异常,请联系管理员"); +// return "thirdLogin"; +// } +// +// /** +// * 创建新账号 +// * +// * @param model +// * @return +// */ +// @PostMapping("/user/create") +// @ResponseBody +// public Result thirdUserCreate(@RequestBody ThirdLoginModel model) { +// log.info("第三方登录创建新账号："); +// Result res = new Result<>(); +// Object operateCode = redisUtil.get(CommonConstant.THIRD_LOGIN_CODE); +// if (operateCode == null || !operateCode.toString().equals(model.getOperateCode())) { +// res.setSuccess(false); +// res.setMessage("校验失败"); +// return res; +// } +// //创建新账号 +// //update-begin-author:wangshuai date:20201118 for:修改成从第三方登录查出来的user_id，在查询用户表尽行token +// SysThirdAccount user = sysThirdAccountService.saveThirdUser(model, CommonConstant.TENANT_ID_DEFAULT_VALUE); +// if (oConvertUtils.isNotEmpty(user.getSysUserId())) { +// String sysUserId = user.getSysUserId(); +// SysUser sysUser = sysUserService.getById(sysUserId); +// // 生成token +// String token = saveToken(sysUser); +// //update-end-author:wangshuai date:20201118 for:修改成从第三方登录查出来的user_id，在查询用户表尽行token +// res.setResult(token); +// res.setSuccess(true); +// } +// return res; +// } +// +// /** +// * 绑定账号 需要设置密码 需要走一遍校验 +// * +// * @param json +// * @return +// */ +// @PostMapping("/user/checkPassword") +// @ResponseBody +// public Result checkPassword(@RequestBody JSONObject json) { +// Result result = new Result<>(); +// Object operateCode = redisUtil.get(CommonConstant.THIRD_LOGIN_CODE); +// if (operateCode == null || !operateCode.toString().equals(json.getString("operateCode"))) { +// result.setSuccess(false); +// result.setMessage("校验失败"); +// return result; +// } +// String username = json.getString("uuid"); +// SysUser user = this.sysUserService.getUserByName(username); +// if (user == null) { +// result.setMessage("用户未找到"); +// result.setSuccess(false); +// return result; +// } +// String password = json.getString("password"); +// String salt = user.getSalt(); +// String passwordEncode = PasswordUtil.encrypt(user.getUsername(), password, salt); +// if (!passwordEncode.equals(user.getPassword())) { +// result.setMessage("密码不正确"); +// result.setSuccess(false); +// return result; +// } +// +// sysUserService.updateById(user); +// result.setSuccess(true); +// // 生成token +// String token = saveToken(user); +// result.setResult(token); +// return result; +// } +// +// private String saveToken(SysUser user) { +// // 生成token +// String token = JwtUtil.sign(user.getUsername(), user.getPassword()); +// redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); +// // 设置超时时间 +// redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000); +// return token; +// } +// +// /** +// * 第三方登录回调接口 +// * +// * @param token +// * @param thirdType +// * @return +// * @throws Exception +// */ +// @SuppressWarnings("unchecked") +// @RequestMapping(value = "/getLoginUser/{token}/{thirdType}/{tenantId}", method = RequestMethod.GET) +// @ResponseBody +// public Result getThirdLoginUser(@PathVariable("token") String token, @PathVariable("thirdType") String thirdType, @PathVariable("tenantId") String tenantId) throws Exception { +// Result result = new Result(); +// String username = JwtUtil.getUsername(token); +// +// //1. 校验用户是否有效 +// SysUser sysUser = sysUserService.getUserByName(username); +// result = sysUserService.checkUserIsEffective(sysUser); +// if (!result.isSuccess()) { +// return result; +// } +// //update-begin-author:wangshuai date:20201118 for:如果真实姓名和头像不存在就取第三方登录的 +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.eq(SysThirdAccount::getSysUserId, sysUser.getId()); +// query.eq(SysThirdAccount::getThirdType, thirdType); +// query.eq(SysThirdAccount::getTenantId, oConvertUtils.getInt(tenantId, CommonConstant.TENANT_ID_DEFAULT_VALUE)); +// //update-begin---author:wangshuai ---date:20230328 for：[QQYUN-4883]钉钉auth登录同一个租户下有同一个用户id------------ +// List accountList = sysThirdAccountService.list(query); +// SysThirdAccount account = new SysThirdAccount(); +// if (CollectionUtil.isNotEmpty(accountList)) { +// account = accountList.get(0); +// } +// //update-end---author:wangshuai ---date:20230328 for：[QQYUN-4883]钉钉auth登录同一个租户下有同一个用户id------------ +// if (oConvertUtils.isEmpty(sysUser.getRealname())) { +// sysUser.setRealname(account.getRealname()); +// } +// if (oConvertUtils.isEmpty(sysUser.getAvatar())) { +// sysUser.setAvatar(account.getAvatar()); +// } +// //update-end-author:wangshuai date:20201118 for:如果真实姓名和头像不存在就取第三方登录的 +// JSONObject obj = new JSONObject(); +// //TODO 第三方登确定登录租户和部门逻辑 +// +// //用户登录信息 +// obj.put("userInfo", sysUser); +// //获取字典缓存【解决 #jeecg-boot/issues/3998】 +// obj.put("sysAllDictItems", sysDictService.queryAllDictItems()); +// //token 信息 +// obj.put("token", token); +// result.setResult(obj); +// result.setSuccess(true); +// result.setCode(200); +// baseCommonService.addLog("用户名: " + username + ",登录成功[第三方用户]！", CommonConstant.LOG_TYPE_1, null); +// return result; +// } +// +// /** +// * 第三方绑定手机号返回token +// * +// * @param jsonObject +// * @return +// */ +// @Operation(summary = "手机号登录接口") +// @PostMapping("/bindingThirdPhone") +// @ResponseBody +// public Result bindingThirdPhone(@RequestBody JSONObject jsonObject) { +// Result result = new Result(); +// String phone = jsonObject.getString("mobile"); +// String thirdUserUuid = jsonObject.getString("thirdUserUuid"); +// // 校验验证码 +// String captcha = jsonObject.getString("captcha"); +// //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 +// String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE + phone; +// Object captchaCache = redisUtil.get(redisKey); +// //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 +// if (oConvertUtils.isEmpty(captcha) || !captcha.equals(captchaCache)) { +// result.setMessage("验证码错误"); +// result.setSuccess(false); +// return result; +// } +// //校验用户有效性 +// SysUser sysUser = sysUserService.getUserByPhone(phone); +// if (sysUser != null) { +// // 存在用户，直接绑定 +// sysThirdAccountService.updateThirdUserId(sysUser, thirdUserUuid); +// } else { +// // 不存在手机号，创建用户 +// sysUser = sysThirdAccountService.createUser(phone, thirdUserUuid, CommonConstant.TENANT_ID_DEFAULT_VALUE); +// } +// String token = saveToken(sysUser); +// result.setSuccess(true); +// result.setResult(token); +// return result; +// } +// +// /** +// * 企业微信/钉钉 OAuth2登录 +// * +// * @param source +// * @param state +// * @return +// */ +// @ResponseBody +// @GetMapping("/oauth2/{source}/login") +// public String oauth2LoginCallback(@PathVariable("source") String source, @RequestParam("state") String state, HttpServletRequest request, HttpServletResponse response, +// @RequestParam(value = "tenantId", required = false, defaultValue = "0") String tenantId) throws Exception { +// String url; +// //应用id为空，说明没有配置lowAppId +// if (oConvertUtils.isEmpty(tenantId)) { +// return "租户编码未配置"; +// } +// if (CommonConstant.WECHAT_ENTERPRISE.equalsIgnoreCase(source)) { +// //换成第三方app配置表 +// SysThirdAppConfig config = appConfigService.getThirdConfigByThirdType(Integer.valueOf(tenantId), MessageTypeEnum.QYWX.getType()); +// if (null == config) { +// return "还未配置企业微信应用，请配置企业微信应用"; +// } +// StringBuilder builder = new StringBuilder(); +// // 构造企业微信OAuth2登录授权地址 +// builder.append("https://open.weixin.qq.com/connect/oauth2/authorize"); +// // 企业的CorpID +// builder.append("?appid=").append(config.getClientId()); +// // 授权后重定向的回调链接地址，请使用urlencode对链接进行处理 +// String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/wechat_enterprise/callback?tenantId=" + tenantId; +// ; +// builder.append("&redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8")); +// // 返回类型，此时固定为：code +// builder.append("&response_type=code"); +// // 应用授权作用域。 +// // snsapi_base：静默授权，可获取成员的的基础信息（UserId与DeviceId）； +// builder.append("&scope=snsapi_base"); +// // 重定向后会带上state参数，长度不可超过128个字节 +// builder.append("&state=").append(state); +// // 终端使用此参数判断是否需要带上身份信息 +// builder.append("#wechat_redirect"); +// url = builder.toString(); +// } else if (CommonConstant.DINGTALK.equalsIgnoreCase(source)) { +// //update-begin---author:wangshuai ---date:20230224 for：[QQYUN-3440]新建企业微信和钉钉配置表，通过租户模式隔离------------ +// //换成第三方app配置表 +// SysThirdAppConfig appConfig = appConfigService.getThirdConfigByThirdType(Integer.valueOf(tenantId), MessageTypeEnum.DD.getType()); +// if (null == appConfig) { +// return "还未配置钉钉应用，请配置钉钉应用"; +// } +// //update-end---author:wangshuai ---date:20230224 for：[QQYUN-3440]新建企业微信和钉钉配置表，通过租户模式隔离------------ +// StringBuilder builder = new StringBuilder(); +// // 构造钉钉OAuth2登录授权地址 +// builder.append("https://login.dingtalk.com/oauth2/auth"); +// // 授权通过/拒绝后回调地址。 +// // 注意 需要与注册应用时登记的域名保持一致。 +// String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/dingtalk/callback?tenantId=" + tenantId; +// builder.append("?redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8")); +// // 固定值为code。 +// // 授权通过后返回authCode。 +// builder.append("&response_type=code"); +// // 步骤一中创建的应用详情中获取。 +// // 企业内部应用：client_id为应用的AppKey。 +// builder.append("&client_id=").append(appConfig.getClientId()); +// // 授权范围，授权页面显示的授权信息以应用注册时配置的为准。 +// // openid：授权后可获得用户userid +// builder.append("&scope=openid"); +// // 跟随authCode原样返回。 +// builder.append("&state=").append(state); +// //update-begin---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ +// builder.append("&prompt=").append("consent"); +// //update-end---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录-------------- +// url = builder.toString(); +// } else { +// return "不支持的source"; +// } +// log.info("oauth2 login url:" + url); +// response.sendRedirect(url); +// return "login…"; +// } +// +// /** +// * 企业微信/钉钉 OAuth2登录回调 +// * +// * @param code +// * @param state +// * @param response +// * @return +// */ +// @ResponseBody +// @GetMapping("/oauth2/{source}/callback") +// public String oauth2LoginCallback( +// @PathVariable("source") String source, +// // 企业微信返回的code +// @RequestParam(value = "code", required = false) String code, +// // 钉钉返回的code +// @RequestParam(value = "authCode", required = false) String authCode, +// @RequestParam("state") String state, +// @RequestParam(name = "tenantId", defaultValue = "0") String tenantId, +// HttpServletResponse response) { +// SysUser loginUser; +// if (CommonConstant.WECHAT_ENTERPRISE.equalsIgnoreCase(source)) { +// log.info("【企业微信】OAuth2登录进入callback：code=" + code + ", state=" + state); +// loginUser = thirdAppWechatEnterpriseService.oauth2Login(code, Integer.valueOf(tenantId)); +// if (loginUser == null) { +// return "登录失败"; +// } +// } else if (CommonConstant.DINGTALK.equalsIgnoreCase(source)) { +// log.info("【钉钉】OAuth2登录进入callback：authCode=" + authCode + ", state=" + state); +// loginUser = thirdAppDingtalkService.oauth2Login(authCode, Integer.valueOf(tenantId)); +// if (loginUser == null) { +// return "登录失败"; +// } +// } else { +// return "不支持的source"; +// } +// try { +// +// //update-begin-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面 +// String redirect = ""; +// if (state.indexOf("?") > 0) { +// String[] arr = state.split("\\?"); +// state = arr[0]; +// if (arr.length > 1) { +// redirect = arr[1]; +// } +// } +// +// String token = saveToken(loginUser); +// state += "/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, "UTF-8") + "&tenantId=" + URLEncoder.encode(tenantId, "UTF-8"); +// //update-begin---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ +// state += "&thirdType=" + source; +// //state += "&thirdType=" + "wechat_enterprise"; +// if (redirect != null && redirect.length() > 0) { +// state += "&" + redirect; +// } +// //update-end-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面 +// +// //update-end---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ +// log.info("OAuth2登录重定向地址: " + state); +// try { +// response.sendRedirect(state); +// return "ok"; +// } catch (IOException e) { +// e.printStackTrace(); +// return "重定向失败"; +// } +// } catch (UnsupportedEncodingException e) { +// e.printStackTrace(); +// return "解码失败"; +// } +// } +// +// /** +// * 注册账号并绑定第三方账号 【低代码应用专用接口】 +// * +// * @param jsonObject +// * @param user +// * @return +// */ +// @ResponseBody +// @PutMapping("/registerBindThirdAccount") +// public Result registerBindThirdAccount(@RequestBody JSONObject jsonObject, SysUser user) { +// //手机号 +// String phone = jsonObject.getString("phone"); +// //验证码 +// String smscode = jsonObject.getString("smscode"); +// String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE + phone; +// Object code = redisUtil.get(redisKey); +// //第三方uuid +// String thirdUserUuid = jsonObject.getString("thirdUserUuid"); +// String username = jsonObject.getString("username"); +// //未设置用户名，则用手机号作为用户名 +// if (oConvertUtils.isEmpty(username)) { +// username = phone; +// } +// //未设置密码，则随机生成一个密码 +// String password = jsonObject.getString("password"); +// if (oConvertUtils.isEmpty(password)) { +// password = RandomUtil.randomString(8); +// } +// String email = jsonObject.getString("email"); +// SysUser sysUser1 = sysUserService.getUserByName(username); +// if (sysUser1 != null) { +// return Result.error("用户名已注册"); +// } +// SysUser sysUser2 = sysUserService.getUserByPhone(phone); +// if (sysUser2 != null) { +// return Result.error("该手机号已注册"); +// } +// if (oConvertUtils.isNotEmpty(email)) { +// SysUser sysUser3 = sysUserService.getUserByEmail(email); +// if (sysUser3 != null) { +// return Result.error("邮箱已被注册"); +// } +// } +// if (null == code) { +// return Result.error("手机验证码失效，请重新获取"); +// } +// if (!smscode.equals(code.toString())) { +// return Result.error("手机验证码错误"); +// } +// String realname = jsonObject.getString("realname"); +// if (oConvertUtils.isEmpty(realname)) { +// realname = username; +// } +// try { +// //保存用户表 +// user.setCreateTime(new Date()); +// String salt = oConvertUtils.randomGen(8); +// String passwordEncode = PasswordUtil.encrypt(username, password, salt); +// user.setSalt(salt); +// user.setUsername(username); +// user.setRealname(realname); +// user.setPassword(passwordEncode); +// user.setEmail(email); +// user.setPhone(phone); +// user.setStatus(CommonConstant.USER_UNFREEZE); +// user.setDelFlag(CommonConstant.DEL_FLAG_0); +// user.setActivitiSync(CommonConstant.ACT_SYNC_1); +// sysUserService.addUserWithRole(user, ""); +// //保存第三方用户表 +// sysThirdAccountService.updateThirdUserId(user, thirdUserUuid); +// String token = saveToken(user); +// return Result.ok(token); +// } catch (Exception e) { +// return Result.error("注册失败"); +// } +// } +//} \ No newline at end of file