修改登出自动填充登录信息的逻辑

app_web/public/assets/dingdingRedirect.html

@@ -40,7 +40,8 @@
                                 localStorage.setItem('user', JSON.stringify(data.user));
                             }
                             if (data.ibzuser) {
-                                var ibzuser = JSON.stringify(data.ibzuser);
+                                var ibzuser = data.ibzuser;
+                                localStorage.setItem('ibzuser',JSON.stringify(ibzuser));
                                 // 设置cookie,保存账号密码7天
                                 setCookie(ibzuser.loginname, ibzuser.password, 7);
                                 // 跳转首页

app_web/public/assets/qqRedirect.html

@@ -40,7 +40,8 @@
                                 localStorage.setItem('user', JSON.stringify(data.user));
                             }
                             if (data.ibzuser) {
-                                var ibzuser = JSON.stringify(data.ibzuser);
+                                var ibzuser = data.ibzuser;
+                                localStorage.setItem('ibzuser',JSON.stringify(ibzuser));
                                 // 设置cookie,保存账号密码7天
                                 setCookie(ibzuser.loginname, ibzuser.password, 7);
                                 // 跳转首页

app_web/public/assets/weixinRedirect.html

@@ -25,7 +25,6 @@
                     data: JSON.stringify(opt),
                     contentType: 'application/json',
                     success: function (data) {
-                        // console.log(JSON.stringify(data));
                         if (data) {
                             if (data.openid) {
                                 localStorage.setItem('openid', data.openid);
@@ -40,7 +39,8 @@
                                 localStorage.setItem('user', JSON.stringify(data.user));
                             }
                             if (data.ibzuser) {
-                                var ibzuser = JSON.stringify(data.ibzuser);
+                                var ibzuser = data.ibzuser;
+                                localStorage.setItem('ibzuser',JSON.stringify(ibzuser));
                                 // 设置cookie,保存账号密码7天
                                 setCookie(ibzuser.loginname, ibzuser.password, 7);
                                 // 跳转首页

app_web/src/components/login/dingdingLoginRedirect.vue

@@ -242,7 +242,8 @@
                             localStorage.setItem('user', JSON.stringify(data.user));
                         }
                         if (data.ibzuser) {
-                            let ibzuser: any = JSON.stringify(data.ibzuser);
+                            let ibzuser: any = data.ibzuser;
+                            localStorage.setItem('ibzuser',JSON.stringify(ibzuser));
                             // 设置cookie,保存账号密码7天
                             this.setCookie(ibzuser.loginname, ibzuser.password, 7);
                             // 跳转首页
@@ -274,18 +275,21 @@
 
 
         /**
-         * 设置cookie,保存账号密码
-         * @param loginname
-         * @param password
+         * 设置cookie
          */
-        public setCookie(loginname: any, password: any, exdays: any) {
-            // 获取时间
-            let exdate = new Date();
-            // 保存的天数
-            exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays);
-            // 字符串拼接cookie
-            window.document.cookie = "loginname" + "=" + loginname + ";path=/;expires=" + exdate.toUTCString();
-            window.document.cookie = "password" + "=" + password + ";path=/;expires=" + exdate.toUTCString();
+        public setCookie(name: any, value: any, day: any) {
+            if (day !== 0) { //当设置的时间等于0时，不设置expires属性，cookie在浏览器关闭后删除
+                var curDate = new Date();
+                var curTamp = curDate.getTime();
+                var curWeeHours = new Date(curDate.toLocaleDateString()).getTime() - 1;
+                var passedTamp = curTamp - curWeeHours;
+                var leftTamp = 24 * 60 * 60 * 1000 - passedTamp;
+                var leftTime = new Date();
+                leftTime.setTime(leftTamp + curTamp);
+                document.cookie = name + "=" + escape(value) + ";expires=" + leftTime.toUTCString();
+            } else {
+                document.cookie = name + "=" + escape(value);
+            }
         }
 
 

app_web/src/components/login/login.vue

@@ -140,6 +140,14 @@
             if (this.getCookie("password") && this.getCookie("password") !== 'undefined') {
                 this.form.password = this.getCookie("password");
             }
+            if (localStorage.getItem("ibzuser")) {
+                const ibzuser:any = localStorage.getItem("ibzuser");
+                if (ibzuser) {
+                    const ibzuserObj:any = JSON.parse(ibzuser);
+                    this.form.loginname = ibzuserObj.loginname;
+                    this.form.password = ibzuserObj.password;
+                }
+            }
         }
 
         /**

app_web/src/components/login/qqLoginRedirect.vue

@@ -248,7 +248,8 @@
                             localStorage.setItem('user', JSON.stringify(data.user));
                         }
                         if (data.ibzuser) {
-                            let ibzuser: any = JSON.stringify(data.ibzuser);
+                            let ibzuser: any = data.ibzuser;
+                            localStorage.setItem('ibzuser',JSON.stringify(ibzuser));
                             // 设置cookie,保存账号密码7天
                             this.setCookie(ibzuser.loginname, ibzuser.password, 7);
                             // 跳转首页
@@ -277,24 +278,24 @@
             });
         }
 
-
-
         /**
-         * 设置cookie,保存账号密码
-         * @param loginname
-         * @param password
+         * 设置cookie
          */
-        public setCookie(loginname: any, password: any, exdays: any) {
-            // 获取时间
-            let exdate = new Date();
-            // 保存的天数
-            exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays);
-            // 字符串拼接cookie
-            window.document.cookie = "loginname" + "=" + loginname + ";path=/;expires=" + exdate.toUTCString();
-            window.document.cookie = "password" + "=" + password + ";path=/;expires=" + exdate.toUTCString();
+        public setCookie(name: any, value: any, day: any) {
+            if (day !== 0) { //当设置的时间等于0时，不设置expires属性，cookie在浏览器关闭后删除
+                var curDate = new Date();
+                var curTamp = curDate.getTime();
+                var curWeeHours = new Date(curDate.toLocaleDateString()).getTime() - 1;
+                var passedTamp = curTamp - curWeeHours;
+                var leftTamp = 24 * 60 * 60 * 1000 - passedTamp;
+                var leftTime = new Date();
+                leftTime.setTime(leftTamp + curTamp);
+                document.cookie = name + "=" + escape(value) + ";expires=" + leftTime.toUTCString();
+            } else {
+                document.cookie = name + "=" + escape(value);
+            }
         }
 
-
     }
 </script>
 

app_web/src/components/login/weixinLoginRedirect.vue

@@ -244,7 +244,8 @@
                             localStorage.setItem('user', JSON.stringify(data.user));
                         }
                         if (data.ibzuser) {
-                            let ibzuser: any = JSON.stringify(data.ibzuser);
+                            let ibzuser: any = data.ibzuser;
+                            localStorage.setItem('ibzuser',JSON.stringify(ibzuser));
                             // 设置cookie,保存账号密码7天
                             this.setCookie(ibzuser.loginname, ibzuser.password, 7);
                             // 跳转首页
@@ -273,20 +274,22 @@
             });
         }
 
