Commit 9d9b811e by 陶光胜

登陆接口

parent 131a0920
......@@ -27,7 +27,8 @@ import org.springframework.context.annotation.ImportResource;
"classpath*:dubbo-setting.xml",
"classpath*:dubbo-gic-platform-auth-web.xml",
"classpath*:spring-interceptor.xml",
"classpath*:redis-init.xml"
"classpath*:redis-init.xml",
"classpath:web-common-spring.xml"
})
public class Main {
......
......@@ -4,12 +4,15 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.service.UserApiService;
import com.gic.commons.util.Md5Util;
import com.gic.commons.util.ToolUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.utils.UserDetail;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.redis.data.util.RedisUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.LogManager;
......@@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@RestController
public class LoginController {
......@@ -84,6 +88,7 @@ public class LoginController {
if(enterpriseDTO != null){
userDetail.setEnterpriseId(enterpriseDTO.getEnterpriseId());
userDetail.setEnterpriseInfo(enterpriseDTO);
UserDetailUtils.setUserDetail(userDetail);
return RestResponse.success(userDetail);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment