Merge remote-tracking branch 'origin/center-manage' into center-manage

center-manage/.gitignore

 node_modules/
 app/config/localsettings.js
-app/front/entry/public/
\ No newline at end of file
+app/front/entry/public/

center-manage/app/base/service/impl/auth/userSve.js

@@ -162,17 +162,15 @@ class UserService extends ServiceBase {
     if (u.password != inpassword) {
       return null;
     }
-    console.log('---- 密码------');
-    console.log(u.last_change_date);
-    // let last = new Date(u.last_change_date).getTime();//注意月份
-    // let differ = Date.now() - last;
-    // let days = Math.round(differ / (24 * 60 * 60 * 1000));
-    // if (u.last_change_date && days >= settings.changepwdcycle) {//禁用用户
-    //   await this.dao.updateByWhere({ isEnabled: false }, { userName: p.userName })
-    //   return null
-    // } else if ((settings.changepwdcycle - 7) <= days) {
-    //   rtn.hint = "请尽快修改密码，否则会禁用您的账户"
-    // }
+    let last = new Date(u.last_change_date).getTime();//注意月份
+    let differ = Date.now() - last;
+    let days = Math.round(differ / (24 * 60 * 60 * 1000));
+    if (u.last_change_date && days >= settings.changepwdcycle) {//禁用用户
+      await this.dao.updateByWhere({ isEnabled: false }, { userName: p.userName })
+      return null
+    } else if ((settings.changepwdcycle - 7) <= days) {
+      rtn.hint = "请尽快修改密码，否则会禁用您的账户"
+    }
     return this.db.transaction(async function (t) {
       //从缓存中取得
       // let userfind = await self.dao.model.findOne({

center-manage/app/config/settings.js

@@ -20,7 +20,7 @@ var settings = {
   encrypt_secret: ENVINPUT.ENCRYPT_SECRET,
   salt: "%iatpD1gcxz7iF#B",
   defaultpwd: "Temp123456",
-  changepwdcycle: 60,//密码更换周期 7天前登录提示更改密码 到期后直接禁用账户
+  changepwdcycle: 365,//密码更换周期 7天前登录提示更改密码 到期后直接禁用账户
   basepath: path.normalize(path.join(__dirname, '../..')),
   port: process.env.NODE_PORT || 80,
   logindex: "center_manage",