Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/websrc/js/collect/intelligentpath.js

@@ -638,7 +638,7 @@
                 params.events = $scope.define.events;
                 params.sessionUnit = $scope.define.sessionUnit;
             }
-
+            params.eventCondition = encodeURIComponent(params.eventCondition);
             $scope.pathIsLoading = true;
             var areport = "intelligentpath/"+$scope.appid+"/query";
             var listPM = HttpService.getInfo(areport,params);

src/main/websrc/js/manage/usergroup.js

@@ -117,7 +117,7 @@
                             evts.push(item.event);
                             evtvals.push(temp);
                         });
-                        var evtprofilePM = HttpService.getInfo($scope.appid+"/event/find/param?names="+evts.join(",")+"&params="+JSON.stringify(evtvals));
+                        var evtprofilePM = HttpService.getInfo($scope.appid+"/event/find/param?names="+evts.join(",")+"&params="+encodeURIComponent(JSON.stringify(evtvals)));
                         evtprofilePM.then(function(pros){
                             pros.filter(function(evt){
                                 for(var i=0;i<$scope.eventList.length;i++){