-
         /**
-         * 设置cookie,保存账号密码
-         * @param loginname
-         * @param password
+         * 设置cookie
          */
-        public setCookie(loginname: any, password: any, exdays: any) {
-            // 获取时间
-            let exdate = new Date();
-            // 保存的天数
-            exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays);
-            // 字符串拼接cookie
-            window.document.cookie = "loginname" + "=" + loginname + ";path=/;expires=" + exdate.toUTCString();
-            window.document.cookie = "password" + "=" + password + ";path=/;expires=" + exdate.toUTCString();
+        public setCookie(name: any, value: any, day: any) {
+            if (day !== 0) { //当设置的时间等于0时，不设置expires属性，cookie在浏览器关闭后删除
+                var curDate = new Date();
+                var curTamp = curDate.getTime();
+                var curWeeHours = new Date(curDate.toLocaleDateString()).getTime() - 1;
+                var passedTamp = curTamp - curWeeHours;
+                var leftTamp = 24 * 60 * 60 * 1000 - passedTamp;
+                var leftTime = new Date();
+                leftTime.setTime(leftTamp + curTamp);
+                document.cookie = name + "=" + escape(value) + ";expires=" + leftTime.toUTCString();
+            } else {
+                document.cookie = name + "=" + escape(value);
+            }
         }
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/UserDingtalkRegisterResource.java

