diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java index a65953d0d..dee12d97f 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java @@ -43,8 +43,10 @@ public class ApplicationConfig { @Autowired EmailConfig emailConfig; + @Autowired CharacterEncodingConfig characterEncodingConfig; + @Autowired LoginConfig loginConfig; @@ -82,36 +84,9 @@ public class ApplicationConfig { public void setPort(int port) { this.port = port; } - /* - * //is enable whiteList for ipAddress filter boolean whiteList; - * - * //All user have permission Access URL public ConcurrentHashMap - * anonymousAccessUrls; - */ public ApplicationConfig() { super(); - - /* - * anonymousAccessUrls=new ConcurrentHashMap(); - * anonymousAccessUrls.put("/index/", "/index/"); - * anonymousAccessUrls.put("/index/top","/index/top/"); - * anonymousAccessUrls.put("/index/left/","/index/left/"); - * anonymousAccessUrls.put("/index/main/","/index/main/"); - * anonymousAccessUrls.put("/index/bottom/","/index/bottom/"); - * - * anonymousAccessUrls.put("/menus/onelevelchild/","/menus/onelevelchild/"); - * anonymousAccessUrls.put("/menus/leftchild/","/menus/leftchild/"); - * anonymousAccessUrls.put("/menus/loadMenu/","/menus/loadMenu/"); - * - * anonymousAccessUrls.put("/enterprises/select/","/enterprises/select/"); - * anonymousAccessUrls.put("/employees/selectAppRoles/", - * "/employees/selectAppRoles/"); - * anonymousAccessUrls.put("/approles/appRolesGrid/","/approles/appRolesGrid/"); - * - * _logger.debug("Anonymous Access Urls : \n"+anonymousAccessUrls); - */ - } /** @@ -182,15 +157,6 @@ public class ApplicationConfig { this.subDomainName = subDomainName; } - /* - * public ConcurrentHashMap getAnonymousAccessUrls() { return - * anonymousAccessUrls; } - * - * public void setAnonymousAccessUrls(ArrayList anonymousAccessUrls) { - * //this.anonymousAccessUrls = anonymousAccessUrls; for (String - * anonymousAccessUrl: anonymousAccessUrls){ - * this.anonymousAccessUrls.put(anonymousAccessUrl,anonymousAccessUrl); } } - */ /** * @return the emailConfig */ @@ -237,10 +203,4 @@ public class ApplicationConfig { this.maxKeyUri = maxKeyUri; } - /* - * public boolean isWhiteList() { return whiteList; } - * - * public void setWhiteList(boolean whiteList) { this.whiteList = whiteList; } - */ - } diff --git a/maxkey-identitys/maxkey-identity-kafka/build.gradle b/maxkey-identitys/maxkey-identity-kafka/build.gradle index 0cd304087..749e3f01c 100644 --- a/maxkey-identitys/maxkey-identity-kafka/build.gradle +++ b/maxkey-identitys/maxkey-identity-kafka/build.gradle @@ -1,8 +1,6 @@ description = "maxkey-identity-kafka" apply plugin: 'java' -apply plugin: 'eclipse-wtp' - dependencies { //local jars diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityAction.java b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityAction.java index 751b9a041..af2afb303 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityAction.java +++ b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityAction.java @@ -19,9 +19,12 @@ package org.maxkey.identity.kafka; public class KafkaIdentityAction { - public static String CREATE_ACTION = "CREATE_ACTION"; - public static String DELETE_ACTION = "DELETE_ACTION"; - public static String UPDATE_ACTION = "UPDATE_ACTION"; - public static String PASSWORD_ACTION = "PASSWORD_ACTION"; + public static String CREATE_ACTION = "CREATE_ACTION"; + + public static String DELETE_ACTION = "DELETE_ACTION"; + + public static String UPDATE_ACTION = "UPDATE_ACTION"; + + public static String PASSWORD_ACTION = "PASSWORD_ACTION"; } diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityTopic.java b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityTopic.java index 111a6a39e..f442f24b7 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityTopic.java +++ b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityTopic.java @@ -19,9 +19,12 @@ package org.maxkey.identity.kafka; public class KafkaIdentityTopic { - public final static String USERINFO_TOPIC = "IDENTITY_USERINFO_TOPIC"; - public final static String ORG_TOPIC = "IDENTITY_ORG_TOPIC"; - public final static String GROUP_TOPIC = "IDENTITY_GROUP_TOPIC"; + public final static String USERINFO_TOPIC = "IDENTITY_USERINFO_TOPIC"; + + public final static String ORG_TOPIC = "IDENTITY_ORG_TOPIC"; + + public final static String GROUP_TOPIC = "IDENTITY_GROUP_TOPIC"; + public final static String PASSWORD_TOPIC = "IDENTITY_PASSWORD_TOPIC"; diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaMessage.java b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaMessage.java index 321da188f..558560206 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaMessage.java +++ b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaMessage.java @@ -18,42 +18,53 @@ package org.maxkey.identity.kafka; public class KafkaMessage { + String topic; String actionType; String sendTime; String msgId; String content; - + public String getTopic() { return topic; } + public void setTopic(String topic) { this.topic = topic; } + public String getActionType() { return actionType; } + public void setActionType(String actionType) { this.actionType = actionType; } + public String getSendTime() { return sendTime; } + public void setSendTime(String sendTime) { this.sendTime = sendTime; } + public String getMsgId() { return msgId; } + public void setMsgId(String msgId) { this.msgId = msgId; } + public Object getContent() { return content; } + public void setContent(String content) { this.content = content; } + public KafkaMessage() { } } diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java index 3e85bd06e..3de0229fc 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java +++ b/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java @@ -47,13 +47,23 @@ public class KafkaProvisioningService { this.kafkaTemplate = kafkaTemplate; } + /** + * send msg to kafka + * @param topic kafka TOPIC + * @param content msg Object + * @param actionType CREATE UPDATE DELETE + */ public void send(String topic,Object content,String actionType) { + //config.identity.kafkasupport , if true if(applicationConfig.isKafkaSupport()) { KafkaMessage message = new KafkaMessage(); + //message id uuid message.setMsgId(UUID.randomUUID().toString()); message.setActionType(actionType); message.setTopic(topic); + //send to kafka time message.setSendTime(DateUtils.getCurrentDateTimeAsString()); + //content Object to json message content message.setContent(JsonUtils.gson2Json(content)); String msg = JsonUtils.gson2Json(message); _logger.info("send message = {}", msg); @@ -67,6 +77,10 @@ public class KafkaProvisioningService { + /** + * KafkaProvisioningThread for send message + * + */ class KafkaProvisioningThread extends Thread{ KafkaTemplate kafkaTemplate; @@ -75,15 +89,22 @@ public class KafkaProvisioningService { String msg; - public KafkaProvisioningThread(KafkaTemplate kafkaTemplate, String topic, String msg) { + public KafkaProvisioningThread( + KafkaTemplate kafkaTemplate, + String topic, + String msg) { + this.kafkaTemplate = kafkaTemplate; this.topic = topic; this.msg = msg; + } @Override public void run() { + kafkaTemplate.send(topic, msg); + } } diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiOrgController.java b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java similarity index 98% rename from maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiOrgController.java rename to maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java index 5b3061b40..d3ffc4686 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiOrgController.java +++ b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java @@ -35,7 +35,7 @@ import org.springframework.web.util.UriComponentsBuilder; @Controller @RequestMapping(value={"/identity/api/org"}) -public class RestApiOrgController { +public class RestOrganizationController { @Autowired OrganizationsService organizationsService; diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiUserInfoController.java b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java similarity index 98% rename from maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiUserInfoController.java rename to maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java index a7f63ac1e..c3db68454 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestApiUserInfoController.java +++ b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java @@ -36,7 +36,7 @@ import org.springframework.web.util.UriComponentsBuilder; @Controller @RequestMapping(value={"/identity/api/userinfo"}) -public class RestApiUserInfoController { +public class RestUserInfoController { @Autowired @Qualifier("userInfoService") diff --git a/maxkey-identitys/maxkey-identity-scim/build.gradle b/maxkey-identitys/maxkey-identity-scim/build.gradle index 04f2e2063..ae9bf03bb 100644 --- a/maxkey-identitys/maxkey-identity-scim/build.gradle +++ b/maxkey-identitys/maxkey-identity-scim/build.gradle @@ -1,8 +1,6 @@ description = "maxkey-identity-scim" apply plugin: 'java' -apply plugin: 'eclipse-wtp' - dependencies { //local jars