services方法去掉action开头的形式，全部改为public函数，以及代码格式的调整

fecshop · May 9, 2020 · dac5588 · dac5588
1 parent b999199
commit dac5588
Show file tree

Hide file tree

Showing 99 changed files with 744 additions and 1,620 deletions.
diff --git a/services/Blog.php b/services/Blog.php
@@ -17,7 +17,7 @@
  */
 class Blog extends Service
 {
-    public functiongetCategoryMenu()
+    public function getCategoryMenu()
     {
     }
 

diff --git a/services/admin/Config.php b/services/admin/Config.php
@@ -103,11 +103,13 @@ public function save($one)
         $this->_model->attributes = $one;
         if ($this->_model->validate()) {
             $this->_model->save(); 
+
             return $this->_model[$primaryKey];
         } else {
             $errors = $this->_model->errors;
             Yii::$service->helper->errors->addByModelErrors($errors);
         }     
+
         return null;
     }
 

diff --git a/services/admin/Menu.php b/services/admin/Menu.php
@@ -50,12 +50,14 @@ public function getLeftMenuTreeHtml($treeArr='', $i=1){
         foreach($treeArr as $node){
             // 二次开发的过程中，如果fecshop后台的某些菜单想不显示，那么可以在配置中将active设置成false
             if (isset($node['active']) && $node['active'] === false) {
+
                 continue;
             }
             $name = Yii::$service->page->translate->__($node["label"]);
             $url_key = $node["url_key"];
             $roleUrlKeys = $this->getRoleUrlKey();
             if($url_key && (!isset($roleUrlKeys[$url_key]) || !$roleUrlKeys[$url_key])){
+
                 continue;
             }
             if($i == 1){

diff --git a/services/admin/Role.php b/services/admin/Role.php
@@ -20,7 +20,6 @@
  */
 class Role extends Service
 {
-
     const ADMIN_ROLEIDS_RESOURCES = 'admin_roleids_resources';
 
     public $numPerPage = 20;
@@ -64,6 +63,7 @@ public function getByPrimaryKey($primaryKey)
 
             return $one;
         } else {
+
             return new $this->_roleModelName();
         }
     }
@@ -158,6 +158,7 @@ public function saveRoleAndResources($one){
             $roleData['role_name'] = $one['role_name'];
         } else {
             Yii::$service->helper->errors->add('role name can not empty');
+
             return false;
         }
         if (isset($one['role_description'])) {
@@ -196,6 +197,7 @@ protected function validateRoleName($one)
         }
         $one = $query->one();
         if (!empty($one)) {
+
             return false;
         }
 
@@ -237,6 +239,7 @@ public function remove($ids)
     public function getCurrentRoleResources(){
         if (!$this->_current_role_resources) {
             if (Yii::$app->user->isGuest) {
+
                 return [];
             }
             $user = Yii::$app->user->identity;
@@ -257,6 +260,7 @@ public function getCurrentRoleResources(){
                 }
             }
             if (empty($role_ids)) {
+
                 return [];
             }
 

diff --git a/services/admin/RoleUrlKey.php b/services/admin/RoleUrlKey.php
@@ -55,6 +55,7 @@ public function getByPrimaryKey($primaryKey)
 
             return $one;
         } else {
+
             return new $this->_modelName();
         }
     }
@@ -85,7 +86,7 @@ public function coll($filter = '')
                 $coll[$k] = $one;
             }
         }
-        //var_dump($one);
+
         return [
             'coll' => $coll,
             'count'=> $query->limit(null)->offset(null)->count(),
@@ -147,8 +148,10 @@ public function repeatSaveRoleUrlKey($roleId, $url_key_ids){
                 $model->role_id = $roleId;
                 $model->save();
             }
+
             return true;
         }
+
         return false;
     }
 
@@ -169,6 +172,7 @@ protected function validateUrlKeyRoleId($one)
         }
         $one = $query->one();
         if (!empty($one)) {
+
             return false;
         }
 

diff --git a/services/admin/SystemLog.php b/services/admin/SystemLog.php
@@ -39,7 +39,8 @@ public function init()
         list($this->_modelName, $this->_model) = Yii::mapGet($this->_modelName);
     }
 
-    public function getSystemLogModel(){
+    public function getSystemLogModel()
+    {
         return $this->_model;
     }
 
@@ -60,6 +61,7 @@ public function getByPrimaryKey($primaryKey)
 
             return $one;
         } else {
+
             return new $this->_modelName();
         }
     }
@@ -90,7 +92,7 @@ public function coll($filter = '')
                 $coll[$k] = $one;
             }
         }
