图片上传

app-ghs/controllers/AuthController.php

@@ -296,14 +296,14 @@ class AuthController extends PublicController
         $openid = $arr['openid'] ?? '';
         if (empty($openid)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '']);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
         $cacheKey = 'GHS_SHOP_MINI_SESSION_KEY_' . $openid;
         Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
         $admin = AdminService::getByMiniOpenId($openid);
         if (empty($admin)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '']);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
         $adminId = $admin['id'];
         //1没有开店 2已申请待审核 3已开店
@@ -311,12 +311,12 @@ class AuthController extends PublicController
         $currentShopId = $admin['currentShopId'] ?? 0;
         if (empty($currentShopId)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '']);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
         $shopAdmin = ShopAdminClass::getByCondition(['shopId' => $currentShopId, 'adminId' => $adminId], true);
         if (empty($shopAdmin)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '']);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
         $shopAdmin->lastLogin = date("Y-m-d H:i:s");
         $shopAdmin->save();
@@ -335,7 +335,6 @@ class AuthController extends PublicController
         $cacheKey = 'close_book_' . $shopAdminId;
         $hasClose = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
         $showBook = !empty($hasClose) ? 0 : 1;
-
         $cacheKey = 'has_hit_navigate_' . $shopAdminId;
         $hasHit = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
         $hasHitNavigate = !empty($hasHit) ? 1 : 0;

app-hd/controllers/ApplyController.php

@@ -110,10 +110,10 @@ class ApplyController extends BaseController
             if ($saveAuthCode != $authCode) {
                 util::fail('验证码错误');
             }
-
             $ptStyle = Yii::$app->params['ptStyle'];
             $name = $post['adminName'] ?? '';
-            $adminInfo = ['name' => $name, 'mobile' => $mobile, 'style' => $ptStyle,];
+            $miniOpenId = $post['miniOpenId'] ?? '';
+            $adminInfo = ['name' => $name, 'mobile' => $mobile, 'style' => $ptStyle, 'miniOpenId' => $miniOpenId];
             $fromApp = dict::getDict('userSourceGetId', 'app', 'id');
             $admin = AdminService::replaceAdmin($adminInfo, $fromApp);
             $adminId = $admin['id'] ?? 0;

app-hd/controllers/ConsoleController.php

@@ -63,7 +63,7 @@ class ConsoleController extends BaseController
         if ($isMini == 1 && !empty($admin)) {
             $miniOpenId = $admin['miniOpenId'] ?? '';
             if (empty($miniOpenId)) {
-                $notice = [['title' => '帐号绑定小程序，下次自动登录后台', 'action' => '去绑定', 'page' => '/admin/staff/miniAutoLogin']];
+                $notice = [['title' => '帐号绑定微信，下次自动登录后台', 'action' => '去绑定', 'page' => '/admin/staff/miniAutoLogin']];
             }
         }
 

app-hd/controllers/UploadController.php

@@ -16,7 +16,37 @@ use yii\imagine\Image;
 class UploadController extends BaseController
 {
 
-    public $guestAccess = ['save-img'];
+    public $guestAccess = ['save-img', 'save-file'];
+
+    //保存图片上传
+    public function actionSaveFile()
+    {
+        $file = $_FILES['file'];
+        if (!is_uploaded_file($file['tmp_name'])) {
+            util::fail('please upload img');
+        }
+        $sjId = $this->sjId;
+        $month = date("Ym");
+        $date = date("d");
+        $path = dirUtil::getImgUploadDir() . "/{$sjId}/{$month}/{$date}/";
+        if (!file_exists($path)) {
+            //检查是否有该文件夹，如果没有就创建，并给予最高权限
+            mkdir($path, 0700, true);
+        }
+        $preFileName = stringUtil::uniqueFileName();
+        $newFile = $preFileName . ".jpg";
+        $fullPathFile = $path . $newFile;
+        if (move_uploaded_file($file['tmp_name'], $fullPathFile)) {
+            $img = "uploads/{$sjId}/{$month}/{$date}/" . $newFile;
+            oss::uploadImage($img, $fullPathFile);
+            $data = business::formatUploadImg($img);
+            $data['shortUrl'] = $img;
+            $data['smallShortUrl'] = $img . "?x-oss-process=image/resize,l_200";
+            util::success($data, 'ok');
+        } else {
+            util::fail('fail');
+        }
+    }
 
     //上传图片接口
     public function actionSaveImg()

biz-ghs/admin/classes/AdminClass.php

@@ -311,6 +311,7 @@ class AdminClass extends BaseClass
         $subscribe = isset($getAdminInfo['subscribe']) ? $getAdminInfo['subscribe'] : 0;
         $getAdminInfo['subscribe'] = $subscribe;
         $getAdminInfo['avatar'] = '';
+        $getAdminInfo['miniOpenId'] = $getAdminInfo['miniOpenId'] ?? '';
         $getAdminInfo['password'] = $password;
         $getAdminInfo['payPassword'] = '';
         $getAdminInfo['mobile'] = $mobile;