yuncms / framework

src/notifications/migrations/m180410_092555_create_notification_table.php

Spacing +9 added lines, -9 removed lines

@@ -24,15 +24,15 @@
         }
         // https://segmentfault.com/q/1010000000672529/a-1020000000679702
         $this->createTable($this->tableName, [
-            'id' => $this->char(24)->notNull()->comment('Id'),//通知ID
-            'verb' => $this->string(32),//执行了什么操作
-            'template' => $this->string(),//模板
-            'notifiable_id' => $this->unsignedInteger()->notNull()->comment('Entity'),//通知实体ID
-            'notifiable_class' => $this->string()->notNull()->comment('Entity'),//通知实体类名
-            'data' => $this->text(),//通知数据
-            'read_at' => $this->unixTimestamp()->comment('Read At'),//阅读时间
-            'created_at' => $this->unixTimestamp()->notNull()->comment('Created At'),//创建时间
-            'updated_at' => $this->integer(10)->unsigned()->notNull()->comment('Updated At'),//更新时间
+            'id' => $this->char(24)->notNull()->comment('Id'), //通知ID
+            'verb' => $this->string(32), //执行了什么操作
+            'template' => $this->string(), //模板
+            'notifiable_id' => $this->unsignedInteger()->notNull()->comment('Entity'), //通知实体ID
+            'notifiable_class' => $this->string()->notNull()->comment('Entity'), //通知实体类名
+            'data' => $this->text(), //通知数据
+            'read_at' => $this->unixTimestamp()->comment('Read At'), //阅读时间
+            'created_at' => $this->unixTimestamp()->notNull()->comment('Created At'), //创建时间
+            'updated_at' => $this->integer(10)->unsigned()->notNull()->comment('Updated At'), //更新时间
         ], $tableOptions);
         $this->addPrimaryKey('{{%notification_notifiable_pk}}', $this->tableName, 'id');
         $this->createIndex('notification_notifiable', $this->tableName, ['notifiable_id', 'notifiable_class']);

migrations/m180428_084537_create_tasks_table.php

Spacing +9 added lines, -9 removed lines

@@ -24,15 +24,15 @@
         }
         $this->createTable($this->tableName, [
             'id' => $this->primaryKey(),
-            'name' => $this->string(50)->notNull(),//定时任务名称
-            'route' => $this->string(100)->notNull(),//任务路由
-            'crontab_str' => $this->string(50)->notNull(),//crontab格式
-            'switch' => $this->boolean()->notNull()->defaultValue(false),//任务开关 0关闭 1开启
-            'status' => $this->boolean()->defaultValue(false),//任务运行状态 0正常 1任务报错
-            'last_rundate' => $this->dateTime()->null(),//任务上次运行时间
-            'next_rundate' => $this->dateTime()->null(),//任务下次运行时间
-            'execmemory' => $this->decimal(9,2)->defaultValue('0.00'),//任务执行消耗内存(单位/byte)
-            'exectime' => $this->decimal(9,2)->defaultValue('0.00'),//任务执行消耗时间
+            'name' => $this->string(50)->notNull(), //定时任务名称
+            'route' => $this->string(100)->notNull(), //任务路由
+            'crontab_str' => $this->string(50)->notNull(), //crontab格式
+            'switch' => $this->boolean()->notNull()->defaultValue(false), //任务开关 0关闭 1开启
+            'status' => $this->boolean()->defaultValue(false), //任务运行状态 0正常 1任务报错
+            'last_rundate' => $this->dateTime()->null(), //任务上次运行时间
+            'next_rundate' => $this->dateTime()->null(), //任务下次运行时间
+            'execmemory' => $this->decimal(9, 2)->defaultValue('0.00'), //任务执行消耗内存(单位/byte)
+            'exectime' => $this->decimal(9, 2)->defaultValue('0.00'), //任务执行消耗时间
         ], $tableOptions);
     }
 

