修改密码

assets/js/controllers/mainCtrl.js

@@ -47,6 +47,10 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     // 监听路由
     $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
       console.log(event, toState, toParams, fromState, fromParams)
+      // 修改密码验证
+      // if(toState.name != 'login.signin'){
+      //   $rootScope.changepassword();
+      // }
       if ((toState.name == 'app.incident.chart' || toState.name == 'app.incident.editor') &&
         fromState.name) {
         console.log($rootScope.jry_state);
@@ -364,8 +368,8 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             //     $rootScope.imUsrMap[eventName]['msgs']=$rootScope.imUsrMap[eventName]['msgs']||[];
             //     angular.forEach(changedDoc.args,function(item){
             //         $rootScope.imUsrMap[eventName].msgs.push(item);
-            //     })                    
-            // }                
+            //     })
+            // }
           } else {
 
           }
@@ -432,7 +436,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
       getMenus();
       //console.log(data);
       //$rootScope.user = data.user;
-      //$rootScope.menus = data.menu;   
+      //$rootScope.menus = data.menu;
     });
 
     //$rootScope.$watch('$auth.user')
@@ -464,7 +468,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     // $rootScope.$on('auth:logout-success', function(ev) {
     //     //alert('goodbye');
     //     //delete $rootScope.user;
-    //     //delete $rootScope.menus;  
+    //     //delete $rootScope.menus;
     //     $state.go('login.signin');
     // });
 
@@ -500,7 +504,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     //             if(angular.isUndefined(user.id)){
 
     //             }else{
-    //                 $rootScope.user = user;                
+    //                 $rootScope.user = user;
     //             }
     //         }
     //     });
@@ -519,10 +523,10 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
 
     //                     }else{
     //                         $rootScope.user = data.user;
-    //                         $rootScope.menus = data.menu;  
+    //                         $rootScope.menus = data.menu;
     //                         $cookieStore.put("userObm", $rootScope.user);
     //                         $cookieStore.put("menuObm", $rootScope.menus);
-    //                         $cookieStore.put("session", data.sessionId);  
+    //                         $cookieStore.put("session", data.sessionId);
     //                     }
     //                 }
     //             }
@@ -536,7 +540,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     $scope.changeWorkId = function () {
       event.stopPropagation();
     }
-    
+
     $rootScope.getSession = function () {
       if ($auth.userIsAuthenticated()) {
         return $auth.retrieveData('auth_headers')
@@ -2007,7 +2011,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         var toData = { 'model': { 'incident': { 'contactsInformation': data.callerIdNumber, 'source': { 'id': 1 } } } }
         $state.go('app.incident.title', { 'model': JSON.stringify(toData) });
       };
-      // ws.send("{\"type\":\"1\",\"phone\":\""+data.phone+"\"}");                 
+      // ws.send("{\"type\":\"1\",\"phone\":\""+data.phone+"\"}");
     }
     //来电号码生成事件
     $scope.jry_callToIncident = function (data) {
@@ -2084,12 +2088,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               //       title: "登出成功",
               //       text: "呼叫中心登出成功!",
               //       type: "success"
-              //     });    
+              //     });
               // }else{SweetAlert.swal({
               //       title: "登出失败",
               //       text: "呼叫中心登出失败!",
               //       type: "error"
-              //     });   
+              //     });
             }
           })
         }
@@ -2210,7 +2214,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
       });
 
     }
