From 09157a47fb85398d93247f8885c875a578499651 Mon Sep 17 00:00:00 2001
From: Lion Yie <liao046769@gmail.com>
Date: Sun, 22 Oct 2023 10:47:02 +0800
Subject: [PATCH 1/2] chore: Update webapp.dockerfile

---
 webapp.dockerfile | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/webapp.dockerfile b/webapp.dockerfile
index 916af0f..b3d54fd 100644
--- a/webapp.dockerfile
+++ b/webapp.dockerfile
@@ -8,21 +8,24 @@ RUN npm run build:prod
 
 FROM python:3.7-buster
 
-RUN echo 'deb http://mirrors.163.com/debian/ stretch main non-free contrib' > /etc/apt/sources.list
-RUN echo 'deb http://mirrors.163.com/debian/ stretch-updates main non-free contrib' >> /etc/apt/sources.list
-RUN echo 'deb http://mirrors.163.com/debian-security/ stretch/updates main non-free contrib' >> /etc/apt/sources.list
-RUN apt update
-RUN apt install -y libtinfo5 --allow-remove-essential
-RUN apt install -y ncurses-base
-RUN apt install -y vim
+RUN echo 'deb http://archive.debian.org/debian/ stretch main contrib non-free \ 
+    deb-src http://archive.debian.org/debian/ stretch main contrib non-free \ 
+    deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free \ 
+    deb-src http://archive.debian.org/debian-security/ stretch/updates main contrib non-free \ 
+    deb http://archive.debian.org/debian/ stretch-backports main contrib non-free \ 
+    ' > /etc/apt/sources.list && \
+    apt-get update && \
+    apt update && \
+    apt install -y libtinfo5 --allow-remove-essential && \
+    apt install -y ncurses-base
 
 WORKDIR /workspace
 COPY webapi webapi
 
 WORKDIR /workspace/webapi
-RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
-RUN pip install -U setuptools
-RUN pip install -r requirements.txt
+RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple && \
+    pip install -U setuptools && \
+    pip install -r requirements.txt
 COPY --from=buildWeb /workspace/webui/dist/static static
 COPY --from=buildWeb /workspace/webui/dist/index.html static/
 
-- 
Gitee


From 6e985392879327c863a5120c2a9e2c4540c18490 Mon Sep 17 00:00:00 2001
From: Lion Yie <liao046769@gmail.com>
Date: Sun, 22 Oct 2023 10:54:22 +0800
Subject: [PATCH 2/2] chore: Update default configuration Description: Change
 the unified default password to:ADMIN_PASSWORD=fastapivueblog12306

---
 webapi/setting.py                             |  2 +-
 webui/src/views/AdminViews/Login/index.vue    | 42 +++++++------------
 .../src/views/AdminViews/Login/index_new.vue  | 31 +++++++-------
 3 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/webapi/setting.py b/webapi/setting.py
index 4d4eccb..c5bf57c 100644
--- a/webapi/setting.py
+++ b/webapi/setting.py
@@ -15,7 +15,7 @@ class Settings(BaseSettings):
 
     # 默认管理员账号密码等信息
     ADMIN_USERNAME = dotenv_config.get('ADMIN_USERNAME', 'admin')
-    ADMIN_PASSWORD = dotenv_config.get('ADMIN_PASSWORD', '123456')
+    ADMIN_PASSWORD = dotenv_config.get('ADMIN_PASSWORD', 'fastapivueblog12306')
     ADMIN_NICKNAME = dotenv_config.get('ADMIN_NICKNAME', 'admin')
     ADMIN_EMAIL = dotenv_config.get('ADMIN_EMAIL', '1104440778@qq.com')
 
diff --git a/webui/src/views/AdminViews/Login/index.vue b/webui/src/views/AdminViews/Login/index.vue
index a09468f..edea6ad 100644
--- a/webui/src/views/AdminViews/Login/index.vue
+++ b/webui/src/views/AdminViews/Login/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="login-container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
+      label-position="left">
 
       <div class="title-container">
         <h3 class="title">Login Form</h3>
@@ -10,38 +11,23 @@
         <span class="svg-container">
           <svg-icon icon-class="user" />
         </span>
-        <el-input
-          ref="username"
-          v-model="loginForm.username"
-          placeholder="Username"
-          name="username"
-          type="text"
-          tabindex="1"
-          auto-complete="on"
-        />
+        <el-input ref="username" v-model="loginForm.username" placeholder="Username" name="username" type="text"
+          tabindex="1" auto-complete="on" />
       </el-form-item>
 
       <el-form-item prop="password">
         <span class="svg-container">
           <svg-icon icon-class="password" />
         </span>
-        <el-input
-          ref="password"
-          :key="passwordType"
-          v-model="loginForm.password"
-          :type="passwordType"
-          placeholder="Password"
-          name="password"
-          tabindex="2"
-          auto-complete="on"
-          @keyup.enter.native="handleLogin"
-        />
+        <el-input ref="password" :key="passwordType" v-model="loginForm.password" :type="passwordType"
+          placeholder="Password" name="password" tabindex="2" auto-complete="on" @keyup.enter.native="handleLogin" />
         <span class="show-pwd" @click="showPwd">
           <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
         </span>
       </el-form-item>
 
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">Login</el-button>
+      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;"
+        @click.native.prevent="handleLogin">Login</el-button>
 
       <div class="tips">
         <span style="margin-right:20px;">username: admin</span>
@@ -75,7 +61,7 @@ export default {
     return {
       loginForm: {
         username: 'admin',
-        password: '123456'
+        password: 'fastapivueblog12306'
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],
@@ -130,8 +116,8 @@ export default {
 /* 修复input 背景不协调 和光标变色 */
 /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
 
-$bg:#283443;
-$light_gray:#fff;
+$bg: #283443;
+$light_gray: #fff;
 $cursor: #fff;
 
 @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
@@ -174,9 +160,9 @@ $cursor: #fff;
 </style>
 
 <style lang="scss" scoped>
-$bg:#2d3a4b;
-$dark_gray:#889aa4;
-$light_gray:#eee;
+$bg: #2d3a4b;
+$dark_gray: #889aa4;
+$light_gray: #eee;
 
 .login-container {
   min-height: 100%;
diff --git a/webui/src/views/AdminViews/Login/index_new.vue b/webui/src/views/AdminViews/Login/index_new.vue
index 633ad1a..2195bdb 100644
--- a/webui/src/views/AdminViews/Login/index_new.vue
+++ b/webui/src/views/AdminViews/Login/index_new.vue
@@ -9,24 +9,14 @@
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
+        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
+          @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
+        <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
+          @click.native.prevent="handleLogin">
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
@@ -68,7 +58,7 @@ export default {
       backgroundImage: backgroundImage,
       loginForm: {
         username: 'admin',
-        password: '123456'
+        password: 'fastapivueblog12306'
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],
@@ -81,7 +71,7 @@ export default {
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect
       },
       immediate: true
@@ -128,6 +118,7 @@ export default {
   //background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
+
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
@@ -139,32 +130,39 @@ export default {
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+
   .el-input {
     height: 38px;
+
     input {
       height: 38px;
     }
   }
+
   .input-icon {
     height: 39px;
     width: 14px;
     margin-left: 2px;
   }
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
+
 .login-code {
   width: 33%;
   height: 38px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -177,6 +175,7 @@ export default {
   font-size: 12px;
   letter-spacing: 1px;
 }
+
 .login-code-img {
   height: 38px;
 }
-- 
Gitee