|
|
@@ -10,6 +10,7 @@ import com.fs.common.core.domain.ResponseResult;
|
|
|
import com.fs.common.core.domain.entity.SysRole;
|
|
|
import com.fs.common.core.domain.entity.SysUser;
|
|
|
import com.fs.common.exception.CustomException;
|
|
|
+import com.fs.common.utils.CloudHostUtils;
|
|
|
import com.fs.common.utils.ParseUtils;
|
|
|
import com.fs.common.utils.SecurityUtils;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
@@ -253,7 +254,9 @@ public class FsUserController extends BaseController
|
|
|
public AjaxResult getInfo(@PathVariable("userId") Long userId)
|
|
|
{
|
|
|
FsUser fsUser = fsUserService.selectFsUserByUserId(userId);
|
|
|
- fsUser.setPhone(decryptAutoPhoneMk(fsUser.getPhone()));
|
|
|
+ if(!CloudHostUtils.hasCloudHostName("广州郑多燕")) {
|
|
|
+ fsUser.setPhone(decryptAutoPhoneMk(fsUser.getPhone()));
|
|
|
+ }
|
|
|
return AjaxResult.success(fsUser);
|
|
|
}
|
|
|
|
|
|
@@ -262,16 +265,17 @@ public class FsUserController extends BaseController
|
|
|
{
|
|
|
|
|
|
List<FsUserAddress> fsUserAddresses = fsUserService.selectFsUserAddressByUserId(userId);
|
|
|
- for (FsUserAddress fsUserAddress : fsUserAddresses) {
|
|
|
- if (fsUserAddress.getPhone()!=null&&fsUserAddress.getPhone()!=""){
|
|
|
- if (fsUserAddress.getPhone().length()>11){
|
|
|
- fsUserAddress.setPhone(decryptPhoneMk(fsUserAddress.getPhone()));
|
|
|
- }else {
|
|
|
- fsUserAddress.setPhone(fsUserAddress.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
|
|
|
+ if(!CloudHostUtils.hasCloudHostName("广州郑多燕")) {
|
|
|
+ for (FsUserAddress fsUserAddress : fsUserAddresses) {
|
|
|
+ if (fsUserAddress.getPhone() != null && fsUserAddress.getPhone() != "") {
|
|
|
+ if (fsUserAddress.getPhone().length() > 11) {
|
|
|
+ fsUserAddress.setPhone(decryptPhoneMk(fsUserAddress.getPhone()));
|
|
|
+ } else {
|
|
|
+ fsUserAddress.setPhone(fsUserAddress.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
return AjaxResult.success(fsUserAddresses);
|
|
|
}
|
|
|
|