Maxkey v1.0 GA

Maxkey v1.0 GA
This commit is contained in:
shimingxy
2019-11-09 22:53:27 +08:00
parent b1e194ca0c
commit c07aea5788
69 changed files with 1198 additions and 2466 deletions

View File

@@ -1,6 +1,9 @@
package org.maxkey;
import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.PropertySource;
@@ -20,4 +23,13 @@ public class MaxKeyConfig {
this.port = port;
}
@Bean
public FilterRegistrationBean<TokenEndpointAuthenticationFilter> TokenEndpointAuthenticationFilter() {
FilterRegistrationBean<TokenEndpointAuthenticationFilter> registration = new FilterRegistrationBean<TokenEndpointAuthenticationFilter>();
registration.setFilter(new TokenEndpointAuthenticationFilter());
registration.addUrlPatterns("/oauth/v20/token/*");
registration.setName("TokenEndpointAuthenticationFilter");
registration.setOrder(1);
return registration;
}
}

View File

@@ -44,7 +44,7 @@ public class AppListController{
AccountsService appUsersService;
@Autowired
AppsService applicationsService;
AppsService appsService;
@RequestMapping(value={"/appList"})
public ModelAndView appList(@RequestParam(value="gridList",required = false) String gridList) {
@@ -210,7 +210,7 @@ public class AppListController{
@RequestParam("identity_password") String identity_password
){
Apps app=applicationsService.get(appId);
Apps app=appsService.get(appId);
UserInfo userInfo=WebContext.getUserInfo();
Accounts appUsers=new Accounts();

View File

@@ -37,9 +37,7 @@ public class ProfileController {
@RequestMapping(value={"/myProfile"})
public ModelAndView forwardBasic(){
ModelAndView modelAndView=new ModelAndView("profile/myProfile");
UserInfo userInfo=new UserInfo();
userInfo.setId(WebContext.getUserInfo().getId());
userInfo=userInfoService.load(userInfo);
UserInfo userInfo=userInfoService.loadByUsername(WebContext.getUserInfo().getUsername());
WebContext.getSession().setAttribute(userInfo.getId(), userInfo.getPicture());
// HashMap<String,Object>extraAttributeMap=new HashMap<String,Object>();