This commit is contained in:
shimingxy 2020-06-25 18:00:01 +08:00
parent 78e3a93413
commit 0c16b11dc6
4 changed files with 14 additions and 2 deletions

View File

@ -55,6 +55,9 @@ public class ApplicationConfig {
@Value("${config.identity.kafkasupport:false}") @Value("${config.identity.kafkasupport:false}")
private boolean kafkaSupport; private boolean kafkaSupport;
@Value("${config.maxkey.uri}")
private String maxKeyUri;
public int getPort() { public int getPort() {
return port; return port;
} }
@ -209,6 +212,14 @@ public class ApplicationConfig {
this.kafkaSupport = kafkaSupport; this.kafkaSupport = kafkaSupport;
} }
public String getMaxKeyUri() {
return maxKeyUri;
}
public void setMaxKeyUri(String maxKeyUri) {
this.maxKeyUri = maxKeyUri;
}
/* /*
* public boolean isWhiteList() { return whiteList; } * public boolean isWhiteList() { return whiteList; }
* *

View File

@ -7,6 +7,7 @@ import java.security.cert.X509Certificate;
import java.util.List; import java.util.List;
import org.maxkey.authz.saml20.metadata.MetadataDescriptorUtil; import org.maxkey.authz.saml20.metadata.MetadataDescriptorUtil;
import org.maxkey.configuration.ApplicationConfig;
import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsOperateMessage;
import org.maxkey.constants.ConstantsProtocols; import org.maxkey.constants.ConstantsProtocols;
import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.ReciprocalUtils;
@ -47,7 +48,7 @@ public class SAML20DetailsController extends BaseAppContorller {
AppsSaml20DetailsService saml20DetailsService; AppsSaml20DetailsService saml20DetailsService;
@Autowired @Autowired
String maxKeyURI; ApplicationConfig applicationConfig;
@RequestMapping(value = { "/forwardAdd" }) @RequestMapping(value = { "/forwardAdd" })
public ModelAndView forwardAdd() { public ModelAndView forwardAdd() {
@ -87,7 +88,7 @@ public class SAML20DetailsController extends BaseAppContorller {
decoderSecret(saml20Details); decoderSecret(saml20Details);
WebContext.setAttribute(saml20Details.getId(), saml20Details.getIcon()); WebContext.setAttribute(saml20Details.getId(), saml20Details.getIcon());
modelAndView.addObject("model",saml20Details); modelAndView.addObject("model",saml20Details);
modelAndView.addObject("maxKeyURI",maxKeyURI); modelAndView.addObject("maxKeyURI",applicationConfig.getMaxKeyUri());
return modelAndView; return modelAndView;
} }
/** /**