Merge remote-tracking branch 'origin/master'

nbjk-framework/src/main/java/com/miaxis/framework/web/service/UserDetailsServiceImpl.java

@@ -81,6 +81,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     UserInfo userInfo = userInfoGetByUnionId ;
                     userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
                     userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
+                    userInfo.setAppOpenid(openid);
                     userService.updateStudent(userInfo);
                     return createLoginUser(userService.getStudentByUnionId(identification));
                 }
@@ -104,6 +105,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     UserInfo userInfo = userInfoGetByUnionId ;
                     userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
                     userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
+                    userInfo.setGzhOpenid(openid);
                     userService.updateStudent(userInfo);
                     return createLoginUser(userService.getStudentByUnionId(identification));
                 }
@@ -126,8 +128,9 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     return createLoginUser(userService.getStudentByUnionId(identification));
                 }else {
                     UserInfo userInfo = userInfoGetByUnionId ;
-                    userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
-                    userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
+                    //userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
+                    //userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
+                    userInfo.setXcxOpenid(openid);
                     userService.updateStudent(userInfo);
                     return createLoginUser(userService.getStudentByUnionId(identification));
                 }