1

app/cloudAjaxRouter.js

@@ -19,8 +19,19 @@ router.get('/cloud/curing/ajax/getCuringPage/:currentPage', function(req, res, n
 	cloudAjaxController.refreshCuringPage(req, res);
 });
 
+//------------用户详情页界面相关----------------
 /**
- * 用户检索
+ * 获得用户详情
+ */
+router.get('/cloud/curing/ajax/getCuringBySsoid', function(req, res, next) {
+    cloudAjaxController.getCuringBySsoid(req, res);
+});
+
+
+
+
+/**
+ * 用户检索--废弃
  */
 router.get('/cloud/curing/ajax/curingInfo/:mobile', function(req, res, next) {
     cloudAjaxController.getCuringInfo(req, res);
@@ -36,15 +47,12 @@ router.get('/cloud/curing/ajax/curingInfo/:mobile', function(req, res, next) {
 
 
 
-
+//废弃
 router.get('/cloud/curing/ajax/checkMobile/:mobile', function(req, res, next) {
     cloudAjaxController.checkMobile(req, res);
 });
 
-//����ͨ��֤ID��������û���Ϣ
-router.get('/cloud/curing/ajax/getCuringBySsoid', function(req, res, next) {
-    cloudAjaxController.getCuringBySsoid(req, res);
-});
+
 
 //��������ҳ ����
 router.get('/cloud/curing/ajax/getCuringById/:sso_id', function(req, res, next) {

app/controller/cloudEditionAjaxController.js

@@ -11,7 +11,40 @@ var models=require('../models');
 var cloudEditionAjaxController={
 		
 		//------------用户列表界面相关----------------
+		/**
+		 * 用户列表刷新
+		 */
+		refreshCuringPage: async function(req, res){
+		    var curingList= await cloudService.getCuringList(req, res);
 
+		    res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
+		},	
+		
+
+		//------------用户详情页界面相关----------------
+		/**
+		 * 异步获得养护用户信息详情
+		 */
+		getCuringBySsoid: async function(req, res){
+		    var params = url.parse(req.url, true).query;
+
+		    if(!hash.isExistence(params.ssoid)){
+		        res.json({ 'status': 0,'msg':'error ssoid' });
+		        return ;
+		    }
+
+		    var detail= await cloudService.getCuringBySsoid(params.ssoid,params.client_id);
+		    //console.log(detail);
+		    if(hash.isExistence(detail)) {
+		        res.json({ 'status': 1,'detail':detail });
+		    }else{
+		        res.json({ 'status': 3,'msg':'该号码未注册养护项目' });
+		    }
+		},
+		
+		
+		
+		
 		/**
 		 * 养护用户分页---废弃
 		 */
@@ -26,20 +59,8 @@ var cloudEditionAjaxController={
 		    var curingList= await cloudService.getCuringList(req, res);
 
 		    res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
-		},	*/
-		
-		/**
-		 * 用户列表刷新
-		 */
-		refreshCuringPage: async function(req, res){
-
-		    var curingList= await cloudService.getCuringList(req, res);
-
-		    res.json({ 'status': 1,'curingList':curingList.curingList,'pageData':curingList.pageData });
 		},	
-		
-
-    //获得养护信息
+    //获得养护信息--废弃
     getCuringInfo: async function(req, res){
         if(!hash.isNotANumber(req.params.mobile)){
             res.json({ 'status': 0,'msg':'error mobile' });
@@ -61,7 +82,7 @@ var cloudEditionAjaxController={
             res.json({ 'status': 1,'detail':bcDetail });
         }
     },
-
+*/	
 
 
 //搜索手机号，防止由于改号码导致数据不全问题
@@ -84,25 +105,7 @@ checkMobile: async function(req, res){
     }
 },
 
-/**
- * 异步获得养护用户信息详情
- */
-getCuringBySsoid: async function(req, res){
-    var params = url.parse(req.url, true).query;
-
-    if(!hash.isExistence(params.ssoid)){
-        res.json({ 'status': 0,'msg':'error ssoid' });
-        return ;
-    }
 
-    var detail= await cloudService.getCuringBySsoid(params.ssoid,params.client_id);
-    //console.log(detail);
-    if(hash.isExistence(detail)) {
-        res.json({ 'status': 1,'detail':detail });
-    }else{
-        res.json({ 'status': 3,'msg':'该号码未注册养护项目' });
-    }
-},
 
 upCuringDo: async function(req, res){
     //post数据获得

app/service/cloudEditionService.js

@@ -30,9 +30,6 @@ var cloudService={
     	//分页数据
     	var page=1;
     	
-    	
-    	
-    	
         var compilation='';
     	var latestCompilation='';
     	var sortField='create_time';
@@ -176,7 +173,8 @@ var cloudService={
             curingCloudList[i].addtime=moment(v.create_time).format('YYYY-MM-DD HH:mm');
             curingCloudList[i].latest_login=moment(v.latest_login).format('YYYY-MM-DD HH:mm');
             curingCloudList[i].client_id=hash.hashEncode(v.client_id.toString());
-            //curingCloudList[i].sso_id=v.sso_id;
+            curingCloudList[i].sso_id=hash.hashEncode(v.sso_id.toString());
+            
             //最后使用
             curingCloudList[i].latest_usedName='';            
             for(var ci=0;ci<compilationList.length;ci++){
@@ -193,7 +191,6 @@ var cloudService={
             	curingCloudList[i].online_newest='';
             }
             //已升级专业版
-            console.log(v.upgrade_list);
             curingCloudList[i].upgradeListName='';
             for(var gi=0;gi<v.upgrade_list.length;gi++){
             	for(var ci=0;ci<compilationList.length;ci++){
@@ -225,46 +222,10 @@ var cloudService={
     },
     
     /**
-     * 获得本地编办列表--废弃
-     */
-    getCuringCompilationList:async function (){
-        var compilationList = await models.cloud_curing.getCuringCompilationList();
-        return compilationList;
-    },
-
-    
-
-    //获取本地养护数据
-    getBindCuringByMobile:async function (mobile){
-        var curingList = await models.cloud_curing.getCuringByMobile(mobile);
-        if (curingList!=null){
-            var cid=[curingList['client_id']];
-            var attributes= ['cid', 'clientname', 'companyid', 'companyname'];
-            var clientList = await models.CLD_client.findAllInCid(cid,attributes);
-            curingList.clientInfo={};
-            clientList.forEach(function(clientVal,clientI){
-                if(curingList.client_id==clientVal.cid){
-                    curingList.clientInfo=clientVal;
-
-                }
-            });
-            curingList.addtime=moment.unix(curingList.addtime).format('YYYY-MM-DD HH:mm');
-        }
-        return curingList;
-    },
-
-    //根据手机号码获得养护用户信息
-    getCuringByMobile: async function(mobile){
-        var url= curingUrl+'/getUsersAndCompilation?mobile='+ mobile;
-        var userData= await curlRequest(url);
-        return userData;
-    },
-
-    /**
      * 用户详情页-数据
      */
     getCuringBySsoid: async function(ssoid,client_id){
-        var curingSsoid=ssoid;
+        
         if(!hash.isNotANumber(ssoid)){
             ssoid=hash.hashDecode(ssoid);
             if(!hash.isNotANumber(ssoid)){
@@ -277,9 +238,11 @@ var cloudService={
         if(!hash.isExistence(userData)){
             return [];
         }
-
+        console.log(userData);
+        
+        
         //本地养护用户
-        userData['curingInfo']=await models.cloud_curing.getCuringBySsoid(curingSsoid);
+        userData['curingInfo']=await models.cloud_curing.getCuringBySsoid(ssoid);
         client_id=userData['curingInfo']['client_id'];
 
         /*userData['clientInfo']='';
@@ -319,6 +282,50 @@ var cloudService={
 
         return userData;
     },
+    
+    
+    
+    
+    
+    
+    
+    /**
+     * 获得本地编办列表--废弃
+     */
+    getCuringCompilationList:async function (){
+        var compilationList = await models.cloud_curing.getCuringCompilationList();
+        return compilationList;
+    },
+
+    
+
+    //获取本地养护数据--可能废弃
+    getBindCuringByMobile:async function (mobile){
+        var curingList = await models.cloud_curing.getCuringByMobile(mobile);
+        if (curingList!=null){
+            var cid=[curingList['client_id']];
+            var attributes= ['cid', 'clientname', 'companyid', 'companyname'];
+            var clientList = await models.CLD_client.findAllInCid(cid,attributes);
+            curingList.clientInfo={};
+            clientList.forEach(function(clientVal,clientI){
+                if(curingList.client_id==clientVal.cid){
+                    curingList.clientInfo=clientVal;
+
+                }
+            });
+            curingList.addtime=moment.unix(curingList.addtime).format('YYYY-MM-DD HH:mm');
+        }
+        return curingList;
+    },
+
+    //根据手机号码获得养护用户信息--可能废弃
+    getCuringByMobile: async function(mobile){
+        var url= curingUrl+'/getUsersAndCompilation?mobile='+ mobile;
+        var userData= await curlRequest(url);
+        return userData;
+    },
+
+    
 
     upCuringDo: async function(data){
         var url =  curingUrl+'/setUserUpgrade';