Skip to content

Commit

Permalink
perf($Project): abstract common configuration into custom starter
Browse files Browse the repository at this point in the history
Added 2 new modules:
 - muscle-and-fitness-server-spring-boot-starter
 - muscle-and-fitness-server-reactive-spring-boot-starter

BREAKING CHANGE: abstract common configuration into custom starter
  • Loading branch information
johnnymillergh committed Dec 13, 2020
1 parent f5378f9 commit 6a0a379
Show file tree
Hide file tree
Showing 92 changed files with 343 additions and 3,364 deletions.
5 changes: 4 additions & 1 deletion api-portal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@
<dependency>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>muscle-and-fitness-server-spring-boot-starter</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.jmsoftware.maf.apiportal;

import com.jmsoftware.maf.apiportal.universal.configuration.ProjectProperty;
import com.jmsoftware.maf.apiportal.universal.configuration.ServerConfiguration;
import com.jmsoftware.maf.muscleandfitnessserverspringbootstarter.helper.IpHelper;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.boot.SpringApplication;
Expand All @@ -28,11 +28,11 @@
public class ApiPortalApplication {
private static final String LINE_SEPARATOR = System.lineSeparator();
private static ProjectProperty projectProperty;
private static ServerConfiguration serverConfiguration;
private static IpHelper ipHelper;

public ApiPortalApplication(ProjectProperty projectProperty, ServerConfiguration serverConfiguration) {
public ApiPortalApplication(ProjectProperty projectProperty, IpHelper ipHelper) {
ApiPortalApplication.projectProperty = projectProperty;
ApiPortalApplication.serverConfiguration = serverConfiguration;
ApiPortalApplication.ipHelper = ipHelper;
}

public static void main(String[] args) {
Expand All @@ -45,8 +45,8 @@ public static void main(String[] args) {
log.info("⚙️ Environment: {}", projectProperty.getEnvironment());
log.info("⏳ Deployment duration: {} seconds ({} ms)", duration.getSeconds(), duration.toMillis());
log.info("⏰ App started at {} (timezone - {})", endInstant, TimeZone.getDefault().getDisplayName());
log.info("{} App running at{} - Local: http://localhost:{}{}/{} - Network: {}/",
LINE_SEPARATOR, LINE_SEPARATOR, serverConfiguration.getServerPort(), projectProperty.getContextPath(),
LINE_SEPARATOR, serverConfiguration.getBaseUrl());
log.info("{} App running at{} - Local: http://localhost:{}{}/{} - Network: {}/{}",
LINE_SEPARATOR, LINE_SEPARATOR, ipHelper.getServerPort(), projectProperty.getContextPath(),
LINE_SEPARATOR, ipHelper.getPublicIp(),projectProperty.getContextPath());
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.jmsoftware.maf.apiportal.remoteapi;

import com.jmsoftware.maf.apiportal.universal.aspect.ValidateArgument;
import com.jmsoftware.maf.common.bean.ResponseBodyBean;
import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListPayload;
import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse;
Expand All @@ -13,6 +12,7 @@
import com.jmsoftware.maf.common.domain.authcenter.user.SaveUserForRegisteringPayload;
import com.jmsoftware.maf.common.domain.authcenter.user.SaveUserForRegisteringResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

Expand All @@ -26,6 +26,7 @@
* @author Johnny Miller (鍾俊), email: johnnysviva@outlook.com
* @date 5/10/20 4:50 PM
*/
@Validated
@FeignClient(name = "auth-center")
public interface AuthCenterRemoteApi {
/**
Expand All @@ -34,7 +35,6 @@ public interface AuthCenterRemoteApi {
* @param payload the payload
* @return the user by login token
*/
@ValidateArgument
@PostMapping("/user-remote-api/get-user-by-login-token")
ResponseBodyBean<GetUserByLoginTokenResponse> getUserByLoginToken(@Valid @RequestBody GetUserByLoginTokenPayload payload);

Expand All @@ -44,7 +44,6 @@ public interface AuthCenterRemoteApi {
* @param payload the payload
* @return the role list by user id
*/
@ValidateArgument
@PostMapping("/role-remote-api/get-role-list-by-user-id")
ResponseBodyBean<GetRoleListByUserIdResponse> getRoleListByUserId(@Valid @RequestBody GetRoleListByUserIdPayload payload);

Expand All @@ -54,7 +53,6 @@ public interface AuthCenterRemoteApi {
* @param payload the payload
* @return the response body bean
*/
@ValidateArgument
@PostMapping("/user-remote-api/save-user-for-registering")
ResponseBodyBean<SaveUserForRegisteringResponse> saveUserForRegistering(@Valid @RequestBody SaveUserForRegisteringPayload payload);

Expand All @@ -64,7 +62,6 @@ public interface AuthCenterRemoteApi {
* @param payload the payload
* @return the permission list by role id list
*/
@ValidateArgument
@PostMapping("/permission-remote-api/get-permission-list-by-role-id-list")
ResponseBodyBean<GetPermissionListByRoleIdListResponse> getPermissionListByRoleIdList(@Valid @RequestBody GetPermissionListByRoleIdListPayload payload);

Expand All @@ -74,7 +71,6 @@ public interface AuthCenterRemoteApi {
* @param payload the payload
* @return the response body bean
*/
@ValidateArgument
@PostMapping("/permission-remote-api/get-permission-list-by-user-id")
ResponseBodyBean<GetPermissionListByUserIdResponse> getPermissionListByUserId(@Valid @RequestBody GetPermissionListByUserIdPayload payload);
}

This file was deleted.

Loading

0 comments on commit 6a0a379

Please sign in to comment.