From 7d7284cd2498ce80fe26d4a8b31f35c807944701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Miller=20=28=E9=94=BA=E4=BF=8A=29?= Date: Fri, 25 Jun 2021 16:25:41 +0800 Subject: [PATCH] perf($maf-mis): merge micro services as 'maf-mis' --- docker/.env | 2 +- docker/docker-compose.yml | 10 +- {exercise-mis => maf-mis}/README.md | 2 +- .../auto-run-windows.cmd | 0 {exercise-mis => maf-mis}/pom.xml | 4 +- .../maf/exercisemis/MafMisApplication.java | 13 +- .../controller/ExerciseController.java | 0 .../exercise/domain/ExercisePo.java | 0 .../exercise/domain/GetPageListPayload.java | 0 .../exercise/mapper/ExerciseMapper.java | 0 .../exercise/service/ExerciseService.java | 0 .../service/impl/ExerciseServiceImpl.java | 0 .../application-development-docker.yml | 0 .../application-development-local.yml | 0 .../main/resources/application-production.yml | 0 .../src/main/resources/application-stage.yml | 0 .../src/main/resources/application-test.yml | 0 .../src/main/resources/application.yml | 2 +- .../src/main/resources/banner.txt | 0 .../src/main/resources/bootstrap.yml | 0 .../logback-configuration/logback-base.xml | 0 .../logback-development-docker.xml | 0 .../logback-development-local.xml | 0 .../logback-production.xml | 0 .../logback-configuration/logback-stage.xml | 0 .../logback-configuration/logback-test.xml | 0 .../main/resources/mapper/ExerciseMapper.xml | 0 .../ExercisePoMisApplicationTests.java | 0 muscle-mis/README.md | 67 ------- muscle-mis/auto-run-windows.cmd | 165 ----------------- muscle-mis/pom.xml | 103 ----------- .../maf/musclemis/MuscleMisApplication.java | 43 ----- .../application-development-docker.yml | 28 --- .../application-development-local.yml | 32 ---- .../main/resources/application-production.yml | 28 --- .../src/main/resources/application-stage.yml | 28 --- .../src/main/resources/application-test.yml | 28 --- muscle-mis/src/main/resources/application.yml | 168 ------------------ muscle-mis/src/main/resources/banner.txt | 26 --- muscle-mis/src/main/resources/bootstrap.yml | 18 -- .../logback-configuration/logback-base.xml | 83 --------- .../logback-development-docker.xml | 11 -- .../logback-development-local.xml | 11 -- .../logback-production.xml | 11 -- .../logback-configuration/logback-stage.xml | 11 -- .../logback-configuration/logback-test.xml | 11 -- .../musclemis/MuscleMisApplicationTests.java | 13 -- pom.xml | 12 +- 48 files changed, 19 insertions(+), 911 deletions(-) rename {exercise-mis => maf-mis}/README.md (98%) rename {exercise-mis => maf-mis}/auto-run-windows.cmd (100%) rename {exercise-mis => maf-mis}/pom.xml (97%) rename exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/ExerciseMisApplication.java => maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/MafMisApplication.java (73%) rename {exercise-mis => maf-mis}/src/main/java/com/jmsoftware/maf/exercisemis/exercise/controller/ExerciseController.java (100%) rename {exercise-mis => maf-mis}/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/ExercisePo.java (100%) rename {exercise-mis => maf-mis}/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/GetPageListPayload.java (100%) rename {exercise-mis => maf-mis}/src/main/java/com/jmsoftware/maf/exercisemis/exercise/mapper/ExerciseMapper.java (100%) rename {exercise-mis => maf-mis}/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/ExerciseService.java (100%) rename {exercise-mis => maf-mis}/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/impl/ExerciseServiceImpl.java (100%) rename {exercise-mis => maf-mis}/src/main/resources/application-development-docker.yml (100%) rename {exercise-mis => maf-mis}/src/main/resources/application-development-local.yml (100%) rename {exercise-mis => maf-mis}/src/main/resources/application-production.yml (100%) rename {exercise-mis => maf-mis}/src/main/resources/application-stage.yml (100%) rename {exercise-mis => maf-mis}/src/main/resources/application-test.yml (100%) rename {exercise-mis => maf-mis}/src/main/resources/application.yml (99%) rename {exercise-mis => maf-mis}/src/main/resources/banner.txt (100%) rename {exercise-mis => maf-mis}/src/main/resources/bootstrap.yml (100%) rename {exercise-mis => maf-mis}/src/main/resources/logback-configuration/logback-base.xml (100%) rename {exercise-mis => maf-mis}/src/main/resources/logback-configuration/logback-development-docker.xml (100%) rename {exercise-mis => maf-mis}/src/main/resources/logback-configuration/logback-development-local.xml (100%) rename {exercise-mis => maf-mis}/src/main/resources/logback-configuration/logback-production.xml (100%) rename {exercise-mis => maf-mis}/src/main/resources/logback-configuration/logback-stage.xml (100%) rename {exercise-mis => maf-mis}/src/main/resources/logback-configuration/logback-test.xml (100%) rename {exercise-mis => maf-mis}/src/main/resources/mapper/ExerciseMapper.xml (100%) rename {exercise-mis => maf-mis}/src/test/java/com/jmsoftware/maf/exercisemis/ExercisePoMisApplicationTests.java (100%) delete mode 100644 muscle-mis/README.md delete mode 100644 muscle-mis/auto-run-windows.cmd delete mode 100644 muscle-mis/pom.xml delete mode 100644 muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/MuscleMisApplication.java delete mode 100644 muscle-mis/src/main/resources/application-development-docker.yml delete mode 100644 muscle-mis/src/main/resources/application-development-local.yml delete mode 100644 muscle-mis/src/main/resources/application-production.yml delete mode 100644 muscle-mis/src/main/resources/application-stage.yml delete mode 100644 muscle-mis/src/main/resources/application-test.yml delete mode 100644 muscle-mis/src/main/resources/application.yml delete mode 100644 muscle-mis/src/main/resources/banner.txt delete mode 100644 muscle-mis/src/main/resources/bootstrap.yml delete mode 100644 muscle-mis/src/main/resources/logback-configuration/logback-base.xml delete mode 100644 muscle-mis/src/main/resources/logback-configuration/logback-development-docker.xml delete mode 100644 muscle-mis/src/main/resources/logback-configuration/logback-development-local.xml delete mode 100644 muscle-mis/src/main/resources/logback-configuration/logback-production.xml delete mode 100644 muscle-mis/src/main/resources/logback-configuration/logback-stage.xml delete mode 100644 muscle-mis/src/main/resources/logback-configuration/logback-test.xml delete mode 100644 muscle-mis/src/test/java/com/jmsoftware/maf/musclemis/MuscleMisApplicationTests.java diff --git a/docker/.env b/docker/.env index 40593831..b70239c0 100644 --- a/docker/.env +++ b/docker/.env @@ -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}" ################################################## diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 255e78ef..de7fd12d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -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 @@ -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} diff --git a/exercise-mis/README.md b/maf-mis/README.md similarity index 98% rename from exercise-mis/README.md rename to maf-mis/README.md index a12282ae..989ded36 100644 --- a/exercise-mis/README.md +++ b/maf-mis/README.md @@ -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 diff --git a/exercise-mis/auto-run-windows.cmd b/maf-mis/auto-run-windows.cmd similarity index 100% rename from exercise-mis/auto-run-windows.cmd rename to maf-mis/auto-run-windows.cmd diff --git a/exercise-mis/pom.xml b/maf-mis/pom.xml similarity index 97% rename from exercise-mis/pom.xml rename to maf-mis/pom.xml index 5ceed0c2..cc89aed7 100644 --- a/exercise-mis/pom.xml +++ b/maf-mis/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - exercise-mis + maf-mis Muscle and Fitness Server :: Exercise MIS Exercise Management Information Service. @@ -71,7 +71,7 @@ -Dfile.encoding=${project.build.sourceEncoding} - ${exercise-mis.port} + ${maf-mis.port} USE_CURRENT_TIMESTAMP diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/ExerciseMisApplication.java b/maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/MafMisApplication.java similarity index 73% rename from exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/ExerciseMisApplication.java rename to maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/MafMisApplication.java index 0d2e1164..c6df21e0 100644 --- a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/ExerciseMisApplication.java +++ b/maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/MafMisApplication.java @@ -9,28 +9,27 @@ import org.springframework.util.StopWatch; /** - *

