Skip to content

Commit

Permalink
perf($maf-mis): merge micro services as 'maf-mis'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnymillergh committed Jun 25, 2021
1 parent b88f1c2 commit 7d7284c
Show file tree
Hide file tree
Showing 48 changed files with 19 additions and 911 deletions.
2 changes: 1 addition & 1 deletion docker/.env
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ STATIC_RESOURCE_CENTER_CONTAINER_NAME="maf-static-resource-center-${SPRING_ENVIR
############### Business Services ################
API_GATEWAY_CONTAINER_NAME="maf-api-gateway-${SPRING_ENVIRONMENT}"
AUTH_CENTER_CONTAINER_NAME="maf-auth-center-${SPRING_ENVIRONMENT}"
EXERCISE_MIS_CONTAINER_NAME="maf-exercise-mis-${SPRING_ENVIRONMENT}"
MAF_MIS_CONTAINER_NAME="maf-maf-mis-${SPRING_ENVIRONMENT}"
MUSCLE_MIS_CONTAINER_NAME="maf-muscle-mis-${SPRING_ENVIRONMENT}"

##################################################
Expand Down
10 changes: 5 additions & 5 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,10 @@ services:
networks:
muscle_and_fitness_network:

exercise-mis:
container_name: ${EXERCISE_MIS_CONTAINER_NAME}
hostname: ${EXERCISE_MIS_CONTAINER_NAME}
image: ijohnnymiller/muscle-and-fitness-server.exercise-mis:${MAF_TAG}
maf-mis:
container_name: ${MAF_MIS_CONTAINER_NAME}
hostname: ${MAF_MIS_CONTAINER_NAME}
image: ijohnnymiller/muscle-and-fitness-server.maf-mis:${MAF_TAG}
depends_on:
mysql-server:
condition: service_healthy
Expand All @@ -352,7 +352,7 @@ services:
condition: service_healthy
restart: always
volumes:
- "~/docker-file-mapping/${EXERCISE_MIS_CONTAINER_NAME}:/logs"
- "~/docker-file-mapping/${MAF_MIS_CONTAINER_NAME}:/logs"
environment:
JAVA_TOOL_OPTIONS: ${JAVA_TOOL_OPTIONS}
TZ: ${MAF_TIMEZONE}
Expand Down
2 changes: 1 addition & 1 deletion exercise-mis/README.md → maf-mis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

**Muscle and Fitness Server :: Exercise MIS** full name is Exercise Management Information Service, a sub module of Muscle and Fitness Server (M&F).

[Official Docker Image](https://hub.docker.com/r/ijohnnymiller/muslce-and-fitness-server.exercise-mis-prod)
[Official Docker Image](https://hub.docker.com/r/ijohnnymiller/muslce-and-fitness-server.maf-mis-prod)

## Features

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions exercise-mis/pom.xml → maf-mis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<!-- Sub-module Basics -->
<artifactId>exercise-mis</artifactId>
<artifactId>maf-mis</artifactId>
<name>Muscle and Fitness Server :: Exercise MIS</name>
<description>Exercise Management Information Service.</description>
<parent>
Expand Down Expand Up @@ -71,7 +71,7 @@
<jvmFlag>-Dfile.encoding=${project.build.sourceEncoding}</jvmFlag>
</jvmFlags>
<ports>
<port>${exercise-mis.port}</port>
<port>${maf-mis.port}</port>
</ports>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
</container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,27 @@
import org.springframework.util.StopWatch;

/**
* <h1>ExerciseMisApplication</h1>
* <h1>MafMisApplication</h1>
* <p>
* Change description here.
*
* @author Johnny Miller (锺俊), email: johnnysviva@outlook.com
* @date 2/17/20 8:41 PM
* @author Johnny Miller (锺俊), email: johnnysviva@outlook.com, date: 6/25/2021 4:23 PM
**/
@Slf4j
@EnableFeignClients
@EnableDiscoveryClient
@SpringBootApplication
public class ExerciseMisApplication {
public class MafMisApplication {
private static final StopWatch STOP_WATCH = new StopWatch();
private static SpringBootStartupHelper springBootStartupHelper;

public ExerciseMisApplication(SpringBootStartupHelper springBootStartupHelper) {
ExerciseMisApplication.springBootStartupHelper = springBootStartupHelper;
public MafMisApplication(SpringBootStartupHelper springBootStartupHelper) {
MafMisApplication.springBootStartupHelper = springBootStartupHelper;
}

public static void main(String[] args) {
STOP_WATCH.start();
SpringApplication.run(ExerciseMisApplication.class, args);
SpringApplication.run(MafMisApplication.class, args);
springBootStartupHelper.stop(STOP_WATCH);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
server:
port: @exercise-mis.port@
port: @maf-mis.port@
tomcat:
uri-encoding: @project.build.sourceEncoding@
shutdown: GRACEFUL
Expand Down
File renamed without changes.
File renamed without changes.
67 changes: 0 additions & 67 deletions muscle-mis/README.md

This file was deleted.

165 changes: 0 additions & 165 deletions muscle-mis/auto-run-windows.cmd

This file was deleted.

Loading

0 comments on commit 7d7284c

Please sign in to comment.