Merge remote-tracking branch 'origin/main'

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,61 @@
+name: BUG 提交
+description: 提交产品缺陷帮助我们更好的改进
+title: "[BUG]"
+labels: "类型: 缺陷"
+assignees: baixin513
+body:
+  - type: markdown
+    id: contacts_title
+    attributes:
+      value: "## 联系方式"
+  - type: input
+    id: contacts
+    validations:
+      required: false
+    attributes:
+      label: "联系方式"
+      description: "可以快速联系到您的方式：交流群号及昵称、邮箱等"
+  - type: markdown
+    id: environment
+    attributes:
+      value: "## 环境信息"
+  - type: input
+    id: version
+    validations:
+      required: true
+    attributes:
+      label: "MaxKB 版本"
+      description: "登录 MaxKB Web 控制台，在右上角关于页面查看当前版本。"
+  - type: markdown
+    id: details
+    attributes:
+      value: "## 详细信息"
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: "问题描述"
+      description: "简要描述您碰到的问题"
+    validations:
+      required: true
+  - type: textarea
+    id: how-happened
+    attributes:
+      label: "重现步骤"
+      description: "如果操作可以重现该问题"
+    validations:
+      required: true
+  - type: textarea
+    id: expect
+    attributes:
+      label: "期待的正确结果"
+  - type: textarea
+    id: logs
+    attributes:
+      label: "相关日志输出"
+      description: "请复制并粘贴任何相关的日志输出。 这将自动格式化为代码，因此无需反引号。"
+      render: shell
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: "附加信息"
+      description: "如果你还有其他需要提供的信息，可以在这里填写（可以提供截图、视频等）。"

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 对 MaxKB 项目有其他问题
+    url: https://bbs.fit2cloud.com/c/mk/11
+    about: 如果你对 MaxKB 有其他想要提问的，我们欢迎到我们的官方社区进行提问。

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,36 @@
+name: 需求建议
+description: 提出针对本项目的想法和建议
+title: "[FEATURE]"
+labels: enhancement
+assignees: baixin513
+body:
+  - type: markdown
+    id: environment
+    attributes:
+      value: "## 环境信息"
+  - type: input
+    id: version
+    validations:
+      required: true
+    attributes:
+      label: "MaxKB 版本"
+      description: "登录 MaxKB Web 控制台，在右上角关于页面查看当前版本。"
+  - type: markdown
+    id: details
+    attributes:
+      value: "## 详细信息"
+  - type: textarea
+    id: description
+    attributes:
+      label: "请描述您的需求或者改进建议"
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: "请描述你建议的实现方案"
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: "附加信息"
+      description: "如果你还有其他需要提供的信息，可以在这里填写（可以提供截图、视频等）。"

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+#### What this PR does / why we need it?
+
+#### Summary of your change
+
+#### Please indicate you've done the following:
+
+- [ ] Made sure tests are passing and test coverage is added if needed.
+- [ ] Made sure commit message follow the rule of [Conventional Commits specification](https://www.conventionalcommits.org/).
+- [ ] Considered the docs impact and opened a new docs issue or PR with docs changes if needed.

apps/users/urls.py

@@ -8,7 +8,7 @@ urlpatterns = [
     path('user/list', views.User.Query.as_view()),
     path('user/login', views.Login.as_view(), name='login'),
     path('user/logout', views.Logout.as_view(), name='logout'),
-    path('user/register', views.Register.as_view(), name="register"),
+    # path('user/register', views.Register.as_view(), name="register"),
     path("user/send_email", views.SendEmail.as_view(), name='send_email'),
     path("user/check_code", views.CheckCode.as_view(), name='check_code'),
     path("user/re_password", views.RePasswordView.as_view(), name='re_password'),

ui/src/views/login/index.vue

@@ -36,9 +36,9 @@
       </el-form>
       <el-button size="large" type="primary" class="w-full" @click="login">登录</el-button>
       <div class="operate-container flex-between mt-12">
-        <el-button class="register" @click="router.push('/register')" link type="primary">
+        <!-- <el-button class="register" @click="router.push('/register')" link type="primary">
           注册
-        </el-button>
+        </el-button> -->
         <el-button
           class="forgot-password"
           @click="router.push('/forgot_password')"
@@ -79,7 +79,7 @@ const rules = ref<FormRules<LoginRequest>>({
       required: true,
       message: '请输入密码',
       trigger: 'blur'
-    },
+    }
   ]
 })
 const loginFormRef = ref<FormInstance>()