合并单点登录与系统用户表。

application/controllers/User.php

@@ -12,9 +12,9 @@ class User extends MY_controller
         $this->load->helper(array('form', 'url', 'date'));
         $this->load->model("user_model");
         $this->load->driver('cache', array('adapter' => 'apc', 'backup' => 'file'));
-        if(array_key_exists("from",$this->session->userdata)){
+        /*if(array_key_exists("from",$this->session->userdata)){
             $this->user_model->set_collection_name("sso_users");
-        }
+        }*/
         $this->load->library('MY_pagination');
         $this->assign("user_status", $this->user_status);
         $this->assign("user_types", $this->user_types);

application/controllers/v1/Api.php

@@ -137,10 +137,11 @@ class Api extends Public_Controller
             $json = $this->get_json();
             $data = json_decode($json, true);
             $user_model = $this->user_model;
-            $user_model->set_collection_name("sso_users");
+            //$user_model->set_collection_name("sso_users");
             if($user_model->is_exists("username",$data['username'])){
                 $info['last_login_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
                 $info['code'] = $this->create_token();
+                $info['from'] = $data['from'];
                 $user_model->set_val($info,array("username"=>$data['username']));
                 $msg["login_url"]=site_url("v1/api/sso_login?code=".$info['code']);
             }else {
@@ -165,7 +166,7 @@ class Api extends Public_Controller
         $code = $this->input->get("code", true);
         $msg = array();
         $user_model = $this->user_model;
-        $user_model->set_collection_name("sso_users");
+        //$user_model->set_collection_name("sso_users");
         $sso_user = $user_model->get_user_with_code($code);
         if($code &&  $sso_user){
             $sso_user['code'] = "";

application/views/templates/user/index.html

@@ -25,11 +25,9 @@
             <form class="form-inline" role="form" method="get">
                 <div class="pull-left">
                     <div class="btn-group">
-                        {if !array_key_exists('from',$smarty.session)}
                         <button type="button" class="add" id="add_user">
                             新增帐号
                         </button>
-                        {/if}
                         <button type="button" class="delete_btn" id="delete_user" disabled>
                             批量删除
                         </button>