Browse Source

日常开发

admin 7 years ago
parent
commit
85dae040bc

+ 1 - 1
app/Http/Controllers/Api/YzyController.php

@@ -17,7 +17,7 @@ use Log;
 use DB;
 
 /**
- * 有赞云支付
+ * 有赞云支付消息推送接收
  * Class YzyController
  *
  * @package App\Http\Controllers

+ 1 - 1
app/Http/Controllers/RegisterController.php

@@ -72,7 +72,7 @@ class RegisterController extends Controller
             // 校验域名邮箱是否在敏感词中
             $sensitiveWords = $this->sensitiveWords();
             $usernameSuffix = explode('@', $username); // 提取邮箱后缀
-            if (in_array($usernameSuffix[1], $sensitiveWords)) {
+            if (in_array(strtolower($usernameSuffix[1]), $sensitiveWords)) {
                 Session::flash('errorMsg', '邮箱含有敏感词,请重新输入');
 
                 return Redirect::back()->withInput();

+ 1 - 1
app/Http/Controllers/SensitiveWordsController.php

@@ -31,7 +31,7 @@ class SensitiveWordsController extends Controller
         }
 
         $obj = new SensitiveWords();
-        $obj->words = trim($request->input('words'));
+        $obj->words = trim(strtolower($request->input('words')));
         $result = $obj->save();
         if ($result) {
             return Response::json(['status' => 'success', 'data' => '', 'message' => '添加成功']);

+ 1 - 1
resources/views/payment/detail.blade.php

@@ -56,7 +56,7 @@
     <script type="text/javascript">
         // 每2秒查询一次订单状态
         $(document).ready(function(){
-            setInterval("getStatus()", 2000);
+            setInterval("getStatus()", 1000);
         });
 
         // 检查支付单状态

+ 2 - 2
resources/views/user/layouts.blade.php

@@ -41,9 +41,9 @@
         <!-- BEGIN LOGO -->
         <div class="page-logo">
             @if($website_logo)
-                <a href="{{url('/user')}}"><img src="{{$website_logo}}" alt="logo" class="logo-default" style="width:110px; height:20px;"/> </a>
+                <a href="{{url('/')}}"><img src="{{$website_logo}}" alt="logo" class="logo-default" style="width:110px; height:20px;"/> </a>
             @else
-                <a href="{{url('/user')}}"><img src="/assets/images/logo.png" alt="logo" class="logo-default" /> </a>
+                <a href="{{url('/')}}"><img src="/assets/images/logo.png" alt="logo" class="logo-default" /> </a>
             @endif
             <div class="menu-toggler sidebar-toggler">
                 <!-- DOC: Remove the above "hide" to enable the sidebar toggler button on header -->

+ 2 - 2
sql/db.sql

@@ -176,7 +176,7 @@ CREATE TABLE `level` (
 
 
 -- ----------------------------
--- Records of level
+-- Records of `level`
 -- ----------------------------
 INSERT INTO `level` VALUES (1, '1', '青铜', '2017-10-26 15:56:52', '2017-10-26 15:38:58');
 INSERT INTO `level` VALUES (2, '2', '白银', '2017-10-26 15:57:30', '2017-10-26 12:37:51');
@@ -661,7 +661,7 @@ CREATE TABLE `sensitive_words` (
 
 
 -- ----------------------------
--- Records of sensitive_words
+-- Records of label
 -- ----------------------------
 INSERT INTO `sensitive_words` (`words`) VALUES ('chacuo.com');
 INSERT INTO `sensitive_words` (`words`) VALUES ('chacuo.net');