src/admin/controllers/TaskController.php

Indentation +8 added lines, -8 removed lines

@@ -121,14 +121,14 @@
         Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Delete success.'));
         return $this->redirect(['index']);
     }
-     /**
-      * Batch Delete existing Task model.
-      * If deletion is successful, the browser will be redirected to the 'index' page.
-      * @return mixed
-      * @throws NotFoundHttpException
-      * @throws \Throwable
-      * @throws \yii\db\StaleObjectException
-      */
+        /**
+         * Batch Delete existing Task model.
+         * If deletion is successful, the browser will be redirected to the 'index' page.
+         * @return mixed
+         * @throws NotFoundHttpException
+         * @throws \Throwable
+         * @throws \yii\db\StaleObjectException
+         */
     public function actionBatchDelete()
     {
         if (($ids = Yii::$app->request->post('ids', null)) != null) {

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
         if (($model = Task::findOne($id)) !== null) {
             return $model;
         } else {
-            throw new NotFoundHttpException (Yii::t('yii', 'The requested page does not exist.'));
+            throw new NotFoundHttpException(Yii::t('yii', 'The requested page does not exist.'));
         }
     }
 }

src/admin/views/task/_form.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 /* @var yuncms\models\Task $model */
 /* @var ActiveForm $form */
 ?>
-<?php $form = ActiveForm::begin(['layout' => 'horizontal', 'enableAjaxValidation' => true, 'enableClientValidation' => false,]); ?>
+<?php $form = ActiveForm::begin(['layout' => 'horizontal', 'enableAjaxValidation' => true, 'enableClientValidation' => false, ]); ?>
 
 <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
 <div class="hr-line-dashed"></div>

src/admin/views/task/index.php

Spacing +2 added lines, -2 removed lines

