整理migration

app/Models/ImNotice.php

@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use Phalcon\Mvc\Model\Behavior\SoftDelete;
-
 class ImNotice extends Model
 {
 
@@ -59,13 +57,6 @@ class ImNotice extends Model
      */
     public $item_info = '';
 
-    /**
-     * 优先级
-     *
-     * @var int
-     */
-    public $priority = 0;
-
     /**
      * 阅读标识
      *
@@ -73,13 +64,6 @@ class ImNotice extends Model
      */
     public $viewed = 0;
 
-    /**
-     * 删除标识
-     *
-     * @var int
-     */
-    public $deleted = 0;
-
     /**
      * 创建时间
      *
@@ -99,18 +83,6 @@ class ImNotice extends Model
         return 'kg_im_notice';
     }
 
-    public function initialize()
-    {
-        parent::initialize();
-
-        $this->addBehavior(
-            new SoftDelete([
-                'field' => 'deleted',
-                'value' => 1,
-            ])
-        );
-    }
-
     public function beforeCreate()
     {
         if (!empty($this->item_info)) {

app/Repos/Connect.php

@@ -28,10 +28,6 @@ class Connect extends Repository
             $query->andWhere('provider = :provider:', ['provider' => $where['provider']]);
         }
 
-        if (isset($where['deleted'])) {
-            $query->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
-        }
-
         $query->orderBy('id DESC');
 
         return $query->execute();

app/Repos/CourseFavorite.php

@@ -25,10 +25,6 @@ class CourseFavorite extends Repository
             $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
         }
 
-        if (isset($where['deleted'])) {
-            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
-        }
-
         switch ($sort) {
             default:
                 $orderBy = 'id DESC';

app/Repos/ImFriendUser.php

@@ -25,10 +25,6 @@ class ImFriendUser extends Repository
             $builder->andWhere('friend_id = :friend_id:', ['friend_id' => $where['friend_id']]);
         }
 
-        if (isset($where['blocked'])) {
-            $builder->andWhere('blocked = :blocked:', ['blocked' => $where['blocked']]);
-        }
-
         switch ($sort) {
             case 'oldest':
                 $orderBy = 'id ASC';

app/Repos/ImNotice.php

@@ -27,10 +27,6 @@ class ImNotice extends Repository
             $builder->andWhere('receiver_id = :receiver_id:', ['receiver_id' => $where['receiver_id']]);
         }
 
-        if (isset($where['deleted'])) {
-            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
-        }
-
         switch ($sort) {
             case 'oldest':
                 $orderBy = 'id ASC';

app/Repos/UserSession.php

@@ -17,7 +17,6 @@ class UserSession extends Repository
     {
         return UserSessionModel::query()
             ->where('user_id = :user_id:', ['user_id' => $userId])
-            ->andWhere('deleted = 0')
             ->execute();
     }
 

app/Repos/UserToken.php

@@ -17,7 +17,6 @@ class UserToken extends Repository
     {
         return UserTokenModel::query()
             ->where('user_id = :user_id:', ['user_id' => $userId])
-            ->andWhere('deleted = 0')
             ->execute();
     }
 

db/migrations/20201004095647_create_online_table.php

@@ -81,35 +81,6 @@ class CreateOnlineTable extends Phinx\Migration\AbstractMigration
                 'unique' => false,
             ])
             ->create();
-        $this->table('kg_task', [
-            'id' => false,
-            'primary_key' => ['id'],
-            'engine' => 'InnoDB',
-            'encoding' => 'utf8mb4',
-            'collation' => 'utf8mb4_general_ci',
-            'comment' => '',
-            'row_format' => 'DYNAMIC',
-        ])
-            ->save();
-        $this->table('kg_trade', [
-            'id' => false,
-            'primary_key' => ['id'],
-            'engine' => 'InnoDB',
-            'encoding' => 'utf8mb4',
-            'collation' => 'utf8mb4_general_ci',
-            'comment' => '主键编号',
-            'row_format' => 'DYNAMIC',
-        ])
-            ->changeColumn('channel_sn', 'string', [
-                'null' => false,
-                'default' => '',
-                'limit' => 64,
-                'collation' => 'utf8mb4_general_ci',
-                'encoding' => 'utf8mb4',
-                'comment' => '平台序号',
-                'after' => 'channel',
-            ])
-            ->save();
     }
 
 }

db/migrations/20201205112717_insert_oauth_setting_data.php

@@ -80,9 +80,20 @@ final class InsertOauthSettingData extends AbstractMigration
 
     public function down()
     {
-        $this->execute("DELETE FROM kg_setting WHERE section = 'oauth.qq'");
+        $this->getQueryBuilder()
-        $this->execute("DELETE FROM kg_setting WHERE section = 'oauth.weixin'");
+            ->delete('kg_setting')
-        $this->execute("DELETE FROM kg_setting WHERE section = 'oauth.weibo'");
+            ->where(['section' => 'oauth.qq'])
+            ->execute();
+
+        $this->getQueryBuilder()
+            ->delete('kg_setting')
+            ->where(['section' => 'oauth.weixin'])
+            ->execute();
+
+        $this->getQueryBuilder()
+            ->delete('kg_setting')
+            ->where(['section' => 'oauth.weibo'])
+            ->execute();
     }
 
 }

db/migrations/20201212112717_data_202012121830.php

@@ -60,30 +60,27 @@ final class Data202012121830 extends AbstractMigration
 
     protected function updateSmsTemplate()
     {
-        $table = 'kg_setting';
-
-        $where = ['section' => 'sms', 'item_key' => 'template'];
-
         $setting = $this->getQueryBuilder()
             ->select('*')
-            ->from($table)
+            ->from('kg_setting')
-            ->where($where)
+            ->where(['section' => 'sms', 'item_key' => 'template'])
-            ->execute()
+            ->execute()->fetch('assoc');
-            ->fetch('assoc');
+
+        if (!$setting) return;
 
         $itemValue = json_decode($setting['item_value'], true);
 
         $newItemValue = json_encode([
-            'verify' => $itemValue['verify'],
+            'verify' => $itemValue['verify'] ?? '',
-            'order_finish' => $itemValue['order'],
+            'order_finish' => $itemValue['order'] ?? '',
-            'refund_finish' => $itemValue['refund'],
+            'refund_finish' => $itemValue['refund'] ?? '',
-            'live_begin' => $itemValue['live'],
+            'live_begin' => $itemValue['live'] ?? '',
-            'consult_reply' => '',
+            'consult_reply' => $itemValue['consult'] ?? '',
         ]);
 
         $this->getQueryBuilder()
-            ->update($table)
+            ->update('kg_setting')
-            ->where($where)
+            ->where(['id' => $setting['id']])
             ->set('item_value', $newItemValue)
             ->execute();
     }

db/migrations/20210228035113_data_202102280351.php

@@ -13,27 +13,24 @@ final class Data202102280351 extends AbstractMigration
 
     protected function updateSmsNoticeTemplate()
     {
-        $table = 'kg_setting';
-
-        $where = [
-            'section' => 'sms',
-            'item_key' => 'template',
-        ];
-
         $setting = $this->getQueryBuilder()
             ->select('*')
-            ->from($table)
+            ->from('kg_setting')
-            ->where($where)
+            ->where(['section' => 'sms', 'item_key' => 'template'])
-            ->execute()
+            ->execute()->fetch('assoc');
-            ->fetch('assoc');
+
+        if (!$setting) return;
 
         $itemValue = json_decode($setting['item_value'], true);
 
         $newItemValue = [];
 
+        /**
+         * 更改数据结构
+         */
         foreach ($itemValue as $key => $value) {
-            $newItemValue[$key]['id'] = $value;
+            $newItemValue[$key]['id'] = $value['id'] ?? $value;
-            $newItemValue[$key]['enabled'] = 1;
+            $newItemValue[$key]['enabled'] = $value['enabled'] ?? 1;
         }
 
         /**
@@ -44,35 +41,30 @@ final class Data202102280351 extends AbstractMigration
         $itemValue = json_encode($newItemValue);
 
         $this->getQueryBuilder()
-            ->update($table)
+            ->update('kg_setting')
-            ->where($where)
+            ->where(['id' => $setting['id']])
             ->set('item_value', $itemValue)
             ->execute();
     }
 
     protected function updateWechatNoticeTemplate()
     {
-        $table = 'kg_setting';
-
-        $where = [
-            'section' => 'wechat.oa',
-            'item_key' => 'notice_template',
-        ];
-
         $setting = $this->getQueryBuilder()
             ->select('*')
-            ->from($table)
+            ->from('kg_setting')
-            ->where($where)
+            ->where(['section' => 'wechat.oa', 'item_key' => 'notice_template'])
-            ->execute()
+            ->execute()->fetch('assoc');
-            ->fetch('assoc');
 
         $itemValue = json_decode($setting['item_value'], true);
 
         $newItemValue = [];
 
+        /**
+         * 更改数据结构
+         */
         foreach ($itemValue as $key => $value) {
-            $newItemValue[$key]['id'] = $value;
+            $newItemValue[$key]['id'] = $value['id'] ?? $value;
-            $newItemValue[$key]['enabled'] = 1;
+            $newItemValue[$key]['enabled'] = $value['enabled'] ?? 1;
         }
 
         /**
@@ -83,8 +75,8 @@ final class Data202102280351 extends AbstractMigration
         $itemValue = json_encode($newItemValue);
 
         $this->getQueryBuilder()
-            ->update($table)
+            ->update('kg_setting')
-            ->where($where)
+            ->where(['id' => $setting['id']])
             ->set('item_value', $itemValue)
             ->execute();
     }

db/migrations/20210302021013_schema_202103021010.php

@@ -33,6 +33,12 @@ class Schema202103021010 extends Phinx\Migration\AbstractMigration
             $table->removeColumn('deleted')->save();
         }
 
+        $table = $this->table('kg_im_notice');
+
+        if ($table->hasColumn('deleted')) {
+            $table->removeColumn('deleted')->save();
+        }
+
         $table = $this->table('kg_learning');
 
         if ($table->hasColumn('deleted')) {