Merge pull request #1123 from linxiaowu1992/fix/240206

TencentBlueKing · Feb 19, 2024 · a0f9ca1 · a0f9ca1
2 parents b7cc4d0 + f55101b
commit a0f9ca1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git 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();
                 });

diff --git 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>

diff --git 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()

diff --git 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>