@@ -70,14 +70,14 @@
                     'crontab_str',
                     [
                         'attribute' => 'switch',
-                        'value' => function ($model) {
+                        'value' => function($model) {
                             return $model->switch == Task::SWITCH_ACTIVE ? Yii::t('yuncms', 'Active') : Yii::t('yuncms', 'Disable');
                         },
                         'label' => Yii::t('yuncms', 'Task Switch'),
                     ],
                     [
                         'attribute' => 'status',
-                        'value' => function ($model) {
+                        'value' => function($model) {
                             return $model->status == Task::STATUS_NORMAL ? Yii::t('yuncms', 'Normal') : Yii::t('yuncms', 'Saved');
                         },
                         'label' => Yii::t('yuncms', 'Task Status'),

src/oauth2/actions/Token.php

Spacing +4 added lines, -4 removed lines

@@ -44,10 +44,10 @@
     public $grantTypes = [
         'authorization_code' => Authorization::class,
         'refresh_token' => RefreshToken::class,
-        'client_credentials' => ClientCredentials::class,//个人账户密码
-        'password' => UserCredentials::class,//账户密码
-        'wechat' => WeChatCredentials::class,//微信
-        'qrcode' => QRCode::class,//客户端扫码
+        'client_credentials' => ClientCredentials::class, //个人账户密码
+        'password' => UserCredentials::class, //账户密码
+        'wechat' => WeChatCredentials::class, //微信
+        'qrcode' => QRCode::class, //客户端扫码
 //        'urn:ietf:params:oauth:grant-type:jwt-bearer' => 'yuncms\oauth2\grant\types\JwtBearer',//JWT 客户端签名
     ];
 

src/helpers/CronParseHelper.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
             'month' => static::parseTag(self::$tags[3], 1, 12), //月份
             'week' => static::parseTag(self::$tags[4], 0, 6), // 星期
         ];
-        $crons['week'] = array_map(function ($item) {
+        $crons['week'] = array_map(function($item) {
             return static::$weekMap[$item];
         }, $crons['week']);
         return self::getDateList($crons, $maxSize);

src/user/migrations/m180223_102734Create_user_table.php

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
             'unconfirmed_email' => $this->string(150)->comment('Unconfirmed Email'),
             'unconfirmed_mobile' => $this->string(11)->comment('Unconfirmed Mobile'),
             'registration_ip' => $this->string()->comment('Registration Ip'),
-            'identified' => $this->boolean()->defaultValue(false)->comment('Identified'),//是否经过实名认证
-            'balance' => $this->decimal(12, 2)->defaultValue(0),//可提现余额
-            'transfer_balance' => $this->decimal(12, 2)->defaultValue(0),//未结算余额
+            'identified' => $this->boolean()->defaultValue(false)->comment('Identified'), //是否经过实名认证
+            'balance' => $this->decimal(12, 2)->defaultValue(0), //可提现余额
+            'transfer_balance' => $this->decimal(12, 2)->defaultValue(0), //未结算余额
             'flags' => $this->integer()->defaultValue(0)->comment('Flags'),
             'email_confirmed_at' => $this->unixTimestamp()->comment('Email Confirmed At'),
             'mobile_confirmed_at' => $this->unixTimestamp()->comment('Mobile Confirmed At'),

src/user/models/User.php

Spacing +11 added lines, -11 removed lines

@@ -58,13 +58,13 @@ 
     const AFTER_REGISTER = 'afterRegister';
 
     //场景定义
-    const SCENARIO_CREATE = 'create';//后台或控制台创建用户
-    const SCENARIO_UPDATE = 'update';//后台或控制台修改用户
-    const SCENARIO_REGISTER = 'basic_create';//邮箱注册
-    const SCENARIO_EMAIL_REGISTER = 'email_create';//邮箱注册
-    const SCENARIO_MOBILE_REGISTER = 'mobile_create';//手机号注册
-    const SCENARIO_SETTINGS = 'settings';//更新
-    const SCENARIO_CONNECT = 'connect';//账户链接或自动注册新用户
+    const SCENARIO_CREATE = 'create'; //后台或控制台创建用户
+    const SCENARIO_UPDATE = 'update'; //后台或控制台修改用户
+    const SCENARIO_REGISTER = 'basic_create'; //邮箱注册
+    const SCENARIO_EMAIL_REGISTER = 'email_create'; //邮箱注册
+    const SCENARIO_MOBILE_REGISTER = 'mobile_create'; //手机号注册
+    const SCENARIO_SETTINGS = 'settings'; //更新
+    const SCENARIO_CONNECT = 'connect'; //账户链接或自动注册新用户
     const SCENARIO_PASSWORD = 'password';
 
     /**
@@ -105,8 +105,8 @@ 
             static::SCENARIO_EMAIL_REGISTER => ['nickname', 'email', 'password'],
             static::SCENARIO_MOBILE_REGISTER => ['mobile', 'password'],
             static::SCENARIO_SETTINGS => ['username', 'email', 'password'],
-            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'],//链接账户密码可以为空邮箱可以为空
-            static::SCENARIO_PASSWORD => ['password'],//只修改密码
+            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'], //链接账户密码可以为空邮箱可以为空
+            static::SCENARIO_PASSWORD => ['password'], //只修改密码
         ]);
     }
 
@@ -318,7 +318,7 @@ 
         if ($this->balance < 0) {//计算后如果余额小于0，那么结果不合法。
             return false;
         }
-        $transaction = static::getDb()->beginTransaction();//开始事务
+        $transaction = static::getDb()->beginTransaction(); //开始事务
         try {
             if ($this->save()) {
                 $transaction->commit();
@@ -360,7 +360,7 @@ 
         if ($this->transfer_balance < 0) {//计算后如果余额小于0，那么结果不合法。
             return false;
         }
-        $transaction = static::getDb()->beginTransaction();//开始事务
+        $transaction = static::getDb()->beginTransaction(); //开始事务
         try {
             if ($this->save()) {
                 $transaction->commit();