|
|
@ -24,12 +24,14 @@ import cn.hutool.core.util.StrUtil;
|
|
|
|
import cn.hutool.http.HttpUtil;
|
|
|
|
import cn.hutool.http.HttpUtil;
|
|
|
|
import cn.hutool.json.JSONObject;
|
|
|
|
import cn.hutool.json.JSONObject;
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -161,7 +163,9 @@ public class CommonService implements ICommonService {
|
|
|
|
userDTO.setUsername(client.getNickName());
|
|
|
|
userDTO.setUsername(client.getNickName());
|
|
|
|
userDTO.setToken(this.createToken(userDTO));
|
|
|
|
userDTO.setToken(this.createToken(userDTO));
|
|
|
|
|
|
|
|
|
|
|
|
// userDTO.setIsClientUnit( clientService.isClientUnit(userDTO.getPhone()));
|
|
|
|
userDTO.setClientType(client.getClientType());
|
|
|
|
|
|
|
|
userDTO.setClientUnitName(client.getClientUnitName());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return userDTO;
|
|
|
|
return userDTO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|