From f081e69df8eaf01f9bf6f9ec621fd782a1712fb9 Mon Sep 17 00:00:00 2001
From: liuxiaohua <texousliu@foxmail.com>
Date: Thu, 16 Jan 2025 10:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20[2025-01-16]=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20Confluence=20=E7=BE=A4=E7=BB=84=E6=98=A0=E5=B0=84=E6=95=99?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 任务/周报.md                                 | 15 +++++-----
 教程/20250110-Confluence安装及SSO接入指南.md | 11 ++++++++
 教程/20250113-Grafana安装及SSO接入指南.md    | 29 ++++++++++++++++++++
 杂项/00-三方对接信息.md                      | 19 +++++++++++++
 4 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 教程/20250113-Grafana安装及SSO接入指南.md
 create mode 100644 杂项/00-三方对接信息.md

diff --git a/任务/周报.md b/任务/周报.md
index 3b219f2..3277386 100644
--- a/任务/周报.md
+++ b/任务/周报.md
@@ -3,14 +3,15 @@
 - [X] [Gitlab SSO接入](http://confluence.qifu.com/pages/viewpage.action?pageId=38508192)
 - [X] [K8s健康检查接口集成。](http://confluence.qifu.com/pages/viewpage.action?pageId=38508360)
 - [X] [Confluence安装及SSO接入指南](http://confluence.qifu.com/pages/viewpage.action?pageId=38508352)
-- [ ] 集简云对接（需要付费后才能介入）
-  - [X] 基础架子搭建
-  - [ ] 接口对接
-- [ ] 面试
+- [X] [Nacos安装及SSO接入指南](http://confluence.qifu.com/pages/viewpage.action?pageId=38508402)
+- [-] 集简云对接（需要付费后才能介入）
+  - - [X] 基础架子搭建
+  - - [ ] 接口对接
+- [X] 面试
 - 附加任务
-  - [X] starter-sso 封装
-  - [ ] 国际电子面单下单测试
-  - [X] 物流轨迹字段完善
+  - - [X] [starter-sso 封装](http://confluence.qifu.com/pages/viewpage.action?pageId=38508260)
+  - - [ ] 国际电子面单下单测试
+  - - [X] 物流轨迹字段完善
 
 ## 20241230 - 20250103
 
diff --git a/教程/20250110-Confluence安装及SSO接入指南.md b/教程/20250110-Confluence安装及SSO接入指南.md
index 85aaeda..74fab0d 100644
--- a/教程/20250110-Confluence安装及SSO接入指南.md
+++ b/教程/20250110-Confluence安装及SSO接入指南.md
@@ -123,6 +123,17 @@ java -jar atlassian-agent.jar -d -p '${应用密钥}' -m test@test.com -n BAT -o
 - 登录按钮配置：
 - ![](https://picture.texous.cn/blog/20250110134820772.png)
 
+#### 配置用户组映射
+- Keycloak 创建 Confluence 对应的群组
+- ![](https://picture.texous.cn/blog/20250116100106765.png)
+- Keycloak 用户加入对应的群组
+- ![](https://picture.texous.cn/blog/20250116101324209.png)
+- Keycloak 客户端添加对应的映射 `客户端 / 客户端范围 / xxx-dedicated / 添加映射器 / 根据配置 / Group Membership`
+- ![](https://picture.texous.cn/blog/20250116101738759.png)
+- Confluence 配置
+- ![](https://picture.texous.cn/blog/20250116102159486.png)
+
+
 ## 参考
 
 - [Confluence](https://www.iots.vip/post/atlassian-series-crack)
diff --git a/教程/20250113-Grafana安装及SSO接入指南.md b/教程/20250113-Grafana安装及SSO接入指南.md
new file mode 100644
index 0000000..9685273
--- /dev/null
+++ b/教程/20250113-Grafana安装及SSO接入指南.md
@@ -0,0 +1,29 @@
+<!-- Space: qifu -->
+<!-- Parent: 后端技术&知识&规范 -->
+<!-- Parent: 技术方案 -->
+<!-- Parent: 基建 -->
+<!-- Title: 20250113-Grafana安装及SSO接入指南 -->
+
+<!-- Macro: :anchor\((.*)\):
+     Template: ac:anchor
+     Anchor: ${1} -->
+<!-- Macro: \!\[.*\]\((.+)\)\<\!\-\- width=(.*) \-\-\>
+     Template: ac:image
+     Url: ${1}
+     Width: ${2} -->
+<!-- Macro: \<\!\-\- :toc: \-\-\>
+     Template: ac:toc
+     Printable: 'false'
+     MinLevel: 2 
+     MaxLevel: 4 -->
+<!-- Include: 杂项/声明文件.md -->
+
+<!-- :toc: -->
+
+# Grafana安装及SSO接入指南 安装及 SSO 接入指南
+
+----
+
+## 参考
+
+- [Grafana OIDC](https://grafana.org.cn/docs/grafana/latest/setup-grafana/configure-security/configure-authentication/keycloak/)
diff --git a/杂项/00-三方对接信息.md b/杂项/00-三方对接信息.md
new file mode 100644
index 0000000..f35ff74
--- /dev/null
+++ b/杂项/00-三方对接信息.md
@@ -0,0 +1,19 @@
+## EBay
+ebay的开发者账号：1848967790@qq.com / GZqf1234！
+ebay的沙盒user账号：qutian@keyfil.com / GZqf1234!
+
+https://developer.ebay.com/develop/tools/sandbox
+
+## 极兔速递
+https://open.jtexpress.com.cn/#/helpCenter
+
+CustormerCode:J0086474299
+pwd:6A272C3DD1F3CD2F92BF567C37040910
+privatekey: 0258d71b55fc45e3ad7a7f38bf4b201a
+
+
+## 快递100：
+tiana W1923t1720
+
+## Track123：
+18627711951 W1923t1720
\ No newline at end of file