commit

.idea/workspace.xml

@@ -5,58 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="9df7b838-09db-466a-bed4-3e1ac8c3624d" name="变更" comment="commit">
-      <change beforePath="$PROJECT_DIR$/.idea/newQudou.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/newQudou.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/admin/controller/setting/SystemConfig.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/setting/SystemConfig.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/api/controller/AuthController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/AuthController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/cache/a9/939d920c0fa6b4fe0b897fb019672a.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/cache/a9/939d920c0fa6b4fe0b897fb019672a.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/autoload.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/autoload.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/ClassLoader.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/ClassLoader.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/LICENSE" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/autoload_classmap.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_classmap.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/autoload_files.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_files.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/autoload_namespaces.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_namespaces.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/autoload_real.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_real.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/autoload_static.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_static.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/composer/installed.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/installed.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/services.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/services.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/LICENSE" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/composer.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/CacheManager.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/cache/CacheItem.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/cache/Driver.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/cache/TagSet.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/cache/driver/File.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/cache/driver/Memcache.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/cache/driver/Memcached.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/cache/driver/Redis.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/cache/driver/Wincache.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/exception/InvalidArgumentException.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-cache/src/facade/Cache.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/.travis.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/LICENSE" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/composer.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/phpunit.xml.dist" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/src/Container.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/src/Facade.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/src/exception/ClassNotFoundException.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/tests/ContainerTest.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-container/tests/bootstrap.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-log/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-log/LICENSE" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-log/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-log/composer.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-log/src/LogManager.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-log/src/facade/Log.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-log/src/log/driver/File.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/topthink/think-log/src/log/driver/Socket.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/api/controller/auction/AuctionProductController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/auction/AuctionProductController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/api/controller/user/UserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/user/UserController.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -234,7 +187,20 @@
       <workItem from="1660352180381" duration="1200000" />
       <workItem from="1660523786913" duration="457000" />
       <workItem from="1660527697667" duration="5323000" />
-      <workItem from="1660607533116" duration="837000" />
+      <workItem from="1660607533116" duration="1898000" />
+      <workItem from="1660696340225" duration="675000" />
+      <workItem from="1660783122477" duration="1183000" />
+      <workItem from="1660869625052" duration="1187000" />
+      <workItem from="1661128518115" duration="7316000" />
+      <workItem from="1661301059670" duration="3080000" />
+      <workItem from="1661388144447" duration="602000" />
+      <workItem from="1661473982865" duration="2244000" />
+      <workItem from="1661560069314" duration="1831000" />
+      <workItem from="1661749639393" duration="3090000" />
+      <workItem from="1661905981468" duration="2371000" />
+      <workItem from="1661992349251" duration="1809000" />
+      <workItem from="1662446711007" duration="679000" />
+      <workItem from="1662511039997" duration="548000" />
     </task>
     <task id="LOCAL-00001" summary="commit">
       <created>1655962607195</created>
@@ -355,7 +321,14 @@
       <option name="project" value="LOCAL" />
       <updated>1660527746592</updated>
     </task>
-    <option name="localTasksCounter" value="18" />
+    <task id="LOCAL-00018" summary="commit">
+      <created>1660627670433</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1660627670433</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

app/admin/controller/setting/SystemConfig.php

@@ -368,7 +368,7 @@ class SystemConfig extends AuthController
     public function file_upload()
     {
         $upload = new Upload('local');
-        $res = $upload->to('config/file')->validate()->move($this->request->param('file', 'file'));
+        $res = $upload->to('config/file')->move($this->request->param('file', 'file'));
         if ($res === false) return Json::fail($upload->getError());
         return Json::successful('上传成功!', ['filePath' => $res->filePath]);
     }

app/api/controller/AuthController.php

@@ -242,7 +242,7 @@ class AuthController
         try {
             // 复制代码运行请自行打印 API 的返回值
             $res = $client->sendSmsWithOptions($addShortUrlRequest,$runtime);
-
+            
             if($res->body->code == 'OK'){
                 return 'ok';
             }else{

app/api/controller/auction/AuctionProductController.php

@@ -250,7 +250,6 @@ class AuctionProductController
 
         try {
             Db::startTrans();
-            $order->save();
             $product = AuctionProduct::find($order['product_id']);
             if (!$product) return app('json')->fail('数据不存在');
             $uid = $product['uid']; // 所属人id
@@ -261,6 +260,7 @@ class AuctionProductController
             $product['is_show'] = 0;
             $res = $product->save();
             AuctionTime::where([['product_id', '=', $product['id']]])->delete();
+            AuctionOrder::where('order_id', $data['order_id'])->update(['status' => 3]);
             AuctionOrder::return($order['id']); // 买家
             Db::commit();
             return app('json')->successful('完成');

app/api/controller/user/UserController.php

@@ -5,6 +5,7 @@ namespace app\api\controller\user;
 use app\http\validates\user\AddressValidate;
 use app\models\auction\AuctionOrder;
 use app\models\system\SystemCity;
+use crmeb\services\CacheService;
 use think\exception\ValidateException;
 use app\Request;
 use app\models\user\UserLevel;
@@ -703,7 +704,9 @@ class UserController
         $data = UtilService::postMore([
             ['type'],
             ['payment'],
-            ['old_payment']
+            ['old_payment'],
+            ['phone'],
+            ['captcha']
         ], $request);
         if (!$data['type']) return app('json')->fail('类型不能为空');
         if (!$data['payment']) return app('json')->fail('密码不能为空');
@@ -712,8 +715,14 @@ class UserController
         $validate->rule('payment' , 'number');
         $validate->message(['payment.number' => '密码必须为数字']);
         if (!$validate->check($data)) return app('json')->fail($validate->getError());
-
         $user = User::where('uid', $request->uid())->find();
+        if ($data['phone'] != $user['phone']) return app('json')->fail('手机号输入错误');
+        $verifyCode = CacheService::get('code_' . $data['phone']);
+        if (!$verifyCode)
+            return app('json')->fail('请先获取验证码');
+        $verifyCode = substr($verifyCode, 0, 6);
+        if ($verifyCode != $data['captcha'])
+            return app('json')->fail('验证码错误');
         if ($data['type'] == 1){
             $user['payment'] = md5($data['payment']);
             $res = $user->save();
@@ -723,7 +732,7 @@ class UserController
                 return app('json')->fail('失败');
             }
         }elseif ($data['type'] == 2){
-            if (md5($data['old_payment']) != $user['payment']) return app('json')->fail('旧密码错误');
+//            if (md5($data['old_payment']) != $user['payment']) return app('json')->fail('旧密码错误');
             $user['payment'] = md5($data['payment']);
             if ($user->save()){
                 return app('json')->success('成功');