diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index ee56b116..42074142 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -37,8 +37,7 @@ class SystemController extends AbstractController
             if (env("SYSTEM_SETTING") == 'disabled') {
                 return Base::retError('当前环境禁止修改');
             }
-            $user = User::auth();
-            $user->isAdmin();
+            User::auth('admin');
             $all = Request::input();
             foreach ($all AS $key => $value) {
                 if (!in_array($key, ['reg', 'login_code'])) {
@@ -56,6 +55,30 @@ class SystemController extends AbstractController
         return Base::retSuccess('success', $setting ?: json_decode('{}'));
     }
 
+    /**
+     * @api {get} api/system/demo          获取演示账号
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName demo
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function demo()
+    {
+        $demo_account = env('DEMO_ACCOUNT');
+        $demo_password = env('DEMO_PASSWORD');
+        if (empty($demo_account) || empty($demo_password)) {
+            return Base::retError('No demo account');
+        }
+        return Base::retSuccess('success', [
+            'account' => $demo_account,
+            'password' => $demo_password,
+        ]);
+    }
+
     /**
      * @api {post} api/system/priority          02. 获取优先级、保存优先级
      *
@@ -73,8 +96,7 @@ class SystemController extends AbstractController
     {
         $type = trim(Request::input('type'));
         if ($type == 'save') {
-            $user = User::auth();
-            $user->isAdmin();
+            User::auth('admin');
             $list = Base::getPostValue('list');
             $array = [];
             if (empty($list) || !is_array($list)) {
diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index d2391db1..694506bc 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -9,10 +9,10 @@
                 <div v-if="loginType=='reg'" class="login-subtitle">{{$L('输入您的信息以创建帐户。')}}</div>
                 <div v-else class="login-subtitle">{{$L('输入您的凭证以访问您的帐户。')}}</div>
 
-                <div class="login-testuser">
-                    {{$L('演示账号')}}: <em>admin@dootask.com</em>&nbsp;&nbsp;
-                    {{$L('密码')}}: <em>123456</em>
-                </div>
+                <ul v-if="demoAccount.account" class="login-demo">
+                    <li>{{$L('演示账号')}}: <em>{{demoAccount.account}}</em></li>
+                    <li>{{$L('密码')}}: <em>{{demoAccount.password}}</em></li>
+                </ul>
 
                 <div class="login-input">
                     <Input v-model="email" prefix="ios-mail-outline" :placeholder="$L('输入您的电子邮件')" size="large" @on-enter="onLogin" @on-blur="onBlur" />
@@ -64,10 +64,13 @@ export default {
             password2: '',
             code: '',
 
-            downList: []
+            demoAccount: {},
+
+            downList: [],
         }
     },
     mounted() {
+        this.getDemoAccount();
         if (!this.isElectron) {
             this.getAppInfo();
         }
@@ -78,6 +81,20 @@ export default {
         }
     },
     methods: {
+        getDemoAccount() {
+            this.$store.dispatch("call", {
+                url: 'system/demo',
+            }).then(({data}) => {
+                this.demoAccount = data;
+                if (data.account) {
+                    this.email = data.account;
+                    this.password = data.password;
+                }
+            }).catch(() => {
+                this.demoAccount = {};
+            });
+        },
+
         getAppInfo() {
             this.$store.dispatch("call", {
                 url: 'system/get/appinfo',
diff --git a/resources/assets/sass/pages/page-login.scss b/resources/assets/sass/pages/page-login.scss
index de51b94a..bc0b5920 100644
--- a/resources/assets/sass/pages/page-login.scss
+++ b/resources/assets/sass/pages/page-login.scss
@@ -42,18 +42,25 @@
                 padding: 0 12px;
                 color: #AAAAAA;
             }
-            .login-testuser {
+            .login-demo {
                 margin-top: 30px;
                 margin-bottom: -36px;
-                //display: flex;
-                display: none;
+                display: flex;
                 align-items: center;
                 justify-content: center;
                 color: #888888;
-                > em {
-                    font-style: normal;
-                    text-decoration: underline;
-                    margin-left: 2px;
+                > li {
+                    list-style: none;
+                    padding: 0;
+                    margin-right: 6px;
+                    &:last-child {
+                        margin-right: 0;
+                    }
+                    > em {
+                        font-style: normal;
+                        text-decoration: underline;
+                        margin-left: 2px;
+                    }
                 }
             }
             .login-input {