perf($ApiGateway): rename module Gateway to API Gateway

- remove module `API Portal` - rename module `Gateway` to `API Gateway` BREAKING CHANGE: remove module `API Portal`; rename module `Gateway` to `API Gateway`
johnnymillergh · Dec 22, 2020 · c367ca3 · c367ca3
1 parent d29ba21
commit c367ca3
Show file tree

Hide file tree

Showing 131 changed files with 100 additions and 4,662 deletions.
diff --git a/gateway/README.md → api-gateway/README.md b/gateway/README.md → api-gateway/README.md
diff --git a/api-portal/auto-run-windows.cmd → api-gateway/auto-run-windows.cmd b/api-portal/auto-run-windows.cmd → api-gateway/auto-run-windows.cmd
diff --git a/gateway/pom.xml → api-gateway/pom.xml b/gateway/pom.xml → api-gateway/pom.xml
@@ -4,9 +4,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Sub-module Basics -->
-    <artifactId>gateway</artifactId>
-    <name>Muscle and Fitness Server :: Gateway</name>
-    <description>Gateway for Muscle and Fitness microservices.</description>
+    <artifactId>api-gateway</artifactId>
+    <name>Muscle and Fitness Server :: API Gateway</name>
+    <description>API Gateway for Muscle and Fitness microservices.</description>
     <parent>
         <groupId>com.jmsoftware.maf</groupId>
         <artifactId>muscle-and-fitness-server</artifactId>
@@ -62,7 +62,7 @@
                             <jvmFlag>-Dfile.encoding=${project.build.sourceEncoding}</jvmFlag>
                         </jvmFlags>
                         <ports>
-                            <port>${gateway.port}</port>
+                            <port>${api-gateway.port}</port>
                         </ports>
                         <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
                     </container>

diff --git a/...tware/maf/gateway/GatewayApplication.java → ...maf/apigateway/ApiGatewayApplication.java b/...tware/maf/gateway/GatewayApplication.java → ...maf/apigateway/ApiGatewayApplication.java
@@ -1,7 +1,7 @@
-package com.jmsoftware.maf.gateway;
+package com.jmsoftware.maf.apigateway;
 
-import com.jmsoftware.maf.gateway.universal.configuration.ProjectProperty;
-import com.jmsoftware.maf.gateway.universal.configuration.ServerConfiguration;
+import com.jmsoftware.maf.apigateway.universal.configuration.ProjectProperty;
+import com.jmsoftware.maf.apigateway.universal.configuration.ServerConfiguration;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.boot.SpringApplication;
@@ -15,31 +15,30 @@
 import java.util.TimeZone;
 
 /**
- * <h1>GatewayApplication</h1>
+ * <h1>ApiGatewayApplication</h1>
  * <p>
  * Change description here.
  *
- * @author Johnny Miller (锺俊), email: johnnysviva@outlook.com
- * @date 2/15/20 3:56 PM
+ * @author Johnny Miller (锺俊), email: johnnysviva@outlook.com, date: 12/22/2020 3:39 PM
  **/
 @Slf4j
 @EnableFeignClients
 @EnableDiscoveryClient
 @SpringBootApplication
 @EnableReactiveFeignClients
