shimingxy 5 년 전
부모
커밋
0c16b11dc6

+ 11 - 0
maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java

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

+ 3 - 2
maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java

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

BIN
maxkey-web-manage/src/main/resources/config/samlServerKeystore.jks


BIN
maxkey-web-maxkey/src/main/resources/config/samlServerKeystore.jks