Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 830a29cc 830a29cc0b8a081a0bc587171094d82f96c0cd57 by xianghan
Options

1.海南vis历史数据昵称进行base64加密处理

1 parent 74d95364
Inline Side-by-side
Showing 1 changed file with 10 additions and 15 deletions
...@@ -23,6 +23,7 @@ import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq; ...@@ -23,6 +23,7 @@ import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
23 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo; 23 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
24 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin; 24 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
25 import com.topdraw.common.ResultInfo; 25 import com.topdraw.common.ResultInfo;
26 import com.topdraw.util.Base64Util;
26 import com.topdraw.util.TimestampUtil; 27 import com.topdraw.util.TimestampUtil;
27 import com.topdraw.utils.StringUtils; 28 import com.topdraw.utils.StringUtils;
28 import com.topdraw.utils.ValidationUtil; 29 import com.topdraw.utils.ValidationUtil;
...@@ -214,10 +215,10 @@ public class UserAppServiceImpl implements UserAppService { ...@@ -214,10 +215,10 @@ public class UserAppServiceImpl implements UserAppService {
214 Long id = visUserDTO.getId(); 215 Long id = visUserDTO.getId();
215 userAppIdManual.setId(id); 216 userAppIdManual.setId(id);
216 217
217 userAppIdManual.setUsername(StringUtils.isBlank(username) ? resources.getUsername() : username); 218 // vis 手机号
218
219 String cellphone = visUserDTO.getCellphone(); 219 String cellphone = visUserDTO.getCellphone();
220 userAppIdManual.setCellphone(StringUtils.isBlank(cellphone) ? resources.getUsername() : cellphone); 220 userAppIdManual.setUsername(StringUtils.isBlank(cellphone) ? null : cellphone);
221 userAppIdManual.setCellphone(StringUtils.isBlank(cellphone) ? null : cellphone);
221 222
222 String nickname = visUserDTO.getNickname(); 223 String nickname = visUserDTO.getNickname();
223 userAppIdManual.setNickname(StringUtils.isBlank(nickname) ? resources.getNickname() : nickname); 224 userAppIdManual.setNickname(StringUtils.isBlank(nickname) ? resources.getNickname() : nickname);
...@@ -298,11 +299,9 @@ public class UserAppServiceImpl implements UserAppService { ...@@ -298,11 +299,9 @@ public class UserAppServiceImpl implements UserAppService {
298 Long id = visUserDTO.getId(); 299 Long id = visUserDTO.getId();
299 userAppIdManual.setId(id); 300 userAppIdManual.setId(id);
300 301
301 String username = visUserDTO.getUsername();
302 userAppIdManual.setUsername(StringUtils.isBlank(username) ? resources.getUsername() : username);
303
304 String cellphone = visUserDTO.getCellphone(); 302 String cellphone = visUserDTO.getCellphone();
305 userAppIdManual.setCellphone(StringUtils.isBlank(cellphone) ? resources.getUsername() : cellphone); 303 userAppIdManual.setUsername(StringUtils.isBlank(cellphone) ? null : cellphone);
304 userAppIdManual.setCellphone(StringUtils.isBlank(cellphone) ? null : cellphone);
306 305
307 String nickname = visUserDTO.getNickname(); 306 String nickname = visUserDTO.getNickname();
308 userAppIdManual.setNickname(StringUtils.isBlank(nickname) ? resources.getNickname() : nickname); 307 userAppIdManual.setNickname(StringUtils.isBlank(nickname) ? resources.getNickname() : nickname);
...@@ -385,11 +384,9 @@ public class UserAppServiceImpl implements UserAppService { ...@@ -385,11 +384,9 @@ public class UserAppServiceImpl implements UserAppService {
385 Long id = visUserDTO.getId(); 384 Long id = visUserDTO.getId();
386 userAppIdManual.setId(id); 385 userAppIdManual.setId(id);
387 386
388 String username = visUserDTO.getUsername();
389 userAppIdManual.setUsername(StringUtils.isBlank(username) ? resources.getUsername() : username);
390
391 String cellphone = visUserDTO.getCellphone(); 387 String cellphone = visUserDTO.getCellphone();
392 userAppIdManual.setCellphone(StringUtils.isBlank(cellphone) ? resources.getUsername() : cellphone); 388 userAppIdManual.setUsername(StringUtils.isBlank(cellphone) ? null : cellphone);
389 userAppIdManual.setCellphone(StringUtils.isBlank(cellphone) ? null : cellphone);
393 390
394 String nickname = visUserDTO.getNickname(); 391 String nickname = visUserDTO.getNickname();
395 userAppIdManual.setNickname(StringUtils.isBlank(nickname) ? resources.getNickname() : nickname); 392 userAppIdManual.setNickname(StringUtils.isBlank(nickname) ? resources.getNickname() : nickname);
...@@ -472,11 +469,9 @@ public class UserAppServiceImpl implements UserAppService { ...@@ -472,11 +469,9 @@ public class UserAppServiceImpl implements UserAppService {
472 Long id = visUserDTO.getId(); 469 Long id = visUserDTO.getId();
473 userAppIdManual.setId(id); 470 userAppIdManual.setId(id);
474 471
475 String username = visUserDTO.getUsername();
476 userAppIdManual.setUsername(StringUtils.isBlank(username) ? resources.getUsername() : username);
477
478 String cellphone = visUserDTO.getCellphone(); 472 String cellphone = visUserDTO.getCellphone();
479 userAppIdManual.setCellphone(StringUtils.isBlank(cellphone) ? resources.getUsername() : cellphone); 473 userAppIdManual.setUsername(StringUtils.isBlank(cellphone) ? null : cellphone);
474 userAppIdManual.setCellphone(StringUtils.isBlank(cellphone) ? null : cellphone);
480 475
481 String nickname = visUserDTO.getNickname(); 476 String nickname = visUserDTO.getNickname();
482 userAppIdManual.setNickname(StringUtils.isBlank(nickname) ? resources.getNickname() : nickname); 477 userAppIdManual.setNickname(StringUtils.isBlank(nickname) ? resources.getNickname() : nickname);
......