@@ -93,7 +93,10 @@ public class UserDingtalkRegisterResource {
         if (sysUserAuths.size()>0) {
             SysUserAuth userauth = sysUserAuths.get(0);
             IBZUSER ibzuser = ibzuserService.getById(userauth.getUserid());
-            object.put("ibzuser", ibzuser);
+            JSONObject ibzuserObj = new JSONObject();
+            ibzuserObj.put("loginname", ibzuser.getLoginname());
+            ibzuserObj.put("password", ibzuser.getPassword());
+            object.put("ibzuser", ibzuserObj);
 
             // 生成登录token信息
             userDetailsService.resetByUsername(ibzuser.getLoginname());
@@ -153,7 +156,10 @@ public class UserDingtalkRegisterResource {
 
         // 注册成功，登录系统
         if (!StringUtils.isEmpty(ibzuser)) {
-            object.put("ibzuser", ibzuser);
+            JSONObject ibzuserObj = new JSONObject();
+            ibzuserObj.put("loginname", ibzuser.getLoginname());
+            ibzuserObj.put("password", ibzuser.getPassword());
+            object.put("ibzuser", ibzuserObj);
         }
 
         //　生成登录token信息

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/UserQQRegisterResource.java

@@ -94,7 +94,10 @@ public class UserQQRegisterResource {
         if (sysUserAuths.size()>0) {
             SysUserAuth userauth = sysUserAuths.get(0);
             IBZUSER ibzuser = ibzuserService.getById(userauth.getUserid());
-            object.put("ibzuser", ibzuser);
+            JSONObject ibzuserObj = new JSONObject();
+            ibzuserObj.put("loginname", ibzuser.getLoginname());
+            ibzuserObj.put("password", ibzuser.getPassword());
+            object.put("ibzuser", ibzuserObj);
 
             // 生成登录token信息
             userDetailsService.resetByUsername(ibzuser.getLoginname());
@@ -165,7 +168,10 @@ public class UserQQRegisterResource {
 
         // 注册成功，登录系统
         if (!StringUtils.isEmpty(ibzuser)) {
-            object.put("ibzuser", ibzuser);
+            JSONObject ibzuserObj = new JSONObject();
+            ibzuserObj.put("loginname", ibzuser.getLoginname());
+            ibzuserObj.put("password", ibzuser.getPassword());
+            object.put("ibzuser", ibzuserObj);
         }
 
         //　生成登录token信息

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/UserWechatRegisterResource.java

@@ -41,9 +41,9 @@ public class UserWechatRegisterResource {
     @Qualifier("UAAUserService")
     private AuthenticationUserService userDetailsService;
 
-    @Value("${ibiz.auth.wechat.appID:}")// 微信开放平台appid,最好在配置文件进行初始化
+    @Value("${ibiz.auth.wechat.appID:wx4a7473ac9c617f76}")// 微信开放平台appid,最好在配置文件进行初始化
     private String WechatAppid;
-    @Value("${ibiz.auth.wechat.appsecret:}")// 微信开放平台appsecret,最好在配置文件进行初始化
+    @Value("${ibiz.auth.wechat.appsecret:c2b308b9245dffa316b049840fd81a79}")// 微信开放平台appsecret,最好在配置文件进行初始化
     private String WechatAppsecret;
 
 
@@ -93,7 +93,10 @@ public class UserWechatRegisterResource {
         if (sysUserAuths.size()>0) {
             SysUserAuth userauth = sysUserAuths.get(0);
             IBZUSER ibzuser = ibzuserService.getById(userauth.getUserid());
-            object.put("ibzuser", ibzuser);
+            JSONObject ibzuserObj = new JSONObject();
+            ibzuserObj.put("loginname", ibzuser.getLoginname());
+            ibzuserObj.put("password", ibzuser.getPassword());
+            object.put("ibzuser", ibzuserObj);
 
             // 生成登录token信息
             userDetailsService.resetByUsername(ibzuser.getLoginname());
@@ -165,7 +168,10 @@ public class UserWechatRegisterResource {
 
         // 注册成功，登录系统
         if (!StringUtils.isEmpty(ibzuser)) {
-            object.put("ibzuser", ibzuser);
+            JSONObject ibzuserObj = new JSONObject();
+            ibzuserObj.put("loginname", ibzuser.getLoginname());
+            ibzuserObj.put("password", ibzuser.getPassword());
+            object.put("ibzuser", ibzuserObj);
         }
 
         //　生成登录token信息