productDev/dmvisit.git

			@@ -167,6 +167,7 @@
			user.setSalt(salt);
			// 创建用户记录
			user.setType(insert.getType());
			user.setAvatar(insert.getFaceImg());
			user.setUsername(insert.getPhone());
			user.setEmpNo(insert.getCode());
			user.setRealname(insert.getName());
			@@ -444,11 +445,15 @@
			member.setHkOrgId(company.getHkId());
			isNeedUpdateUser = true;
			}
			if(StringUtils.isNotBlank(model.getFaceImg())){
			isNeedUpdateUser=true;
			}
			if(isNeedUpdateUser){
			//更新系统用户账号信息
			systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
			.set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
			.set(SystemUser::getUpdateTime,new Date())
			.set(StringUtils.isNotBlank(model.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
			.set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
			.set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
			.set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
			@@ -1584,6 +1589,7 @@
			if(!Objects.isNull(tokenJson.get("access_token"))){
			openId = tokenJson.getString("openid");
			}
			// String openId = "12345";
			WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
			wxAuthorizeVO.setOpenid(openId);
			//根据openId 查询用户信息
			@@ -1610,11 +1616,11 @@
			String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
			systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
			member.setPrefixUrl(prefixUrl);
			JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
			String token = JwtTokenUtil.generateToken(payLoad);
			//存储token至redis
			RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
			wxAuthorizeVO.setToken(token);
			// JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
			// String token = JwtTokenUtil.generateToken(payLoad);
			// //存储token至redis
			// RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
			// wxAuthorizeVO.setToken(token);
			wxAuthorizeVO.setMember(member);
			}
			return wxAuthorizeVO;