From 7b985010cee03cf8cdb7e8753c7ac223d9494eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 15 Mar 2017 12:35:00 +0800
Subject: [PATCH] =?UTF-8?q?[dev]=E6=9B=B4=E6=96=B0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Index.php  | 5 +++--
 application/admin/model/Node.php        | 2 +-
 application/admin/view/config.sms.html  | 8 ++++----
 application/admin/view/login.index.html | 2 +-
 application/admin/view/user.form.html   | 5 +++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index cb84f624b..5a82a6247 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -72,11 +72,12 @@ class Index extends BasicAdmin {
         $_version = Db::query('select version() as ver');
         $version = array_pop($_version);
         $this->assign('mysql_ver', $version['ver']);
-        if (session('user.username') === 'admin' && session('user.password') === '662af1cd1976f09a9f8cecc868ccc0a2') {
+        if (session('user.username') === 'admin' && session('user.password') === '21232f297a57a5a743894a0e4a801fc3') {
+            $url = url('admin/index/pass') . '?id=' . session('user.id');
             $alert = [
                 'type'    => 'danger',
                 'title'   => '安全提示',
-                'content' => '超级管理员默认密码未修改，建议马上<a href="javascript:void(0)">修改</a>！'
+                'content' => "超级管理员默认密码未修改，建议马上<a href='javascript:void(0)' data-modal='{$url}'>修改</a>！"
             ];
             $this->assign('alert', $alert);
             $this->assign('title', '后台首页');
diff --git a/application/admin/model/Node.php b/application/admin/model/Node.php
index 214c1fc08..832107d13 100644
--- a/application/admin/model/Node.php
+++ b/application/admin/model/Node.php
@@ -37,7 +37,7 @@ class Node {
             $alias["{$vo['node']}"] = $vo;
         }
         foreach (self::getNodeTree(APP_PATH) as $thr) {
-            if (stripos($thr, 'admin/plugs') === 0 && stripos($thr, 'admin/index')) {
+            if (stripos($thr, 'admin/plugs') === 0 || stripos($thr, 'admin/login') === 0 || stripos($thr, 'admin/index') === 0 || stripos($thr, 'index') === 0 || stripos($thr, 'store/api') === 0) {
                 continue;
             }
             $tmp = explode('/', $thr);
diff --git a/application/admin/view/config.sms.html b/application/admin/view/config.sms.html
index 6d8e193f4..442ac6366 100644
--- a/application/admin/view/config.sms.html
+++ b/application/admin/view/config.sms.html
@@ -33,16 +33,16 @@
                     </div>
 
                     <div class="layui-form-item layui-box" data-sms-type="ali">
-                        <label class="layui-form-label">accessKey</label>
+                        <label class="layui-form-label">AccessKey</label>
                         <div class="layui-input-block">
-                            <input type="text" name="sms_ali_key" required="required" title="请输入accessKey" placeholder="请输入accessKey" value="{:sysconf('sms_ali_key')}" class="layui-input">
+                            <input type="text" name="sms_ali_key" required="required" title="请输入AccessKey" placeholder="请输入AccessKey" value="{:sysconf('sms_ali_key')}" class="layui-input">
                         </div>
                     </div>
 
                     <div class="layui-form-item layui-box" data-sms-type="ali">
-                        <label class="layui-form-label">accessSecret</label>
+                        <label class="layui-form-label">AccessSecret</label>
                         <div class="layui-input-block">
-                            <input type="text" name="sms_ali_secret" required="required" title="请输入accessSecret" placeholder="请输入accessSecret" value="{:sysconf('sms_ali_secret')}" class="layui-input">
+                            <input type="text" name="sms_ali_secret" required="required" title="请输入AccessSecret" placeholder="请输入AccessSecret" value="{:sysconf('sms_ali_secret')}" class="layui-input">
                         </div>
                     </div>
 
diff --git a/application/admin/view/login.index.html b/application/admin/view/login.index.html
index 370abf7ef..0116ff5fa 100644
--- a/application/admin/view/login.index.html
+++ b/application/admin/view/login.index.html
@@ -61,7 +61,7 @@
                            name="password"
                            class="login-input password"
                            autocomplete="off"
-                           value="Test12345"
+                           value="admin"
                            placeholder="请输入密码"/>
                 </li>
                 <li class="text-center">
diff --git a/application/admin/view/user.form.html b/application/admin/view/user.form.html
index f13883138..58074f9f1 100644
--- a/application/admin/view/user.form.html
+++ b/application/admin/view/user.form.html
@@ -3,7 +3,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">用户账号</label>
         <div class="layui-input-block">
-            {if $vo and $vo.username}
+            {if $vo and isset($vo.username)}
             <input type="text" readonly="" disabled="" name="username" value='{$vo.username|default=""}' required="required" title="请输入用户名称" placeholder="请输入用户名称" class="layui-input disabled">
             {else/}
             <input type="text" name="username" value='{$vo.username|default=""}' required="required" title="请输入用户名称" placeholder="请输入用户名称" class="layui-input">
@@ -21,7 +21,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">联系邮箱</label>
         <div class="layui-input-block">
-            <input type="text" name="mail" value='{$vo.mail|default=""}' title="请输入联系邮箱" placeholder="请输入联系邮箱" class="layui-input">
+            <input type="text" name="mail" pattern="^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$" value='{$vo.mail|default=""}' title="请输入联系邮箱" placeholder="请输入联系邮箱" class="layui-input">
         </div>
     </div>
 
@@ -55,5 +55,6 @@
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
     </div>
+
     <script>window.form.render();</script>
 </form>