From 252ccc0df36f685dbe65d9c4c060a6395b517960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E6=99=93=E6=AD=A6=5Bfinelin=5D?=
 <finelin@canway.net>
Date: Tue, 6 Feb 2024 18:28:12 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E9=80=9A=E9=81=93=E6=97=B6component=5Fname=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=BC=E8=87=B4api?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=AE=BF=E9=97=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 paas2/paas/esb/apps/manager/channel/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/paas2/paas/esb/apps/manager/channel/views.py b/paas2/paas/esb/apps/manager/channel/views.py
index 0593260dc..12e3a726e 100644
--- a/paas2/paas/esb/apps/manager/channel/views.py
+++ b/paas2/paas/esb/apps/manager/channel/views.py
@@ -84,6 +84,8 @@ def get(self, request):
     def post(self, request):
         form = ESBChannelForm(request.POST)
         if form.is_valid():
+            # component_name不在request.POST中，需要手动赋值，不然会丢失
+            form.instance.component_name = form.cleaned_data["component_name"]
             form.save()
             return HttpResponseRedirect(reverse("manager.channel.list"))
         system_form = ComponentSystemForm()

From 54fc0b4b80f86a38f654d15580ec97f6af58eee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E6=99=93=E6=AD=A6=5Bfinelin=5D?=
 <finelin@canway.net>
Date: Tue, 6 Feb 2024 18:30:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=87=8D=E5=A4=8D=E5=8A=A0=E5=AF=86=EF=BC=8C?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 paas2/login/templates/account/login_ce.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/paas2/login/templates/account/login_ce.html b/paas2/login/templates/account/login_ce.html
index f7264b67d..706de64a3 100755
--- a/paas2/login/templates/account/login_ce.html
+++ b/paas2/login/templates/account/login_ce.html
@@ -142,9 +142,13 @@
         }
         $(document).ready(function(){
              if (ENABLE_PASSWORD_RSA_ENCRYPTED) {
+                 // 避免点击多次登录按钮，导致重复加密
+                 document.getElementById("login-btn").disabled = true;
+                 document.getElementById('login-btn').textContent = "登录中...";
                  $('#login-form').submit(() => {
                      rsa_encrypt_password();
                 });
+                
             }
         })
     </script>

From bb2d1f0ca6103a7ce947ab8d1c96fdf5475f9555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E6=99=93=E6=AD=A6=5Bfinelin=5D?=
 <finelin@canway.net>
Date: Tue, 6 Feb 2024 18:32:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=20=E9=81=BF=E5=85=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=A4=9A=E6=AC=A1=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E9=87=8D=E5=A4=8D=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=EF=BC=8C=E7=99=BB=E5=BD=95=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 paas2/login/templates/account/login.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/paas2/login/templates/account/login.html b/paas2/login/templates/account/login.html
index 1878b8258..119210241 100644
--- a/paas2/login/templates/account/login.html
+++ b/paas2/login/templates/account/login.html
@@ -177,6 +177,9 @@
         }
         $(document).ready(function(){
              if (ENABLE_PASSWORD_RSA_ENCRYPTED) {
+                 // 避免点击多次登录按钮，导致重复加密
+                 document.getElementById("login-btn").disabled = true;
+                 document.getElementById('login-btn').textContent = "登录中...";
                  $('#login-form').submit(() => {
                      rsa_encrypt_password();
                 });

From f55101bff6419001a98e49357de5b9aa93842dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E6=99=93=E6=AD=A6=5Bfinelin=5D?=
 <finelin@canway.net>
Date: Tue, 6 Feb 2024 19:53:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E8=80=85=E4=B8=AD=E5=BF=83=E6=96=B0=E6=89=8B=E6=8C=87=E5=8D=97?=
 =?UTF-8?q?=E4=B8=AD=20=E6=9C=AC=E5=9C=B0=E5=BC=80=E5=8F=91=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=90=AD=E5=BB=BA=E6=95=99=E7=A8=8B=20=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E9=93=BE=E6=8E=A5=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 paas2/paas/templates/guide/newbie.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paas2/paas/templates/guide/newbie.html b/paas2/paas/templates/guide/newbie.html
index ca42f128d..e9c5c506d 100644
--- a/paas2/paas/templates/guide/newbie.html
+++ b/paas2/paas/templates/guide/newbie.html
@@ -51,7 +51,7 @@
                     <div class="king-timeline-item">
                         <div class="king-timeline-body">
                             <ol class="guide-list">
-                              <li>${_(u'本地开发环境搭建教程')} <a href="https://docs.bk.tencent.com/blueapps/USAGE.html#2-%E5%BC%80%E5%8F%91%E7%8E%AF%E5%A2%83%E6%90%AD%E5%BB%BA%EF%BC%88python%EF%BC%89" target="_blank">${_(u'点击了解')}</a> ;</li>
+                              <li>${_(u'本地开发环境搭建教程')} <a href="https://bk.tencent.com/docs/markdown/ZH/PaaS/DevelopTools/SaaSGuide/DevBeginner/Windows.md" target="_blank">${_(u'点击了解')}</a> ;</li>
                                 <br>
                                 <strong>${_(u'注意：应用测试、正式部署时会自动安装运行环境，并部署应用')}</strong>
                             </ol>