From a820e1bb3c5bfeef213fa98d8cefb63c6b136040 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 13:42:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 fc8b79d..ec56533 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,5 +1,6 @@
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;
@@ -9,15 +10,18 @@
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.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
-import com.smartor.mapper.SysUserDeptMapper;
+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;
@@ -50,11 +54,17 @@
@Autowired
private ISysConfigService sysConfigService;
- @Autowired
- private IServiceSLTDHealthcareRecordService iServiceSLTDHealthcareRecordService;
+
@Autowired
+ @Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
+
+ @Value("${wx_appid}")
+ private String wxAppid;
+
+ @Value("${wx_appSecret}")
+ private String wxAppSecret;
/**
* 鐧诲綍鏂规硶
@@ -80,7 +90,9 @@
*/
@PostMapping("/test")
public void test(@RequestBody Map<String, Object> map) {
- iServiceSLTDHealthcareRecordService.aa(map);
+ WxMpUtils wxMpUtils = new WxMpUtils(wxAppid, wxAppSecret);
+ boolean b = wxMpUtils.sendTextMessage("bA_nlW7yM6CCfQMUX5HpBg", "浣犲ソ");
+ System.out.println("b鐨勫�间负锛�" + b);
}
/**
@@ -97,12 +109,8 @@
*/
// @IpWhitelist
@GetMapping("/SSOLogin")
- public RedirectView SSOLogin(@RequestParam(required = false) String userName,
- @RequestParam(required = false) String orgid,
- @RequestParam(required = false) String campusid,
- @RequestParam(required = false) String deptId,
- String token) {
- if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) {
+ public RedirectView SSOLogin(@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("鍙傛暟涓嶈兘涓虹┖");
}
--
Gitblit v1.9.3