-public class GatewayApplication {
+public class ApiGatewayApplication {
     private static final String LINE_SEPARATOR = System.lineSeparator();
     private static ProjectProperty projectProperty;
     private static ServerConfiguration serverConfiguration;
 
-    public GatewayApplication(ProjectProperty projectProperty, ServerConfiguration serverConfiguration) {
-        GatewayApplication.projectProperty = projectProperty;
-        GatewayApplication.serverConfiguration = serverConfiguration;
+    public ApiGatewayApplication(ProjectProperty projectProperty, ServerConfiguration serverConfiguration) {
+        ApiGatewayApplication.projectProperty = projectProperty;
+        ApiGatewayApplication.serverConfiguration = serverConfiguration;
     }
 
     public static void main(String[] args) {
         val startInstant = Instant.now();
-        SpringApplication.run(GatewayApplication.class, args);
+        SpringApplication.run(ApiGatewayApplication.class, args);
         val endInstant = Instant.now();
         val duration = Duration.between(startInstant, endInstant);
         log.info("🥳 Congratulations! 🎉");

diff --git a/...ateway/remoteapi/AuthCenterRemoteApi.java → ...ateway/remoteapi/AuthCenterRemoteApi.java b/...ateway/remoteapi/AuthCenterRemoteApi.java → ...ateway/remoteapi/AuthCenterRemoteApi.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.remoteapi;
+package com.jmsoftware.maf.apigateway.remoteapi;
 
 import com.jmsoftware.maf.common.bean.ResponseBodyBean;
 import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByUserIdResponse;

diff --git a/...ity/GatewayServerAccessDeniedHandler.java → ...ity/GatewayServerAccessDeniedHandler.java b/...ity/GatewayServerAccessDeniedHandler.java → ...ity/GatewayServerAccessDeniedHandler.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import com.jmsoftware.maf.muscleandfitnessserverreactivespringbootstarter.util.ResponseUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...ity/JwtReactiveAuthenticationManager.java → ...ity/JwtReactiveAuthenticationManager.java b/...ity/JwtReactiveAuthenticationManager.java → ...ity/JwtReactiveAuthenticationManager.java
@@ -1,10 +1,10 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import cn.hutool.core.util.StrUtil;
+import com.jmsoftware.maf.apigateway.remoteapi.AuthCenterRemoteApi;
 import com.jmsoftware.maf.common.bean.ResponseBodyBean;
 import com.jmsoftware.maf.common.domain.authcenter.user.GetUserByLoginTokenResponse;
 import com.jmsoftware.maf.common.exception.BusinessException;
-import com.jmsoftware.maf.gateway.remoteapi.AuthCenterRemoteApi;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;

diff --git a/...ctiveServerSecurityContextRepository.java → ...ctiveServerSecurityContextRepository.java b/...ctiveServerSecurityContextRepository.java → ...ctiveServerSecurityContextRepository.java
@@ -1,7 +1,7 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import cn.hutool.core.util.StrUtil;
-import com.jmsoftware.maf.gateway.security.configuration.JwtConfiguration;
+import com.jmsoftware.maf.apigateway.security.configuration.JwtConfiguration;
 import com.jmsoftware.maf.muscleandfitnessserverreactivespringbootstarter.configuration.MafConfiguration;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...ware/maf/gateway/security/JwtService.java → ...e/maf/apigateway/security/JwtService.java b/...ware/maf/gateway/security/JwtService.java → ...e/maf/apigateway/security/JwtService.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import com.jmsoftware.maf.common.exception.SecurityException;
 import io.jsonwebtoken.Claims;

diff --git a/.../maf/gateway/security/JwtServiceImpl.java → ...f/apigateway/security/JwtServiceImpl.java b/.../maf/gateway/security/JwtServiceImpl.java → ...f/apigateway/security/JwtServiceImpl.java
@@ -1,13 +1,13 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.jmsoftware.maf.apigateway.security.configuration.JwtConfiguration;
+import com.jmsoftware.maf.apigateway.universal.configuration.Constants;
+import com.jmsoftware.maf.apigateway.universal.configuration.RedisService;
 import com.jmsoftware.maf.common.constant.HttpStatus;
 import com.jmsoftware.maf.common.exception.SecurityException;
-import com.jmsoftware.maf.gateway.security.configuration.JwtConfiguration;
-import com.jmsoftware.maf.gateway.universal.configuration.Constants;
-import com.jmsoftware.maf.gateway.universal.configuration.RedisService;
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.Keys;
 import lombok.RequiredArgsConstructor;

diff --git a/...ity/RbacReactiveAuthorizationManager.java → ...ity/RbacReactiveAuthorizationManager.java b/...ity/RbacReactiveAuthorizationManager.java → ...ity/RbacReactiveAuthorizationManager.java
@@ -1,10 +1,10 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import cn.hutool.core.util.StrUtil;
+import com.jmsoftware.maf.apigateway.remoteapi.AuthCenterRemoteApi;
 import com.jmsoftware.maf.common.bean.ResponseBodyBean;
 import com.jmsoftware.maf.common.domain.authcenter.permission.PermissionType;
 import com.jmsoftware.maf.common.exception.BusinessException;
-import com.jmsoftware.maf.gateway.remoteapi.AuthCenterRemoteApi;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;

diff --git a/...y/ServerAuthenticationEntryPointImpl.java → ...y/ServerAuthenticationEntryPointImpl.java b/...y/ServerAuthenticationEntryPointImpl.java → ...y/ServerAuthenticationEntryPointImpl.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import com.jmsoftware.maf.muscleandfitnessserverreactivespringbootstarter.util.ResponseUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...e/maf/gateway/security/UserPrincipal.java → ...af/apigateway/security/UserPrincipal.java b/...e/maf/gateway/security/UserPrincipal.java → ...af/apigateway/security/UserPrincipal.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;

diff --git a/...ecurity/WebFluxSecurityConfiguration.java → ...ecurity/WebFluxSecurityConfiguration.java b/...ecurity/WebFluxSecurityConfiguration.java → ...ecurity/WebFluxSecurityConfiguration.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.security;
+package com.jmsoftware.maf.apigateway.security;
 
 import com.jmsoftware.maf.muscleandfitnessserverreactivespringbootstarter.configuration.MafConfiguration;
 import com.jmsoftware.maf.muscleandfitnessserverreactivespringbootstarter.filter.AccessLogFilter;

diff --git a/...urity/configuration/JwtConfiguration.java → ...urity/configuration/JwtConfiguration.java b/...urity/configuration/JwtConfiguration.java → ...urity/configuration/JwtConfiguration.java
@@ -1,6 +1,6 @@
-package com.jmsoftware.maf.gateway.security.configuration;
+package com.jmsoftware.maf.apigateway.security.configuration;
 
-import com.jmsoftware.maf.gateway.universal.configuration.ProjectProperty;
+import com.jmsoftware.maf.apigateway.universal.configuration.ProjectProperty;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/...ay/universal/configuration/Constants.java → ...ay/universal/configuration/Constants.java b/...ay/universal/configuration/Constants.java → ...ay/universal/configuration/Constants.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.configuration;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

diff --git a/...versal/configuration/ProjectProperty.java → ...versal/configuration/ProjectProperty.java b/...versal/configuration/ProjectProperty.java → ...versal/configuration/ProjectProperty.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.apiportal.universal.configuration;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/.../configuration/RedirectConfiguration.java → .../configuration/RedirectConfiguration.java b/.../configuration/RedirectConfiguration.java → .../configuration/RedirectConfiguration.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.configuration;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;

diff --git a/...nfiguration/RedisClientConfiguration.java → ...nfiguration/RedisClientConfiguration.java b/...nfiguration/RedisClientConfiguration.java → ...nfiguration/RedisClientConfiguration.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.configuration;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;

diff --git a/...ortal/universal/service/RedisService.java → ...universal/configuration/RedisService.java b/...ortal/universal/service/RedisService.java → ...universal/configuration/RedisService.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.apiportal.universal.service;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import java.io.Serializable;
 import java.util.Collection;

diff --git a/...ersal/configuration/RedisServiceImpl.java → ...ersal/configuration/RedisServiceImpl.java b/...ersal/configuration/RedisServiceImpl.java → ...ersal/configuration/RedisServiceImpl.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.configuration;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;

diff --git a/...al/configuration/ServerConfiguration.java → ...al/configuration/ServerConfiguration.java b/...al/configuration/ServerConfiguration.java → ...al/configuration/ServerConfiguration.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.configuration;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

diff --git a/...onfiguration/SwaggerResourceProvider.java → ...onfiguration/SwaggerResourceProvider.java b/...onfiguration/SwaggerResourceProvider.java → ...onfiguration/SwaggerResourceProvider.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.configuration;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +27,6 @@
  * <p>
  * https://blog.csdn.net/ttzommed/article/details/81103609
  * <p>
- * TODO: Refactor this class.
  *
  * @author Johnny Miller (锺俊), email: johnnysviva@outlook.com
  * @date 2/15/20 5:40 PM

diff --git a/...l/configuration/WebFluxConfiguration.java → ...l/configuration/WebFluxConfiguration.java b/...l/configuration/WebFluxConfiguration.java → ...l/configuration/WebFluxConfiguration.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.configuration;
+package com.jmsoftware.maf.apigateway.universal.configuration;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.config.ResourceHandlerRegistry;

diff --git a/...niversal/controller/CommonController.java → ...niversal/controller/CommonController.java b/...niversal/controller/CommonController.java → ...niversal/controller/CommonController.java
@@ -1,9 +1,9 @@
-package com.jmsoftware.maf.gateway.universal.controller;
+package com.jmsoftware.maf.apigateway.universal.controller;
 
+import com.jmsoftware.maf.apigateway.remoteapi.AuthCenterRemoteApi;
+import com.jmsoftware.maf.apigateway.universal.domain.ValidationTestPayload;
+import com.jmsoftware.maf.apigateway.universal.service.CommonService;
 import com.jmsoftware.maf.common.bean.ResponseBodyBean;
-import com.jmsoftware.maf.gateway.remoteapi.AuthCenterRemoteApi;
-import com.jmsoftware.maf.gateway.universal.domain.ValidationTestPayload;
-import com.jmsoftware.maf.gateway.universal.service.CommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

diff --git a/...controller/SwaggerResourceController.java → ...controller/SwaggerResourceController.java b/...controller/SwaggerResourceController.java → ...controller/SwaggerResourceController.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.controller;
+package com.jmsoftware.maf.apigateway.universal.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...iversal/domain/ValidationTestPayload.java → ...iversal/domain/ValidationTestPayload.java b/...iversal/domain/ValidationTestPayload.java → ...iversal/domain/ValidationTestPayload.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.gateway.universal.domain;
+package com.jmsoftware.maf.apigateway.universal.domain;
 
 import lombok.Data;
 

diff --git a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/package-info.java b/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/package-info.java
@@ -0,0 +1 @@
+package com.jmsoftware.maf.apigateway.universal;
diff --git a/...eway/universal/service/CommonService.java → ...eway/universal/service/CommonService.java b/...eway/universal/service/CommonService.java → ...eway/universal/service/CommonService.java
@@ -1,6 +1,6 @@
-package com.jmsoftware.maf.gateway.universal.service;
+package com.jmsoftware.maf.apigateway.universal.service;
 
-import com.jmsoftware.maf.gateway.universal.domain.ValidationTestPayload;
+import com.jmsoftware.maf.apigateway.universal.domain.ValidationTestPayload;
 
 import java.util.Map;
 

diff --git a/...ersal/service/impl/CommonServiceImpl.java → ...ersal/service/impl/CommonServiceImpl.java b/...ersal/service/impl/CommonServiceImpl.java → ...ersal/service/impl/CommonServiceImpl.java
@@ -1,8 +1,8 @@
-package com.jmsoftware.maf.gateway.universal.service.impl;
+package com.jmsoftware.maf.apigateway.universal.service.impl;
 
-import com.jmsoftware.maf.gateway.universal.configuration.ProjectProperty;
-import com.jmsoftware.maf.gateway.universal.domain.ValidationTestPayload;
-import com.jmsoftware.maf.gateway.universal.service.CommonService;
+import com.jmsoftware.maf.apigateway.universal.configuration.ProjectProperty;
+import com.jmsoftware.maf.apigateway.universal.domain.ValidationTestPayload;
+import com.jmsoftware.maf.apigateway.universal.service.CommonService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

diff --git a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/util/package-info.java b/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/util/package-info.java
@@ -0,0 +1 @@
+package com.jmsoftware.maf.apigateway.universal.util;
diff --git a/api-gateway/src/main/resources/application-development-docker.yml b/api-gateway/src/main/resources/application-development-docker.yml
@@ -0,0 +1,10 @@
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://maf.service-registry.dev:8760/eureka/
+
+spring:
+  zipkin:
+    base-url: http://maf.open-zipkin.dev:9411
+  devtools:
+    add-properties: true
diff --git a/...sources/application-development-local.yml → ...sources/application-development-local.yml b/...sources/application-development-local.yml → ...sources/application-development-local.yml
diff --git a/api-gateway/src/main/resources/application-production.yml b/api-gateway/src/main/resources/application-production.yml
@@ -0,0 +1,10 @@
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://maf.service-registry.production:8760/eureka/
+
+spring:
+  zipkin:
+    base-url: http://maf.open-zipkin.production:9411
+  devtools:
+    add-properties: false
diff --git a/api-gateway/src/main/resources/application-stage.yml b/api-gateway/src/main/resources/application-stage.yml
@@ -0,0 +1,10 @@
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://maf.service-registry.stage:8760/eureka/
+
+spring:
+  zipkin:
+    base-url: http://maf.open-zipkin.stage:9411
+  devtools:
+    add-properties: false
diff --git a/api-gateway/src/main/resources/application-test.yml b/api-gateway/src/main/resources/application-test.yml
@@ -0,0 +1,10 @@
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://maf.service-registry.test:8760/eureka/
+
+spring:
+  zipkin:
+    base-url: http://maf.open-zipkin.test:9411
+  devtools:
+    add-properties: false
diff --git a/gateway/src/main/resources/application.yml → ...ateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml → ...ateway/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: @gateway.port@
+  port: @api-gateway.port@
   tomcat:
     uri-encoding: @project.build.sourceEncoding@
 
@@ -93,7 +93,6 @@ project:
     developer-email: @developerEmail@
     developer-url: @developerUrl@
 
-
 maf:
   configuration:
     ignored-url:

diff --git a/gateway/src/main/resources/banner.txt → api-gateway/src/main/resources/banner.txt b/gateway/src/main/resources/banner.txt → api-gateway/src/main/resources/banner.txt
diff --git a/...l/src/main/resources/configuration/.empty → ...y/src/main/resources/configuration/.empty b/...l/src/main/resources/configuration/.empty → ...y/src/main/resources/configuration/.empty
diff --git a/...es/configuration/logback/logback-base.xml → ...es/configuration/logback/logback-base.xml b/...es/configuration/logback/logback-base.xml → ...es/configuration/logback/logback-base.xml
diff --git a/...on/logback/logback-development-docker.xml → ...on/logback/logback-development-docker.xml b/...on/logback/logback-development-docker.xml → ...on/logback/logback-development-docker.xml
diff --git a/...ion/logback/logback-development-local.xml → ...ion/logback/logback-development-local.xml b/...ion/logback/logback-development-local.xml → ...ion/logback/logback-development-local.xml
diff --git a/...figuration/logback/logback-production.xml → ...figuration/logback/logback-production.xml b/...figuration/logback/logback-production.xml → ...figuration/logback/logback-production.xml
diff --git a/...s/configuration/logback/logback-stage.xml → ...s/configuration/logback/logback-stage.xml b/...s/configuration/logback/logback-stage.xml → ...s/configuration/logback/logback-stage.xml
diff --git a/...es/configuration/logback/logback-test.xml → ...es/configuration/logback/logback-test.xml b/...es/configuration/logback/logback-test.xml → ...es/configuration/logback/logback-test.xml
diff --git a/...ortal/src/main/resources/static/home.html → ...teway/src/main/resources/static/home.html b/...ortal/src/main/resources/static/home.html → ...teway/src/main/resources/static/home.html
diff --git a/...rc/main/resources/static/icon/favicon.ico → ...rc/main/resources/static/icon/favicon.ico b/...rc/main/resources/static/icon/favicon.ico → ...rc/main/resources/static/icon/favicon.ico
diff --git a/...uscle-and-fitness-server-social-image.png → ...uscle-and-fitness-server-social-image.png b/...uscle-and-fitness-server-social-image.png → ...uscle-and-fitness-server-social-image.png
diff --git a/...l/src/main/resources/static/script/404.js → ...y/src/main/resources/static/script/404.js b/...l/src/main/resources/static/script/404.js → ...y/src/main/resources/static/script/404.js
diff --git a/.../src/main/resources/static/script/home.js → .../src/main/resources/static/script/home.js b/.../src/main/resources/static/script/home.js → .../src/main/resources/static/script/home.js
diff --git a/...src/main/resources/static/script/video.js → ...src/main/resources/static/script/video.js b/...src/main/resources/static/script/video.js → ...src/main/resources/static/script/video.js
diff --git a/.../src/main/resources/static/styles/404.css → .../src/main/resources/static/styles/404.css b/.../src/main/resources/static/styles/404.css → .../src/main/resources/static/styles/404.css
diff --git a/...src/main/resources/static/styles/home.css → ...src/main/resources/static/styles/home.css b/...src/main/resources/static/styles/home.css → ...src/main/resources/static/styles/home.css
diff --git a/...rc/main/resources/static/styles/video.css → ...rc/main/resources/static/styles/video.css b/...rc/main/resources/static/styles/video.css → ...rc/main/resources/static/styles/video.css
diff --git a/...rtal/src/main/resources/static/video.html → ...eway/src/main/resources/static/video.html b/...rtal/src/main/resources/static/video.html → ...eway/src/main/resources/static/video.html
diff --git a/.../apiportal/ApiPortalApplicationTests.java → ...pigateway/ApiGatewayApplicationTests.java b/.../apiportal/ApiPortalApplicationTests.java → ...pigateway/ApiGatewayApplicationTests.java
@@ -1,10 +1,10 @@
-package com.jmsoftware.maf.apiportal;
+package com.jmsoftware.maf.apigateway;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class ApiPortalApplicationTests {
+class ApiGatewayApplicationTests {
 
     @Test
     void contextLoads() {