更新版本到2.3.130 具体更新内容看版本更新日志

Author: jianyan74

addons/RfDevTool/backend/controllers/MigrateController.php

@@ -30,8 +30,12 @@ public function actionIndex()
         $addonList = Yii::$app->services->addons->getList();
 
         if ($model->load(Yii::$app->request->post())) {
-            $path = Yii::getAlias('@addons')  . '/' . $model->addon . '/console/migrations/';
-            FileHelper::mkdirs($path);
+            if ($model->addon == 0) {
+                $path = Yii::getAlias('@root')  . '/console/migrations/';
+            } else {
+                $path = Yii::getAlias('@addons')  . '/' . $model->addon . '/console/migrations/';
+                FileHelper::mkdirs($path);
+            }
 
             /** @var MigrateCreate $migrate */
             $migrate = Yii::createObject([
@@ -48,7 +52,7 @@ public function actionIndex()
 
         return $this->render($this->action->id, [
             'tableList' => ArrayHelper::map($tableList, 'name', 'name'),
-            'addonList' => ArrayHelper::map($addonList, 'name', 'title'),
+            'addonList' => ArrayHelper::merge(['0' => '默认系统'], ArrayHelper::map($addonList, 'name', 'title')),
             'model' => $model
         ]);
     }

addons/RfDevTool/backend/controllers/ProvinceJobController.php

@@ -125,7 +125,7 @@ protected function other()
                     'title' => $datum,
                     'level' => 1,
                     'pid' => 0,
-                    'tree' => 'tr_0',
+                    'tree' => 'tr_0 ',
                 ];
             } elseif ($key > $Hongkong && $key < $Macao) {
                 // 香港
@@ -136,15 +136,15 @@ protected function other()
                             'title' => $datum,
                             'level' => 2,
                             'pid' => $Hongkong,
-                            'tree' => 'tr_0 tr_' . $Hongkong,
+                            'tree' => "tr_0 tr_$Hongkong ",
                         ];
                     } elseif ($key < $i + 100 && $key > $i) {
                         $data[] = [
                             'id' => $key,
                             'title' => $datum,
                             'level' => 3,
                             'pid' => $i,
-                            'tree' => 'tr_0 tr_' . $Hongkong . ' tr_' . $i,
+                            'tree' => "tr_0 tr_$Hongkong tr_$i ",
                         ];
                     }
                 }
@@ -158,15 +158,15 @@ protected function other()
                             'title' => $datum,
                             'level' => 2,
                             'pid' => $Macao,
-                            'tree' => 'tr_0 tr_' . $Macao,
+                            'tree' => "tr_0 tr_$Macao ",
                         ];
                     } elseif ($key < $i + 100 && $key > $i) {
                         $data[] = [
                             'id' => $key,
                             'title' => $datum,
                             'level' => 3,
                             'pid' => $i,
-                            'tree' => 'tr_0 tr_' . $Macao . ' tr_' . $i,
+                            'tree' => "tr_0 tr_$Macao tr_$i ",
                         ];
                     }
                 }
@@ -180,15 +180,15 @@ protected function other()
                             'title' => $datum,
                             'level' => 2,
                             'pid' => $Taiwan,
-                            'tree' => 'tr_0 tr_' . $Taiwan,
+                            'tree' => "tr_0 tr_$Taiwan ",
                         ];
                     } elseif ($key < $i + 100 && $key > $i) {
                         $data[] = [
                             'id' => $key,
                             'title' => $datum,
                             'level' => 3,
                             'pid' => $i,
-                            'tree' => 'tr_0 tr_' . $Taiwan . ' tr_' . $i,
+                            'tree' => "tr_0 tr_$Taiwan tr_$i ",
                         ];
                     }
                 }

addons/RfDevTool/backend/views/migrate/index.php

@@ -23,7 +23,7 @@
             <?php $form = ActiveForm::begin([]); ?>
             <div class="box-body">
                 <div class="col-sm-12">
-                    <?= $form->field($model, 'addon')->dropDownList($addonList)->hint('生成的数据迁移文件在 插件/console/migrations/ 下'); ?>
+                    <?= $form->field($model, 'addon')->dropDownList($addonList)->hint('默认在 根目录/console/migrations/, 选择插件则生成的数据迁移文件在 插件/console/migrations/'); ?>
                     <?= $form->field($model, 'tables')->checkboxList($tableList); ?>
                 </div>
             </div>

addons/RfDevTool/common/models/MigrateForm.php

@@ -32,7 +32,7 @@ public function attributeLabels()
     {
         return [
             'tables' => '表名',
-            'addon' => '插件',
+            'addon' => '系统/插件',
         ];
     }
 }

addons/RfDevTool/common/queues/ProvinceChildJob.php

@@ -129,7 +129,7 @@ public function execute($queue)
             $datum['id'] = $datum['code'][1] . $codeSuffix;
             $datum['level'] = $this->parent['level'] + 1;
             $datum['pid'] = $this->parent['id'];
-            $datum['tree'] = $this->parent['tree'] . ' tr_' . $datum['pid'];
+            $datum['tree'] = $this->parent['tree'] . 'tr_' . $datum['pid'] . ' ';
             $datum['chlidPrefix'] = $datum['code'][0];
             $datum['chlidLink'] = $this->baseUrl . $datum['chlidPrefix'] . '/' . $datum['code'][1] . '.html';
 

addons/RfDevTool/common/queues/ProvinceJob.php

@@ -60,7 +60,7 @@ public function execute($queue)
             $datum['code'] = explode('/', $code);
             $datum['id'] = $datum['code'][0] . '0000';
             $datum['pid'] = 0;
-            $datum['tree'] = 'tr_0';
+            $datum['tree'] = 'tr_0 ';
             $datum['level'] = 1;
             $datum['chlidPrefix'] = $datum['code'][0];
             $datum['chlidLink'] = $this->baseUrl . $datum['link'];

addons/RfExample/backend/controllers/ElasticSearchController.php

@@ -38,7 +38,7 @@ public function init()
                 ['http_address' => '127.0.0.1:9200'],
                 // ['http_address' => '192.168.0.210:9200'],
             ],
-            'autodetectCluster' => false,
+            'autodetectCluster' => false
         ]);
 
         // 更新字段，每次修改字段都需执行该方法

api/controllers/ActiveController.php

@@ -63,7 +63,7 @@ public function behaviors()
         // 进行签名验证
         $behaviors['signTokenValidate'] = [
             'class' => HttpSignAuth::class,
-            'switch' => Yii::$app->params['user.httpSignValidity'] // 验证开启状态
+            'enabled' => Yii::$app->params['user.httpSignValidity'] // 验证开启状态
         ];
 
         $behaviors['authenticator'] = [

backend/modules/sys/Module.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace backend\modules\sys;
 
 /**

backend/modules/wechat/Module.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace backend\modules\wechat;
 
 /**