wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/dingdingLogin' into dev

Browse Source
This commit is contained in:
wangli 2026-02-05 10:48:16 +08:00
commit 6ed5dc6b6a
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/DangerOperationController.java
View File

@ -273,7 +273,8 @@ public class DangerOperationController {
// 如果没有配置 AppSecret，则无法进行后续交互 // 如果没有配置 AppSecret，则无法进行后续交互
if (!StringUtils.hasText(appSecret)) { if (!StringUtils.hasText(appSecret)) {
log.error("【dingtalk】DingTalk AppSecret not configured"); log.info("【dingtalk】DingTalk AppSecret not configured");
model.addAttribute("isAuthenticated", false);
model.addAttribute("authError", "服务端未配置 AppSecret，无法登录"); model.addAttribute("authError", "服务端未配置 AppSecret，无法登录");
return "form"; return "form";
} }
@ -297,7 +298,8 @@ public class DangerOperationController {
String accessToken = tokenJson.getString("accessToken"); String accessToken = tokenJson.getString("accessToken");
if (!StringUtils.hasText(accessToken)) { if (!StringUtils.hasText(accessToken)) {
log.error("【dingtalk】Failed to get access token: {}", tokenResponse); log.info("【dingtalk】Failed to get access token: {}", tokenResponse);
model.addAttribute("isAuthenticated", false);
model.addAttribute("authError", "钉钉登录验证失败: 无法获取 AccessToken"); model.addAttribute("authError", "钉钉登录验证失败: 无法获取 AccessToken");
return "form"; return "form";
} }
@ -315,13 +317,16 @@ public class DangerOperationController {
String mobile = userJson.getString("mobile"); String mobile = userJson.getString("mobile");
if (!StringUtils.hasText(mobile)) { if (!StringUtils.hasText(mobile)) {
log.error("【dingtalk】Failed to get user info: {}", userInfoResponse); log.info("【dingtalk】Failed to get user info: {}", userInfoResponse);
model.addAttribute("isAuthenticated", false);
model.addAttribute("authError", "钉钉登录验证失败: 无法获取用户手机号"); model.addAttribute("authError", "钉钉登录验证失败: 无法获取用户手机号");
return "form"; return "form";
} }
List<ThirdPartyUserDTO> users = RpcExternalUtil.rpcApiResultProcessor(() -> thirdPartySyncApi.getUserInfosByPhone(mobile), "查询用户是否存在", mobile); List<ThirdPartyUserDTO> users = RpcExternalUtil.rpcApiResultProcessor(() -> thirdPartySyncApi.getUserInfosByPhone(mobile), "查询用户是否存在", mobile);
if (CollectionUtils.isEmpty(users)) { if (CollectionUtils.isEmpty(users)) {
log.info("【dingtalk】Failed to get user info2: {}", JSON.toJSONString(users));
model.addAttribute("isAuthenticated", false);
model.addAttribute("authError", "用户未授权！"); model.addAttribute("authError", "用户未授权！");
return "form"; return "form";
} }
@ -341,7 +346,8 @@ public class DangerOperationController {
return "form"; return "form";
} catch (Exception e) { } catch (Exception e) {
log.error("【dingtalk】DingTalk Callback Error", e); log.info("【dingtalk】DingTalk Callback Error", e);
model.addAttribute("isAuthenticated", false);
model.addAttribute("authError", "登录过程中发生异常: " + e.getMessage()); model.addAttribute("authError", "登录过程中发生异常: " + e.getMessage());
return "form"; return "form";
} }

15
workflow-engine-server/src/main/resources/templates/form.html
View File

@ -148,7 +148,8 @@
<!-- 授权验证区域 - 未认证时显示 --> <!-- 授权验证区域 - 未认证时显示 -->
<div th:unless="${isAuthenticated}"> <div th:unless="${isAuthenticated}">
<!-- 错误提示 Banner --> <!-- 错误提示 Banner -->
<div class="mb-4 bg-red-50 border border-red-200 rounded-lg p-4 flex items-center" <div id="authError"
class="mb-4 bg-red-50 border border-red-200 rounded-lg p-4 flex items-center hidden"
th:if="${authError != null}"> th:if="${authError != null}">
<i class="fa fa-exclamation-circle text-danger text-lg mr-3"></i> <i class="fa fa-exclamation-circle text-danger text-lg mr-3"></i>
<div> <div>
@ -587,20 +588,20 @@
// 页面加载时检查后端消息 // 页面加载时检查后端消息
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {
// 检查流程操作的后端消息（使用 Thymeleaf JS 内联语法） // 检查流程操作的后端消息（使用 Thymeleaf JS 内联语法）
/*[[#{ const serverMessage = [[${message}]] || null;
if (${message != null}) { if (serverMessage) {
operationMessage.classList.remove('hidden'); operationMessage.classList.remove('hidden');
if (${message.startsWith('操作成功')}) { if (serverMessage.includes('成功')) {
operationMessage.className = 'mt-4 p-4 rounded-lg bg-green-50 border border-green-200 text-green-700'; operationMessage.className = 'mt-4 p-4 rounded-lg bg-green-50 border border-green-200 text-green-700';
} else { } else {
operationMessage.className = 'mt-4 p-4 rounded-lg bg-red-50 border border-red-200 text-red-700'; operationMessage.className = 'mt-4 p-4 rounded-lg bg-red-50 border border-red-200 text-red-700';
} }
operationMessage.innerHTML = '<i class="fa ' + (${message.startsWith('操作成功')} ? 'fa-check-circle' : 'fa-exclamation-circle') + ' mr-2"></i>' + '${message}'; const iconClass = serverMessage.includes('成功') ? 'fa-check-circle' : 'fa-exclamation-circle';
operationMessage.innerHTML = `<i class="fa ${iconClass} mr-2"></i>${serverMessage}`;
} }
}]]*/
// 显示授权错误（如果有） // 显示授权错误（如果有）
if (authError && authError.textContent.trim() !== '') { if (authError && authError.textContent.trim() !== '' && !authError.textContent.includes('${authError}')) {
authError.classList.remove('hidden'); authError.classList.remove('hidden');
} }
}); });