-    $rootScope.changepassword = function (data1, size) {
+    $rootScope.changepassword = function () {
       var modalInstance = $modal.open({
         templateUrl: 'assets/views/changepassword.html',
         controller: function ($scope, $modalInstance, items, Restangular, SweetAlert) {
@@ -2221,35 +2225,45 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             $modalInstance.dismiss('cancel');
             // console.log('pwd=' + pwd + '+' + pwd_2);
             // if(angular.isDefined(pwd)&&angular.isDefined(pwd_2)){
-            if (pwd == pwd_2) {
-              var data2 = {};
-              data2["originalPwd"] = originalPwd;
-              data2["userid"] = $rootScope.user.id;
-              data2["pwd"] = pwd;
-              api_login.uppwd(data2).then(function (response) {
-                var myData = Restangular.stripRestangular(response);
-                if (myData.status == 200) {
-                  SweetAlert.swal({
-                    title: "保存成功!",
-                    type: "success",
-                    confirmButtonColor: "#007AFF"
-                  });
-                } else {
-                  SweetAlert.swal({
-                    title: "保存失败!",
-                    text: "输入旧密码错误，请重新输入！",
-                    type: "error"
-                  });
-                }
-              })
 
-            } else {
+            if (pwd != pwd_2) {
               SweetAlert.swal({
                 title: "两次输入的新密码不相同!",
                 text: "输入错误，请重新输入！",
                 type: "error"
               });
+              return;
             }
+            if (pwd == pwd_2 && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,20}$/.test(pwd))) {
+              SweetAlert.swal({
+                title: "密码长度8-20位，必须包含大写和小写!",
+                text: "输入错误，请重新输入！",
+                type: "error"
+              });
+              return;
+            }
+            var data2 = {};
+            data2["originalPwd"] = originalPwd;
+            data2["userid"] = $rootScope.user.id;
+            data2["pwd"] = pwd;
+            api_login.uppwd(data2).then(function (response) {
+              var myData = Restangular.stripRestangular(response);
+              if (myData.status == 200) {
+                SweetAlert.swal({
+                  title: '修改成功！',
+                  text: myData.updatePwdMonth > 0 ? "本次修改密码有效期" + myData.updatePwdMonth + "个月" : '',
+                  type: "success",
+                  confirmButtonColor: "#007AFF"
+                });
+              } else {
+                SweetAlert.swal({
+                  title: "修改失败!",
+                  text: "输入旧密码错误，请重新输入！",
+                  type: "error"
+                });
+              }
+            })
+
             // }else{
             //     SweetAlert.swal({
             //                     title: "密码不能为空!",
@@ -2259,7 +2273,6 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             // }
           }
         },
-        size: size,
         resolve: {
           items: function () {
             return {

assets/js/controllers/system/sysconfigCtrl.js

@@ -10,6 +10,10 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
         var v = parseFloat(e.target.value)?parseFloat(e.target.value):0;
         a.autoCloseIncidentHour.valueconfig  = v > 0 ? v : 0;
     }
+    a.changeUpdatePwdMonth = function(e){
+        var v = parseFloat(e.target.value)?parseFloat(e.target.value):0;
+        a.updatePwdMonth.valueconfig  = v > 0 ? v : 0;
+    }
 
     function convertListToTree(data, treeMap) {
         var idToNodeMap = {}; //Keeps track of nodes using id as key, for fast lookup
@@ -199,6 +203,7 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
         arr.systemConfiguration.push(a.wxIncidentWithCmdb);//是否需要绑定资产
         arr.systemConfiguration.push(a.requesterLgoinType);//保修人登录方式
         arr.systemConfiguration.push(a.autoCloseIncidentHour);//自动关单小时
+        arr.systemConfiguration.push(a.updatePwdMonth);//密码强制修改时间
         if(a.cifilter_classic){
             a.alarmCategory.valueconfig = a.cifilter_classic.id + '';
             arr.systemConfiguration.push(a.alarmCategory);//默认的告警转换分类
@@ -291,6 +296,10 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
                         v.valueconfig = parseFloat(v.valueconfig)
                         a.autoCloseIncidentHour = v;//自动关单小时
                     }
+                    if (v.keyconfig == 'updatePwdMonth') {
+                        v.valueconfig = parseFloat(v.valueconfig)
+                        a.updatePwdMonth = v;//密码强制修改时间
+                    }
                     if (v.keyconfig == 'alarmCategory') {
                         a.alarmCategory = v;
                         a.try_async_load(null, null, v);

assets/views/changepassword.html

@@ -29,7 +29,13 @@
 									<div class="col-sm-8">
 										<input type="password" placeholder="输入新密码" id="pwd_2" ng-model="pwd_2" class="form-control">
 									</div>
-								</div> 
+								</div>
+								<div class="form-group">
+									<label class="col-sm-3 control-label"></label>
+									<div class="col-sm-8 red">
+										（提示：密码长度8-20位，必须包含大写和小写）
+									</div>
+								</div>
 								<div class="form-group margin-bottom-0">
 									<div class="col-sm-offset-5 col-sm-2">
 										<button class="btn btn-o btn-primary"  ng-disabled="passwordnull(originalPwd,pwd,pwd_2)" ng-click="savepassword(originalPwd,pwd,pwd_2);" type="submit">

assets/views/system/sysconfig.html

@@ -149,6 +149,14 @@
                 </div>
                 <div class="form-group col-sm-6">
                     <label class="col-sm-4 control-label">
+                        密码强制修改时间：
+                    </label>
+                    <div class="col-sm-8">
+                        <input ng-model="updatePwdMonth.valueconfig" ng-keyup="changeUpdatePwdMonth($event)" class="autoCloseIncidentHour" type="number" step="1" min="0">个月
+                    </div>
+                </div>
+                <div class="form-group col-sm-6">
+                    <label class="col-sm-4 control-label">
                         是否需要绑定耗材：
                     </label>
                     <div class="col-sm-8">