From 365a1a1eacc425c858a661b7ffa14a7270bb1634 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 30 九月 2026 14:27:04 +0800
Subject: [PATCH] fix(auth): 修复企业微信扫码登录换 profile 必抛空指针，并给自动注册账号绑默认角色
---
yudao-server/src/main/resources/application.yaml | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 6bc5514..2766856 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -47,7 +47,7 @@
# 2. true: 鍚姩鏃朵細瀵规暟鎹簱涓墍鏈夎〃杩涜鏇存柊鎿嶄綔锛屽鏋滆〃瀛樺湪锛屼笉鍋氬鐞嗭紝鍙嶄箣锛岃嚜鍔ㄥ垱寤鸿〃
# 3. create_drop: 鍚姩鏃惰嚜鍔ㄥ垱寤鸿〃锛屽叧闂椂鑷姩鍒犻櫎琛�
# 4. drop_create: 鍚姩鏃讹紝鍒犻櫎鏃ц〃锛屽啀鍒涘缓鏂拌〃
- database-schema-update: true # 璁剧疆涓� false锛屽彲閫氳繃 https://github.com/flowable/flowable-sql 鍒濆鍖�
+ database-schema-update: false # 璁剧疆涓� false锛屽彲閫氳繃 https://github.com/flowable/flowable-sql 鍒濆鍖�
db-history-used: true # flowable6 榛樿 true 鐢熸垚淇℃伅琛紝鏃犻渶鎵嬪姩璁剧疆
check-process-definitions: false # 璁剧疆涓� false锛岀鐢� /resources/processes 鑷姩閮ㄧ讲 BPMN XML 娴佺▼
history-level: audit # full锛氫繚瀛樺巻鍙叉暟鎹殑鏈�楂樼骇鍒紝鍙繚瀛樺叏閮ㄦ祦绋嬬浉鍏崇粏鑺傦紝鍖呮嫭娴佺▼娴佽浆鍚勮妭鐐瑰弬鏁�
@@ -196,6 +196,14 @@
security:
permit-all_urls:
- /admin-api/mp/open/** # 寰俊鍏紬鍙峰紑鏀惧钩鍙帮紝寰俊鍥炶皟鎺ュ彛锛屼笉闇�瑕佺櫥褰�
+ - /admin-api/wxcp/callback/** # 浼佷笟寰俊鍥炶皟鎺ュ彛锛屼笉闇�瑕佺櫥褰�
+ - /admin-api/wxcp/activity/signup-page # 娲诲姩鎶ュ悕钀藉湴椤碉紝鎵爜鎵撳紑锛屼笉闇�瑕佺櫥褰�
+ - /admin-api/wxcp/activity/signup # 娲诲姩鎶ュ悕鎻愪氦锛屼笉闇�瑕佺櫥褰�
+ # 鎶ュ悕椤甸渶瑕佷笂浼犲浘鐗�/闄勪欢锛岃�� system 鐨勪笂浼犳帴鍙ｉ粯璁よ姹傜櫥褰曘��
+ # 杩欓噷鍙斁寮�銆屽叕鍏变笂浼犮�嶈繖涓�涓凡鏈夋帴鍙ｏ紙涓嶆柊寤� upload 鎺ュ彛锛夛紝
+ # 娉ㄦ剰锛氭斁寮�鍚庝换浣曡兘璁块棶鍒拌鍦板潃鐨勪汉閮藉彲浠ヤ笂浼犳枃浠讹紝灞炰簬鏈夋剰鐨勬潈琛°��
+ # 濡傞渶鏀剁揣锛屽彲鏀逛负璁╂姤鍚嶉〉鍏堣蛋浼佷笟寰俊缃戦〉鎺堟潈鎷夸护鐗屽悗鍐嶄笂浼犮��
+ - /admin-api/system/storage-blob/public-upload # 娲诲姩鎶ュ悕椤甸檮浠朵笂浼�
api-encrypt:
enable: true # 鏄惁寮�鍚� API 鍔犲瘑
algorithm: AES # 鍔犲瘑绠楁硶锛屾敮鎸� AES銆丷SA 绛�
@@ -275,4 +283,31 @@
message-bus:
type: redis # 娑堟伅鎬荤嚎鐨勭被鍨�
+--- #################### 绀句氦鐧诲綍锛圝ustAuth锛夐厤缃� ####################
+
+# 浼佷笟寰俊鎵爜鐧诲綍鐨勩�屽崰浣嶉厤缃�嶏紝鍒绘剰鏀惧湪 application.yaml 鑰岄潪鏌愪釜 profile锛�
+# 浠ヤ繚璇佹墍鏈� profile 閮芥湁锛屼笉浼氬啀鍑虹幇銆屽彧鏈� local 閰嶄簡銆佹崲 profile 灏辨姏 NPE銆嶃��
+#
+# 涓轰粈涔堝繀椤诲瓨鍦細SocialClientServiceImpl.buildAuthRequest 浼氬厛鐢� yaml 閲岀殑閰嶇疆鏋勯�� AuthRequest锛�
+# 鍐嶆嬁 system_social_client 琛ㄩ噷鍚岀被鍨嬬殑璁板綍瑕嗙洊 clientId / clientSecret / agentId銆�
+# 鑰� YudaoJustAuthConfiguration 鐨� @ConditionalOnProperty(matchIfMissing = true)
+# 璁� AuthRequestFactory 鏃犺閰嶆病閰嶉兘浼氬垱寤猴紝涓�鏃﹁繖閲岀己澶憋紝璋冪敤閾句細鍥炶惤鍒�
+# justauth.extend 鍒嗘敮锛岃�� extend 榛樿涓� null锛岀洿鎺ユ姏 NullPointerException銆�
+#
+# 娉ㄦ剰锛氫笅闈㈣繖浜涘�煎彧鏄 AuthRequestFactory 鑳芥瀯閫犲嚭 AuthWeChatEnterpriseQrcodeRequest 鐨勫崰浣嶏紝
+# 鐪熸鐢熸晥鐨勫嚟鎹潵鑷暟鎹簱 system_social_client锛坰ocial_type=30銆乽ser_type=1锛夈��
+justauth:
+ enabled: true
+ type:
+ WECHAT_ENTERPRISE: # 浼佷笟寰俊鎵爜鐧诲綍锛屽搴� SocialTypeEnum.WECHAT_ENTERPRISE(30)
+ client-id: ww2b7707c8d15ad73d
+ client-secret: MhfEn_b6XfPtZHygmNEpUtecFTQgrnPgMude6jeFSsg
+ agent-id: 1000003
+ # redirect-uri 涓嶉厤锛氱敱鍓嶇鎸夊綋鍓嶆祻瑙堝櫒鍦板潃鍔ㄦ�佷紶锛孲ocialClientServiceImpl.getAuthorizeUrl
+ # 浼氱敤 HttpUtils.replaceUrlQuery 鎶� redirect_uri 鎹㈡垚鍓嶇浼犺繘鏉ョ殑鍊笺��
+ # 鎵�浠ュ繀椤诲悓鏃舵墦寮�涓嬮潰杩欎釜寮�鍏� 鈥斺�� JustAuth 鐨� AuthDefaultRequest 鏋勯�犳椂浼氳皟
+ # AuthChecker.checkConfig锛宺edirectUri 涓虹┖涓旀湭蹇界暐鏍￠獙鏃剁洿鎺ユ姏
+ # AuthException: Illegal redirect uri [WECHAT_ENTERPRISE]銆�
+ ignore-check-redirect-uri: true
+
debug: false
--
Gitblit v1.9.3