Commit f05b7b0a authored by wangsong's avatar wangsong

change data

parent 023eac58
...@@ -7,7 +7,7 @@ import org.springframework.boot.web.support.SpringBootServletInitializer; ...@@ -7,7 +7,7 @@ import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
@AlphaFrameworkApplication @AlphaFrameworkApplication
@ComponentScan(basePackages = {"com.chineseall.eden.authcenter.agent","com.chineseall.eden.authcenter.log"}) @ComponentScan(basePackages = {"com.chineseall.eden.authcenter.agent","com.chineseall.eden.authcenter.log","com.chineseall.eden.authcenter.config"})
public class EdenAuthcenterAgentApplication extends SpringBootServletInitializer { public class EdenAuthcenterAgentApplication extends SpringBootServletInitializer {
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
......
...@@ -10,6 +10,6 @@ public class ClientDataInfo { ...@@ -10,6 +10,6 @@ public class ClientDataInfo {
private String returnUrl; private String returnUrl;
private OauthType oauthType; private String oauthType;
} }
...@@ -321,7 +321,7 @@ public class UcenterController { ...@@ -321,7 +321,7 @@ public class UcenterController {
authLog.setLogUserInfo(logUserInfo); authLog.setLogUserInfo(logUserInfo);
} }
clientDataInfo.setAuthUserInfo(userInfo); clientDataInfo.setAuthUserInfo(userInfo);
clientDataInfo.setOauthType(OauthType.valueOf(oauthType)); clientDataInfo.setOauthType(oauthType);
modelAndView.addObject("clientDataInfo", clientDataInfo); modelAndView.addObject("clientDataInfo", clientDataInfo);
modelAndView.addObject("successPostUrl", returnUrl); modelAndView.addObject("successPostUrl", returnUrl);
...@@ -393,7 +393,7 @@ public class UcenterController { ...@@ -393,7 +393,7 @@ public class UcenterController {
authLog.setLogUserInfo(logUserInfo); authLog.setLogUserInfo(logUserInfo);
} }
clientDataInfo.setAuthUserInfo(userInfo); clientDataInfo.setAuthUserInfo(userInfo);
clientDataInfo.setOauthType(OauthType.valueOf(oauthType)); clientDataInfo.setOauthType(oauthType);
modelAndView.addObject("clientDataInfo", clientDataInfo); modelAndView.addObject("clientDataInfo", clientDataInfo);
modelAndView.addObject("successPostUrl", returnUrl); modelAndView.addObject("successPostUrl", returnUrl);
......
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