-        //var_dump($one);
+
         return [
             'coll' => $coll,
             'count'=> $query->limit(null)->offset(null)->count(),
@@ -100,6 +102,7 @@ public function coll($filter = '')
 	# 保存系统日志。
 	public function save(){
 		if (!$this->enableLog) {
+
             return false;
         }
 		$systemLog = $this->_model;
@@ -116,14 +119,16 @@ public function save(){
 			$systemLog->url = $url;
 			$systemLog->url_key = $url_key;
 			$systemLog->menu = $this->getMenuByUrlKey($url_key);
-			$systemLog->save();
+			return $systemLog->save();
 		}	
 	}
 
 	public function getMenuByUrlKey($url_key){
 		if(!$url_key)
+
 			return null;
 		$menuArr = Yii::$service->admin->urlKey->getUrlKeyAndLabelArr();
+
 		return isset($menuArr[$url_key]) ? $menuArr[$url_key] : null;
 	}
 

diff --git a/services/admin/UrlKey.php b/services/admin/UrlKey.php
@@ -62,6 +62,7 @@ public function getTags($translate = true){
                 }
             }
         }
+
         return $this->_urlKeyTags[$key];
     }
 
@@ -82,6 +83,7 @@ public function getByPrimaryKey($primaryKey)
 
             return $one;
         } else {
+
             return new $this->_modelName();
         }
     }
@@ -112,7 +114,7 @@ public function coll($filter = '')
                 $coll[$k] = $one;
             }
         }
-        //var_dump($one);
+
         return [
             'coll' => $coll,
             'count'=> $query->limit(null)->offset(null)->count(),
@@ -273,6 +275,7 @@ protected function validateUrlKey($one)
         }
         $one = $query->one();
         if (!empty($one)) {
+
             return false;
         }
 
@@ -296,7 +299,6 @@ public function remove($ids)
                 }
 
                 $model->delete();
-                // delete roleUrlKey
                 Yii::$service->admin->roleUrlKey->removeByUrlKeyId($id);
             }
         } else {
@@ -308,7 +310,6 @@ public function remove($ids)
                 return false;
             }
             $model->delete();
-            // delete roleUrlKey
             Yii::$service->admin->roleUrlKey->removeByUrlKeyId($id);
         }
 

diff --git a/services/admin/UserRole.php b/services/admin/UserRole.php
@@ -54,6 +54,7 @@ public function getByPrimaryKey($primaryKey)
 
             return $one;
         } else {
+
             return new $this->_roleModelName();
         }
     }
@@ -85,7 +86,7 @@ public function coll($filter = '')
                 $coll[$k] = $one;
             }
         }
-        //var_dump($one);
+
         return [
             'coll' => $coll,
             'count'=> $query->limit(null)->offset(null)->count(),

diff --git a/services/adminUser/AdminUser.php b/services/adminUser/AdminUser.php
@@ -67,10 +67,12 @@ public function getPrimaryKey()
 
     public function getActiveStatus(){
         $model = $this->_model;
+
         return $model::STATUS_ACTIVE;
     }
     public function getDeleteStatus(){
         $model = $this->_model;
+
         return $model::STATUS_DELETED;
     }
 
@@ -117,7 +119,7 @@ public function coll($filter = '')
                 $coll[$k] = $one;
             }
         }
-        //var_dump($one);
+
         return [
             'coll' => $coll,
             'count'=> $query->limit(null)->offset(null)->count(),
@@ -167,7 +169,6 @@ public function save($data) {
 
             return null;
         }
-
         if ($this->_userFormModel[$primaryKey]) {
             if ($this->_userFormModel->validate()) {
                 $this->_userFormModel->save();
@@ -237,10 +238,6 @@ public function remove($ids){
         return $removeIds;
     }
 
-
-
-
-
     /**
      * @param $ids | Int Array
      * @return 得到相应用户的数组。

diff --git a/services/adminUser/UserLogin.php b/services/adminUser/UserLogin.php
@@ -34,7 +34,7 @@ public function init()
      * @param $data|array
      * 数组格式：['username'=>'[email protected]','password'=>'xxxx']
      */
-    public function actionLogin($data)
+    public function login($data)
     {
         $model = new $this->_adminUserLoginModelName();
         $model->username    = $data['username'];
@@ -67,6 +67,7 @@ public function loginAndGetAccessToken($username, $password)
                 $access_token_created_at = $identity->access_token_created_at;
                 $timeout = Yii::$service->session->timeout;
                 if ($access_token_created_at + $timeout > time()) {
+
                     return $accessToken;
                 }
             }
@@ -83,8 +84,10 @@ public function loginAndGetAccessToken($username, $password)
             $identity->access_token_created_at = time();
             $identity->save();
             $this->setHeaderAccessToken($identity->access_token);
+
             return $identity->access_token;
         }
+
         return null;
     }
 
@@ -94,8 +97,10 @@ public function setHeaderAccessToken($accessToken)
     {
         if ($accessToken) {
             Yii::$app->response->getHeaders()->set('access-token', $accessToken);
+
             return true;
         }
+
         return false;
     }
 
@@ -125,9 +130,11 @@ public function loginByAccessToken($type = null)
                         $identity->access_token_created_at = time();
                         $identity->save();
                     }
+
                     return $identity;
                 } else {
                     $this->logoutByAccessToken();
+
                     return false;
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
      */
     class Blog extends Service
     {
-        public functiongetCategoryMenu()
+        public function getCategoryMenu()
         {
         }
@@ Expand Down @@