MaxKey il y a 3 ans
Parent
commit
25fad62dc0

+ 3 - 3
maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/InstitutionEndpoint.java

@@ -51,9 +51,9 @@ public class InstitutionEndpoint {
  	@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> get(
 			HttpServletRequest request,
-			@RequestHeader("Origin") String originURL,
-			@RequestHeader(HEADER_HOSTNAME) String headerHostName,
-			@RequestHeader(HEADER_HOST) String headerHost) {
+			@RequestHeader(value = "Origin",required=false) String originURL,
+			@RequestHeader(value = HEADER_HOSTNAME,required=false) String headerHostName,
+			@RequestHeader(value = HEADER_HOST,required=false) String headerHost) {
  		_logger.debug("get Institution" );
  		
 		String host = headerHostName;

+ 1 - 1
maxkey-core/src/main/java/org/maxkey/constants/ConstsOperateAction.java

@@ -50,8 +50,8 @@ public final class ConstsOperateAction {
     static {
     	statusActon= new ConcurrentHashMap<Integer,String>();
     	statusActon.put(ConstsStatus.ACTIVE, ENABLE);
-    	statusActon.put(ConstsStatus.DISABLED, DISABLE);
     	statusActon.put(ConstsStatus.INACTIVE, INACTIVE);
+    	statusActon.put(ConstsStatus.DISABLED, DISABLE);
     	statusActon.put(ConstsStatus.LOCK, LOCK);
     	statusActon.put(ConstsStatus.UNLOCK, UNLOCK);
     	statusActon.put(ConstsStatus.DELETE, DELETE);