ExerciseMisApplication

+ *

MafMisApplication

*

* 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); } } diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/controller/ExerciseController.java b/maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/controller/ExerciseController.java similarity index 100% rename from exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/controller/ExerciseController.java rename to maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/controller/ExerciseController.java diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/ExercisePo.java b/maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/ExercisePo.java similarity index 100% rename from exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/ExercisePo.java rename to maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/ExercisePo.java diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/GetPageListPayload.java b/maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/GetPageListPayload.java similarity index 100% rename from exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/GetPageListPayload.java rename to maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/domain/GetPageListPayload.java diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/mapper/ExerciseMapper.java b/maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/mapper/ExerciseMapper.java similarity index 100% rename from exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/mapper/ExerciseMapper.java rename to maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/mapper/ExerciseMapper.java diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/ExerciseService.java b/maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/ExerciseService.java similarity index 100% rename from exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/ExerciseService.java rename to maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/ExerciseService.java diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/impl/ExerciseServiceImpl.java b/maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/impl/ExerciseServiceImpl.java similarity index 100% rename from exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/impl/ExerciseServiceImpl.java rename to maf-mis/src/main/java/com/jmsoftware/maf/exercisemis/exercise/service/impl/ExerciseServiceImpl.java diff --git a/exercise-mis/src/main/resources/application-development-docker.yml b/maf-mis/src/main/resources/application-development-docker.yml similarity index 100% rename from exercise-mis/src/main/resources/application-development-docker.yml rename to maf-mis/src/main/resources/application-development-docker.yml diff --git a/exercise-mis/src/main/resources/application-development-local.yml b/maf-mis/src/main/resources/application-development-local.yml similarity index 100% rename from exercise-mis/src/main/resources/application-development-local.yml rename to maf-mis/src/main/resources/application-development-local.yml diff --git a/exercise-mis/src/main/resources/application-production.yml b/maf-mis/src/main/resources/application-production.yml similarity index 100% rename from exercise-mis/src/main/resources/application-production.yml rename to maf-mis/src/main/resources/application-production.yml diff --git a/exercise-mis/src/main/resources/application-stage.yml b/maf-mis/src/main/resources/application-stage.yml similarity index 100% rename from exercise-mis/src/main/resources/application-stage.yml rename to maf-mis/src/main/resources/application-stage.yml diff --git a/exercise-mis/src/main/resources/application-test.yml b/maf-mis/src/main/resources/application-test.yml similarity index 100% rename from exercise-mis/src/main/resources/application-test.yml rename to maf-mis/src/main/resources/application-test.yml diff --git a/exercise-mis/src/main/resources/application.yml b/maf-mis/src/main/resources/application.yml similarity index 99% rename from exercise-mis/src/main/resources/application.yml rename to maf-mis/src/main/resources/application.yml index 5a8c6438..fb6edbcb 100644 --- a/exercise-mis/src/main/resources/application.yml +++ b/maf-mis/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: @exercise-mis.port@ + port: @maf-mis.port@ tomcat: uri-encoding: @project.build.sourceEncoding@ shutdown: GRACEFUL diff --git a/exercise-mis/src/main/resources/banner.txt b/maf-mis/src/main/resources/banner.txt similarity index 100% rename from exercise-mis/src/main/resources/banner.txt rename to maf-mis/src/main/resources/banner.txt diff --git a/exercise-mis/src/main/resources/bootstrap.yml b/maf-mis/src/main/resources/bootstrap.yml similarity index 100% rename from exercise-mis/src/main/resources/bootstrap.yml rename to maf-mis/src/main/resources/bootstrap.yml diff --git a/exercise-mis/src/main/resources/logback-configuration/logback-base.xml b/maf-mis/src/main/resources/logback-configuration/logback-base.xml similarity index 100% rename from exercise-mis/src/main/resources/logback-configuration/logback-base.xml rename to maf-mis/src/main/resources/logback-configuration/logback-base.xml diff --git a/exercise-mis/src/main/resources/logback-configuration/logback-development-docker.xml b/maf-mis/src/main/resources/logback-configuration/logback-development-docker.xml similarity index 100% rename from exercise-mis/src/main/resources/logback-configuration/logback-development-docker.xml rename to maf-mis/src/main/resources/logback-configuration/logback-development-docker.xml diff --git a/exercise-mis/src/main/resources/logback-configuration/logback-development-local.xml b/maf-mis/src/main/resources/logback-configuration/logback-development-local.xml similarity index 100% rename from exercise-mis/src/main/resources/logback-configuration/logback-development-local.xml rename to maf-mis/src/main/resources/logback-configuration/logback-development-local.xml diff --git a/exercise-mis/src/main/resources/logback-configuration/logback-production.xml b/maf-mis/src/main/resources/logback-configuration/logback-production.xml similarity index 100% rename from exercise-mis/src/main/resources/logback-configuration/logback-production.xml rename to maf-mis/src/main/resources/logback-configuration/logback-production.xml diff --git a/exercise-mis/src/main/resources/logback-configuration/logback-stage.xml b/maf-mis/src/main/resources/logback-configuration/logback-stage.xml similarity index 100% rename from exercise-mis/src/main/resources/logback-configuration/logback-stage.xml rename to maf-mis/src/main/resources/logback-configuration/logback-stage.xml diff --git a/exercise-mis/src/main/resources/logback-configuration/logback-test.xml b/maf-mis/src/main/resources/logback-configuration/logback-test.xml similarity index 100% rename from exercise-mis/src/main/resources/logback-configuration/logback-test.xml rename to maf-mis/src/main/resources/logback-configuration/logback-test.xml diff --git a/exercise-mis/src/main/resources/mapper/ExerciseMapper.xml b/maf-mis/src/main/resources/mapper/ExerciseMapper.xml similarity index 100% rename from exercise-mis/src/main/resources/mapper/ExerciseMapper.xml rename to maf-mis/src/main/resources/mapper/ExerciseMapper.xml diff --git a/exercise-mis/src/test/java/com/jmsoftware/maf/exercisemis/ExercisePoMisApplicationTests.java b/maf-mis/src/test/java/com/jmsoftware/maf/exercisemis/ExercisePoMisApplicationTests.java similarity index 100% rename from exercise-mis/src/test/java/com/jmsoftware/maf/exercisemis/ExercisePoMisApplicationTests.java rename to maf-mis/src/test/java/com/jmsoftware/maf/exercisemis/ExercisePoMisApplicationTests.java diff --git a/muscle-mis/README.md b/muscle-mis/README.md deleted file mode 100644 index 1fa07bd5..00000000 --- a/muscle-mis/README.md +++ /dev/null @@ -1,67 +0,0 @@ -![Muscle and Fitness Server Social Image](https://raw.githubusercontent.com/johnnymillergh/MaterialLibrary/master/muscle-and-fitness/muscle-and-fitness-server-social-image.png) -[![GitHub release](https://img.shields.io/github/release/johnnymillergh/muscle-and-fitness-server.svg)](https://github.com/johnnymillergh/muscle-and-fitness-server/releases) -[![Build Status](https://travis-ci.com/johnnymillergh/muscle-and-fitness-server.svg?branch=master)](https://travis-ci.com/johnnymillergh/muscle-and-fitness-server) -[![GitHub issues](https://img.shields.io/github/issues/johnnymillergh/muscle-and-fitness-server)](https://github.com/johnnymillergh/muscle-and-fitness-server/issues) -[![GitHub forks](https://img.shields.io/github/forks/johnnymillergh/muscle-and-fitness-server)](https://github.com/johnnymillergh/muscle-and-fitness-server/network) -[![GitHub stars](https://img.shields.io/github/stars/johnnymillergh/muscle-and-fitness-server)](https://github.com/johnnymillergh/muscle-and-fitness-server) -[![GitHub license](https://img.shields.io/github/license/johnnymillergh/muscle-and-fitness-server)](https://github.com/johnnymillergh/muscle-and-fitness-server/blob/master/LICENSE) -[![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/johnnymillergh/muscle-and-fitness-server.svg?style=popout)](https://github.com/johnnymillergh/muscle-and-fitness-server) -[![GitHub repo size](https://img.shields.io/github/repo-size/johnnymillergh/muscle-and-fitness-server.svg)](https://github.com/johnnymillergh/muscle-and-fitness-server) -[![Twitter](https://img.shields.io/twitter/url/https/github.com/johnnymillergh/muscle-and-fitness-server?style=social)](https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fjohnnymillergh%2Fmuscle-and-fitness-server) - -# Muscle and Fitness Server :: Muscle MIS - -**Muscle and Fitness Server :: Muscle MIS** full name is Muscle Management Information Service, a sub module of Muscle and Fitness Server (M&F). - -[Official Docker Image](https://hub.docker.com/r/ijohnnymiller/muscle-and-fitness-server.muscle-mis-prod) - -## Features - -Here is the highlights of **Muscle MIS**: - -1. Inherited from the most modern and newest Spring frameworks: - - `org.springframework.boot:spring-boot-starter-parent` - [![Spring Boot](https://maven-badges.herokuapp.com/maven-central/org.springframework.boot/spring-boot-starter-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.springframework.boot/spring-boot-starter-parent/) - `org.springframework.cloud:spring-cloud-dependencies` - [![Spring Cloud](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-dependencies/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-dependencies/) - -2. Manage muscle information. - -## Usage - -1. Clone or download this project. - - ```shell - $ git clone https://github.com/johnnymillergh/exrx-net-crawler-server.git - ``` - -2. Build with newest Intellij IDEA. - -3. Click the green triangle to Run. - -## Maintainers - -[@johnnymillergh](https://github.com/johnnymillergh). - -## Contributing - -Feel free to dive in! [Open an issue](https://github.com/johnnymillergh/spring-cloud-tutorial/issues/new). - -### Contributors - -This project exists thanks to all the people who contribute. - -- Johnny Miller [[@johnnymillergh](https://github.com/johnnymillergh)] -- … - - -### Sponsors - -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://become-a-sponsor.org)] - -## License - -[Apache License](https://github.com/johnnymillergh/exrx-net-crawler-server/blob/master/LICENSE) © Johnny Miller - -2020 - Present - - diff --git a/muscle-mis/auto-run-windows.cmd b/muscle-mis/auto-run-windows.cmd deleted file mode 100644 index e8863836..00000000 --- a/muscle-mis/auto-run-windows.cmd +++ /dev/null @@ -1,165 +0,0 @@ -@ECHO OFF -@REM ############################## auto-run ############################ -@REM # Author: 钟俊, date: 12:43:04 PM, Dec. 8, 2020 # -@REM # Copyright (c) 钟俊 # -@REM # Capability: Windows 10 Pro (20H2) # -@REM # Purpose: # -@REM # 1. Integrate easy and simple deployment, # -@REM # 2. Reduce memory usage of IntelliJ IDEA to run services, # -@REM # 3. Improve the efficiency of local development. # -@REM #################################################################### - -SETLOCAL EnableDelayedExpansion -@REM UTF-8 -chcp 65001 - -@REM #################### Configurable Environment Variables ################### -SET skipGitPull=true -SET skipMavenBuild=true -SET minimalJavaMajorVersion=11 -SET javaExe=java -SET mavenActiveProfile="development-local" -SET javaParameter=-Xms256m -Xmx256m -Dfile.encoding=UTF-8 -Dspring.cloud.consul.host=localhost - -GOTO:MAIN - -@REM ############################# Common Functions ############################ - -@REM Log trace. -@REM %~1 Info message -:logTrace - ECHO %date% %time% TRACE - %~1% -EXIT /B 0 - -@REM Log info. -@REM %~1 Info message -:logInfo - ECHO %date% %time% INFO - %~1% -EXIT /B 0 - -@REM Log warn. -@REM %~1 Warn message -:logWarn - ECHO %date% %time% WARN - %~1% -EXIT /B 0 - -@REM Log error. -@REM %~1 Error message -:logError - ECHO %date% %time% ERROR - %~1% -EXIT /B 0 - -@REM Set terminal title. -@REM %~1 Title string -:setTerminalTitle - TITLE %~1 -EXIT /B 0 - -@REM ############################ Custom Functions ############################# - -@REM Check Java major version -:checkJavaMajorVersion -CALL :logWarn "Start to Check Java major version…" -%javaExe% -version 1>nul 2>nul || ( - CALL :logError "Java is not installed!" - EXIT /B 2 -) -for /f tokens^=2-6^ delims^=.-_+^" %%j in ('%javaExe% -fullversion 2^>^&1') do set "currentJavaMajorVersion=%%j" -CALL :logWarn "Got current Java major version number: %currentJavaMajorVersion%" -if %currentJavaMajorVersion% LSS %minimalJavaMajorVersion% ( - CALL :logError "Current Java version is too low, at least OpenJDK %minimalJavaMajorVersion% is needed" - EXIT /B 1 -) -CALL :logInfo "Passed Java major version cheking" -EXIT /B 0 - -@REM Pull the latest code of current branch from Git. -:gitPull - git pull - if %ERRORLEVEL% NEQ 0 ( - CALL :logError "Failed to execute command `Git pull`" - EXIT /B %ERRORLEVEL% - ) -EXIT /B 0 - -@REM Execute pre-build phase. -:executePreBuildPhase - CALL :logWarn "[PRE-BUILD] Active profile: %mavenActiveProfile%" - FOR /F "tokens=*" %%i IN ('git rev-parse --abbrev-ref HEAD') DO SET currentBranch=%%i - CALL :logWarn "[PRE-BUILD] Current Git branch: %currentBranch%" - if %skipGitPull% == true ( - CALL :logWarn "[PRE-BUILD] Skipped Git pull" - ) else ( - CALL :logInfo "[PRE-BUILD] Start to pull latest code from Git" - CALL :gitPull - ) - CALL :logInfo "[PRE-BUILD] Java Version Information" - CALL %javaExe% -version - CALL :logInfo "[PRE-BUILD] Maven Version Information" - CALL mvn -v - CALL :logInfo "[PRE-BUILD] Current directory:" - dir -EXIT /B 0 - -@REM Execute build phase. -:executeBuildPhase - if %skipMavenBuild% == true ( - CALL :logWarn "[PRE-BUILD] Skipped Maven build" - EXIT /B 0 - ) - CALL :logInfo "[PRE-BUILD] Start to pull latest code from Git" - SET currentDirectory=%cd% - @REM Change directory to root projeject - cd .. - CALL mvn clean package --batch-mode --show-version -Dmaven.javadoc.skip=true -DskipTests=true - if %ERRORLEVEL% NEQ 0 ( - CALL :logError "[BUILD] Failed to execute Maven build" - EXIT /B %ERRORLEVEL% - ) - CALL :logInfo "[BUILD] Maven build success" - cd %currentDirectory% - dir -EXIT /B 0 - -@REM Execute run phase. -:executeRunPhase - CALL :logWarn "[RUN] Running service…" - FOR /F "tokens=*" %%i IN ('dir /B/A:- target\*.jar') DO SET jarFileName=%%i - if "%jarFileName%" == "" ( - CALL :logError "[RUN] Not found runnable JAR!" - EXIT /B 1 - ) - CALL :logWarn "[RUN] Found JAR: %jarFileName%" - CALL :setTerminalTitle %jarFileName% - SET runJarCommand=%javaExe% %javaParameter% -Dspring.profiles.active=%mavenActiveProfile% -jar target\%jarFileName% - CALL :logWarn "[RUN] Execute command: %runJarCommand%" - CALL %runJarCommand% -EXIT /B 0 - -@REM ############################# MAIN Procedures ############################# -:MAIN -cls - -@REM Check Java major version -CALL :checkJavaMajorVersion -if %ERRORLEVEL% NEQ 0 ( - CALL :logError "Failed to check Java major version!" - EXIT /B %ERRORLEVEL% -) - -@REM Pre-build phrase (Display version, Git pull) -CALL :executePreBuildPhase -if %ERRORLEVEL% NEQ 0 ( - CALL :logError "[PRE-BUILD] Failed to execute pre-build phase" - EXIT /B %ERRORLEVEL% -) -@REM Build phase -CALL :executeBuildPhase -if %ERRORLEVEL% NEQ 0 ( - CALL :logError "[BUILD] Failed to execute build phase" - EXIT /B %ERRORLEVEL% -) -@REM Run phase -CALL :executeRunPhase - -ENDLOCAL diff --git a/muscle-mis/pom.xml b/muscle-mis/pom.xml deleted file mode 100644 index 1f5f28bb..00000000 --- a/muscle-mis/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - 4.0.0 - - - muscle-mis - Muscle and Fitness Server :: Muscle MIS - Muscle Management Information Service. - - com.jmsoftware.maf - muscle-and-fitness-server - 0.0.2-SNAPSHOT - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - build-info - compile - - build-info - - - - - - - - com.google.cloud.tools - jib-maven-plugin - ${jib-maven-plugin.version} - - - - - buildAndPushDockerImagePhase - install - - build - - - - - - - adoptopenjdk/openjdk11:${adoptopenjdk11.tag} - - - docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId} - - ${project.version} - - - - - /${project.artifactId} - - -Dfile.encoding=${project.build.sourceEncoding} - - - ${muscle-mis.port} - - USE_CURRENT_TIMESTAMP - - - - - - - - - - com.jmsoftware.maf - spring-cloud-starter - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - diff --git a/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/MuscleMisApplication.java b/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/MuscleMisApplication.java deleted file mode 100644 index da86c677..00000000 --- a/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/MuscleMisApplication.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jmsoftware.maf.musclemis; - -import com.jmsoftware.maf.springcloudstarter.configuration.MafProjectProperty; -import com.jmsoftware.maf.springcloudstarter.helper.IpHelper; -import com.jmsoftware.maf.springcloudstarter.helper.SpringBootStartupHelper; -import lombok.extern.slf4j.Slf4j; -import lombok.val; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.util.StopWatch; - -import java.time.Duration; -import java.time.Instant; -import java.util.TimeZone; - -/** - *

MuscleMisApplication

- *

- * Change description here. - * - * @author Johnny Miller (锺俊), email: johnnysviva@outlook.com - * @date 2/17/20 8:41 PM - **/ -@Slf4j -@EnableFeignClients -@EnableDiscoveryClient -@SpringBootApplication -public class MuscleMisApplication { - private static final StopWatch STOP_WATCH = new StopWatch(); - private static SpringBootStartupHelper springBootStartupHelper; - - public MuscleMisApplication(SpringBootStartupHelper springBootStartupHelper) { - MuscleMisApplication.springBootStartupHelper = springBootStartupHelper; - } - - public static void main(String[] args) { - STOP_WATCH.start(); - SpringApplication.run(MuscleMisApplication.class, args); - springBootStartupHelper.stop(STOP_WATCH); - } -} diff --git a/muscle-mis/src/main/resources/application-development-docker.yml b/muscle-mis/src/main/resources/application-development-docker.yml deleted file mode 100644 index e0e987b4..00000000 --- a/muscle-mis/src/main/resources/application-development-docker.yml +++ /dev/null @@ -1,28 +0,0 @@ -spring: - zipkin: - base-url: http://maf-zipkin-development-docker:9411 - devtools: - add-properties: true - datasource: - url: jdbc:mysql://maf-mysql-server-development-docker:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: maf-redis-development-docker - port: 6379 - password: maf@redis - rabbitmq: - host: maf-rabbitmq-development-docker - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq - -sftp: - host: maf-atmoz-sftp-development-docker - port: 22 - user: johnny - password: atmoz@sftp - -maf: - configuration: - swagger-disabled: false diff --git a/muscle-mis/src/main/resources/application-development-local.yml b/muscle-mis/src/main/resources/application-development-local.yml deleted file mode 100644 index bee81b33..00000000 --- a/muscle-mis/src/main/resources/application-development-local.yml +++ /dev/null @@ -1,32 +0,0 @@ -spring: - zipkin: - base-url: http://localhost:9411 - devtools: - add-properties: true - datasource: - url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: localhost - port: 6379 - password: maf@redis - rabbitmq: - host: localhost - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq - -logging: - level: - com.jcraft.jsch: INFO - -sftp: - host: localhost - port: 23 - user: johnny - password: atmoz@sftp - -maf: - configuration: - swagger-disabled: false diff --git a/muscle-mis/src/main/resources/application-production.yml b/muscle-mis/src/main/resources/application-production.yml deleted file mode 100644 index 3bc03631..00000000 --- a/muscle-mis/src/main/resources/application-production.yml +++ /dev/null @@ -1,28 +0,0 @@ -spring: - zipkin: - base-url: http://maf-zipkin-production:9411 - devtools: - add-properties: false - datasource: - url: jdbc:mysql://maf-mysql-server-production:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: maf-redis-production - port: 6379 - password: maf@redis - rabbitmq: - host: maf-rabbitmq-production - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq - -sftp: - host: maf-atmoz-sftp-production - port: 22 - user: johnny - password: atmoz@sftp - -maf: - configuration: - swagger-disabled: true diff --git a/muscle-mis/src/main/resources/application-stage.yml b/muscle-mis/src/main/resources/application-stage.yml deleted file mode 100644 index 5214e6e1..00000000 --- a/muscle-mis/src/main/resources/application-stage.yml +++ /dev/null @@ -1,28 +0,0 @@ -spring: - zipkin: - base-url: http://maf-zipkin-stage:9411 - devtools: - add-properties: false - datasource: - url: jdbc:mysql://maf-mysql-server-stage:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: maf-redis-stage - port: 6379 - password: maf@redis - rabbitmq: - host: maf-rabbitmq-stage - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq - -sftp: - host: maf-atmoz-sftp-stage - port: 22 - user: johnny - password: atmoz@sftp - -maf: - configuration: - swagger-disabled: true diff --git a/muscle-mis/src/main/resources/application-test.yml b/muscle-mis/src/main/resources/application-test.yml deleted file mode 100644 index 3ccdba11..00000000 --- a/muscle-mis/src/main/resources/application-test.yml +++ /dev/null @@ -1,28 +0,0 @@ -spring: - zipkin: - base-url: http://maf-zipkin-test:9411 - devtools: - add-properties: false - datasource: - url: jdbc:mysql://maf-mysql-server-test:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: maf-redis-test - port: 6379 - password: maf@redis - rabbitmq: - host: maf-rabbitmq-test - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq - -sftp: - host: maf-atmoz-sftp-test - port: 22 - user: johnny - password: atmoz@sftp - -maf: - configuration: - swagger-disabled: false diff --git a/muscle-mis/src/main/resources/application.yml b/muscle-mis/src/main/resources/application.yml deleted file mode 100644 index 64677a9d..00000000 --- a/muscle-mis/src/main/resources/application.yml +++ /dev/null @@ -1,168 +0,0 @@ -server: - port: @muscle-mis.port@ - tomcat: - uri-encoding: @project.build.sourceEncoding@ - shutdown: GRACEFUL - servlet: - context-path: - -spring: - application: - name: @project.artifactId@ - profiles: - active: @env@ - mvc: - throw-exception-if-no-handler-found: true - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: Asia/Hong_Kong - sleuth: - sampler: - probability: 1.0 - cloud: - consul: - discovery: - register: true - instance-id: ${spring.application.name}-${spring.cloud.client.hostname}-${vcap.application.instance_id:${spring.application.instance_id:${random.value}}} - service-name: ${spring.application.name} - port: ${server.port} - prefer-ip-address: true - ip-address: ${spring.cloud.client.ip-address} - health-check-critical-timeout: 15s - datasource: - name: muscle_and_fitness - type: com.alibaba.druid.pool.DruidDataSource - druid: - driver-class-name: com.mysql.cj.jdbc.Driver - initial-size: 5 - minIdle: 10 - max-active: 20 - max-wait: 60000 - min-evictable-idle-time-millis: 600000 - max-evictable-idle-time-millis: 900000 - validation-query: SELECT 1 - test-while-idle: true - test-on-borrow: false - test-on-return: false - pool-prepared-statements: true - max-open-prepared-statements: 20 - keep-alive: true - filters: stat,wall,log4j2 - filter: - stat: - enabled: true - db-type: mysql - log-slow-sql: true - slow-sql-millis: 2000 - slf4j: - enabled: true - statement-log-error-enabled: true - statement-create-after-log-enabled: false - statement-close-after-log-enabled: false - result-set-open-after-log-enabled: false - result-set-close-after-log-enabled: false - web-stat-filter: - enabled: true - url-pattern: /* - exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*" - session-stat-enable: true - session-stat-max-count: 1000 - stat-view-servlet: - enabled: true - url-pattern: /druid/* - reset-enable: false - login-username: root - login-password: maf_druid_password - allow: - redis: - database: 0 - timeout: 10000ms - client-type: LETTUCE - lettuce: - pool: - max-active: 20 - max-idle: 10 - max-wait: -1ms - min-idle: 0 - -feign: - httpclient: - enabled: false - okhttp: - enabled: true - client: - config: - default: - connectTimeout: 5000 - readTimeout: 10000 - loggerLevel: full - compression: - request: - enabled: true - response: - enabled: true - useGzipDecoder: true - -management: - endpoints: - web: - exposure: - include: "*" - endpoint: - health: - show-details: ALWAYS - -mybatis-plus: - configuration: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - # mapper-locations should start with `classpath*` prefix - # when project is based on Maven multi-module to load XML mapper in different jar - mapper-locations: classpath*:/mapper/**/*Mapper.xml - -logging: - config: classpath:logback-configuration/logback-${spring.profiles.active}.xml - level: - # Configure logging level for SFTP/JSCH - com.jcraft.jsch: INFO - -maf: - project-property: - base-package: @project.groupId@ - context-path: ${server.servlet.context-path} - group-id: @project.groupId@ - project-parent-artifact-id: @project.parent.artifactId@ - project-artifact-id: @project.artifactId@ - version: @project.version@ - description: @project.description@ - jdk-version: @java.version@ - environment: ${spring.profiles.active} - url: @project.url@ - inception-year: @inceptionYear@ - organization-name: @project.organization.name@ - organization-url: @project.organization.url@ - issue-management-system: @project.issueManagement.system@ - issue-management-url: @project.issueManagement.url@ - developer-name: @developerName@ - developer-email: @developerEmail@ - developer-url: @developerUrl@ - configuration: - ignored-url: - pattern: - - "/static/**" - - "/actuator/**" - - "/druid/**" - - "/swagger-resources/**" - - "/v2/api-docs/**" - - "/*/v2/api-docs/**" - - "/webjars/**" - - "/doc.html" - included-package-for-http-api-scan: ${maf.project-property.base-package} - -sftp: - enabled: true - directory: upload - private-key: - private-key-pass-phrase: - session-cache-size: 20 - session-wait-timeout: 15000 diff --git a/muscle-mis/src/main/resources/banner.txt b/muscle-mis/src/main/resources/banner.txt deleted file mode 100644 index 85158735..00000000 --- a/muscle-mis/src/main/resources/banner.txt +++ /dev/null @@ -1,26 +0,0 @@ -${AnsiStyle.BOLD}${AnsiColor.BRIGHT_GREEN} - __ ___ __ __ ____________ - / |/ /_ ____________/ /__ / |/ / _/ ___/ - / /|_/ / / / / ___/ ___/ / _ \ / /|_/ // / \__ \ - / / / / /_/ (__ ) /__/ / __/ / / / // / ___/ / -/_/ /_/\__,_/____/\___/_/\___/ /_/ /_/___//____/ -${AnsiStyle.BOLD}Muscle MIS :: Powered by Spring Boot ::${spring-boot.formatted-version} -${AnsiColor.CYAN}Author: Johnny Miller (锺俊), email: johnnysviva@outlook.com -${AnsiStyle.NORMAL}${AnsiColor.MAGENTA}http://patorjk.com/software/taag/#p=display&f=Slant&t=Muscle%20MIS -${AnsiColor.BRIGHT_BLACK} --------------------------------------------Font Info------------------------------------------- -Slant by Glenn Chappell 3/93 -- based on Standard -Includes ISO Latin-1 -figlet release 2.1 -- 12 Aug 1994 -Permission is hereby given to modify this font, as long as the -modifier's name is placed on a comment line. - -Modified by Paul Burton 12/96 to include new parameter -supported by FIGlet and FIGWin. May also be slightly modified for better use -of new full-width/kern/smush alternatives, but default output is NOT changed. - -------------------------------------------Banner Info------------------------------------------ -Banner generated by Text ASCII Art Generator. -A web app that lets you type in large ASCII Art text lettering. -This can create art you can put in your email signature, on your webpage, etc etc. -More at http://patorjk.com/software/taag/ diff --git a/muscle-mis/src/main/resources/bootstrap.yml b/muscle-mis/src/main/resources/bootstrap.yml deleted file mode 100644 index 79e3552f..00000000 --- a/muscle-mis/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,18 +0,0 @@ -spring: - application: - name: @project.artifactId@ - cloud: - consul: - host: "should-be-passed-by-java-opts" - port: 8500 - config: - enabled: true - prefix: config - # `default-context` should be equal to Spring application name - default-context: @project.artifactId@ - profile-separator: "::" - format: YAML - data-key: "data" - watch: - enabled: true - delay: 1000 diff --git a/muscle-mis/src/main/resources/logback-configuration/logback-base.xml b/muscle-mis/src/main/resources/logback-configuration/logback-base.xml deleted file mode 100644 index 6240205c..00000000 --- a/muscle-mis/src/main/resources/logback-configuration/logback-base.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - UTF-8 - - - - - - - ALL - ACCEPT - ACCEPT - - - - ${FILE_LOG_PATTERN} - UTF-8 - - - - - - - ${LOG_HOME}/${APPLICATION}-${ENVIRONMENT}-${HOSTNAME}.%d{yyyy-MM-dd}.%i.log.gz - - 5MB - 7 - 1GB - - - - - - ${LOGSTASH_HOST}:4560 - - {"appname": "${APPLICATION}"} - - - diff --git a/muscle-mis/src/main/resources/logback-configuration/logback-development-docker.xml b/muscle-mis/src/main/resources/logback-configuration/logback-development-docker.xml deleted file mode 100644 index 86b71ee2..00000000 --- a/muscle-mis/src/main/resources/logback-configuration/logback-development-docker.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/muscle-mis/src/main/resources/logback-configuration/logback-development-local.xml b/muscle-mis/src/main/resources/logback-configuration/logback-development-local.xml deleted file mode 100644 index 86b71ee2..00000000 --- a/muscle-mis/src/main/resources/logback-configuration/logback-development-local.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/muscle-mis/src/main/resources/logback-configuration/logback-production.xml b/muscle-mis/src/main/resources/logback-configuration/logback-production.xml deleted file mode 100644 index 86b71ee2..00000000 --- a/muscle-mis/src/main/resources/logback-configuration/logback-production.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/muscle-mis/src/main/resources/logback-configuration/logback-stage.xml b/muscle-mis/src/main/resources/logback-configuration/logback-stage.xml deleted file mode 100644 index 86b71ee2..00000000 --- a/muscle-mis/src/main/resources/logback-configuration/logback-stage.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/muscle-mis/src/main/resources/logback-configuration/logback-test.xml b/muscle-mis/src/main/resources/logback-configuration/logback-test.xml deleted file mode 100644 index 3c705245..00000000 --- a/muscle-mis/src/main/resources/logback-configuration/logback-test.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/muscle-mis/src/test/java/com/jmsoftware/maf/musclemis/MuscleMisApplicationTests.java b/muscle-mis/src/test/java/com/jmsoftware/maf/musclemis/MuscleMisApplicationTests.java deleted file mode 100644 index e0ca5581..00000000 --- a/muscle-mis/src/test/java/com/jmsoftware/maf/musclemis/MuscleMisApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jmsoftware.maf.musclemis; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class MuscleMisApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/pom.xml b/pom.xml index 43697255..023d380f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 8800 - 8801 + 8801 8802 @@ -65,8 +65,7 @@ spring-boot-admin api-gateway auth-center - exercise-mis - muscle-mis + maf-mis static-resource-center @@ -120,12 +119,7 @@ com.jmsoftware.maf - exercise-mis - ${project.version} - - - com.jmsoftware.maf - muscle-mis + maf-mis ${project.version}