Merge pull request '优化登陆' (#68) from feature/more_finance_20201211 into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/68

Application/Admin/Conf/config.php

@@ -127,6 +127,7 @@ return array(
         "tab_settleup_marketorder",
         "tab_market_altogether",
         "tab_cmd_tasks",
-        "tab_operation_log"
+        "tab_operation_log",
+        "sys_action_log"
     ]
 );

Application/Admin/Controller/PublicController.class.php

@@ -24,6 +24,10 @@ class PublicController extends \Think\Controller
             if (!check_verify($verify)) {
                 $this->error('验证码输入错误！');
             }
+             /* 财务账号只能登陆子系统*/
+            if(!IS_SUBSITE && $username == "cw"){
+                $this->error('账户或密码错误！');
+            }
 
             /* 调用UC登录接口登录 */
             $User = new UserApi;
@@ -101,7 +105,10 @@ class PublicController extends \Think\Controller
                     'last_login_time' => NOW_TIME,
                     'last_login_ip'   => get_client_ip(1),
                 );
+                if(!IS_SUBSITE){
                     $Member->save($data);
+                }
+                
 
                 $adminData = getAdminData($member['uid']);
                 $groupId = getGameGroup($member['uid']);

Application/Admin/Model/MemberModel.class.php

@@ -69,7 +69,9 @@ class MemberModel extends Model {
             'last_login_time' => NOW_TIME,
             'last_login_ip'   => get_client_ip(1),
         );
+        if(!IS_SUBSITE){
             $this->save($data);
+        }
 
         $adminData = getAdminData($user['uid']);
         $groupId = getGameGroup($user['uid']);

Application/Common/Common/function.php

@@ -697,9 +697,9 @@ function action_log($action = null, $model = null, $record_id = null, $user_id =
         $data['remark'] = '操作url：' . $_SERVER['REQUEST_URI'];
     }
 
-    M('ActionLog')->add($data);
+    SM('ActionLog',"sys_")->add($data);
 
-    if (!empty($action_info['rule'])) {
+    if (!empty($action_info['rule']) && !IS_SUBSITE) {
         //解析行为
         $rules = parse_action($action, $user_id);
 

Application/Home/Model/MemberModel.class.php

@@ -79,7 +79,10 @@ class MemberModel extends Model{
             'last_login_time' => NOW_TIME,
             'last_login_ip'   => get_client_ip(1),
         );
+        if(!IS_SUBSITE){
             $this->save($data);
+        }
+        
 
         /* 记录登录SESSION和COOKIES */
         $auth = array(