From 7a4d05bbd951b9eb7c37361c3c36ee28a3c70a01 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 6 Jul 2023 18:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=AD=E8=A8=80=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化cdnurl计算
---
 application/admin/lang/zh-cn.php       | 2 ++
 application/admin/lang/zh-cn/addon.php | 2 --
 application/index/controller/User.php  | 1 -
 application/index/view/user/index.html | 6 ------
 public/assets/js/fast.js               | 4 ++--
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php
index 3da826b3..f7420df2 100755
--- a/application/admin/lang/zh-cn.php
+++ b/application/admin/lang/zh-cn.php
@@ -4,6 +4,8 @@ return [
     'User id'                                               => '会员ID',
     'Username'                                              => '用户名',
     'Nickname'                                              => '昵称',
+    'Mobile'                                                => '手机',
+    'Email'                                                 => '邮箱',
     'Password'                                              => '密码',
     'Sign up'                                               => '注 册',
     'Sign in'                                               => '登 录',
diff --git a/application/admin/lang/zh-cn/addon.php b/application/admin/lang/zh-cn/addon.php
index 6c999d2a..2a84ba99 100755
--- a/application/admin/lang/zh-cn/addon.php
+++ b/application/admin/lang/zh-cn/addon.php
@@ -17,8 +17,6 @@ return [
     'Online store'                                            => '在线商店',
     'Local addon'                                             => '本地插件',
     'Conflict tips'                                           => '此插件中发现和现有系统中部分文件发现冲突！以下文件将会被影响，请备份好相关文件后再继续操作',
-    'Login tips'                                              => '此处登录账号为<a href="https://www.fastadmin.net" target="_blank">FastAdmin官网账号</a>',
-    'Logined tips'                                            => '你好！%s<br />当前你已经登录，将同步保存你的购买记录',
     'Pay tips'                                                => '扫码支付后如果仍然无法安装，请不要重复支付，请稍后再重试安装！',
     'Pay successful tips'                                     => '购买成功！请点击继续安装按钮完成安装！',
     'Pay click tips'                                          => '请点击这里在新窗口中进行支付！',
diff --git a/application/index/controller/User.php b/application/index/controller/User.php
index e200c048..5b4a3e28 100644
--- a/application/index/controller/User.php
+++ b/application/index/controller/User.php
@@ -251,7 +251,6 @@ class User extends Frontend
             $result = $validate->check($data);
             if (!$result) {
                 $this->error(__($validate->getError()), null, ['token' => $this->request->token()]);
-                return false;
             }
 
             $ret = $this->auth->changepwd($newpassword, $oldpassword);
diff --git a/application/index/view/user/index.html b/application/index/view/user/index.html
index c2ddc22a..e3c8da36 100755
--- a/application/index/view/user/index.html
+++ b/application/index/view/user/index.html
@@ -51,12 +51,6 @@
                                             <a href="javascript:;" class="viewscore">{$user.score}</a>
                                         </div>
                                     </div>
-                                    <div class="row">
-                                        <div class="col-xs-4 col-md-2">{:__('Successions')}</div>
-                                        <div class="col-xs-8 col-md-4">{$user.successions} {:__('Day')}</div>
-                                        <div class="col-xs-4 col-md-2">{:__('Maxsuccessions')}</div>
-                                        <div class="col-xs-8 col-md-4">{$user.maxsuccessions} {:__('Day')}</div>
-                                    </div>
                                     <div class="row">
                                         <div class="col-xs-4 col-md-2">{:__('Logintime')}</div>
                                         <div class="col-xs-8 col-md-4">{$user.logintime|date="Y-m-d H:i:s",###}</div>
diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js
index 88f8b573..29633a75 100644
--- a/public/assets/js/fast.js
+++ b/public/assets/js/fast.js
@@ -103,8 +103,8 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
             //获取修复后可访问的cdn链接
             cdnurl: function (url, domain) {
                 var rule = new RegExp("^((?:[a-z]+:)?\\/\\/|data:image\\/)", "i");
-                if(typeof domain === 'undefined' || domain === true){
-                    var cdnurl = Config.upload.cdnurl;
+                var cdnurl = Config.upload.cdnurl;
+                if (typeof domain === 'undefined' || domain === true || cdnurl.indexOf("/") === 0) {
                     url = rule.test(url) || (cdnurl && url.indexOf(cdnurl) === 0) ? url : cdnurl + url;
                 }
                 if (domain && !rule.test(url)) {