diff --git a/build.gradle b/build.gradle index ba55ccf..c3163b7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,9 @@ plugins { id 'org.springframework.boot' version '2.6.6' id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java-library' } -apply plugin: 'java-library' -apply plugin: 'org.springframework.boot' -apply plugin: 'io.spring.dependency-management' - allprojects { sourceCompatibility = 11.0 @@ -15,7 +12,7 @@ allprojects { apply plugin: 'io.spring.dependency-management' group = 'com.roy' - version = '0.0.1-SNAPSHOT' + version = '1.0' repositories { mavenLocal() @@ -23,7 +20,7 @@ allprojects { } jar { - enabled(false) + enabled(true) } ext { diff --git a/catalog-service/build.gradle b/catalog-service/build.gradle index be9868b..7a9a014 100644 --- a/catalog-service/build.gradle +++ b/catalog-service/build.gradle @@ -1,6 +1,26 @@ -dependencies { - implementation(project(":util")) +plugins { + id 'org.springframework.boot' version '2.6.6' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java-library' +} +group = 'com.roy' +version = '1.0' + +repositories { + mavenLocal() + mavenCentral() +} + +jar { + enabled(true) +} + +ext { + set('springCloudVersion', "2021.0.1") +} + +dependencies { implementation 'org.springframework.kafka:spring-kafka' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation' diff --git a/catalog-service/src/main/java/com/roy/springcloud/catalogservice/controller/CatalogController.java b/catalog-service/src/main/java/com/roy/springcloud/catalogservice/controller/CatalogController.java index c50a24b..cf9b5c2 100644 --- a/catalog-service/src/main/java/com/roy/springcloud/catalogservice/controller/CatalogController.java +++ b/catalog-service/src/main/java/com/roy/springcloud/catalogservice/controller/CatalogController.java @@ -3,7 +3,6 @@ package com.roy.springcloud.catalogservice.controller; import com.roy.springcloud.catalogservice.dto.CatalogDto; import com.roy.springcloud.catalogservice.service.CatalogService; import com.roy.springcloud.catalogservice.vo.response.CatalogResponse; -import com.roy.springcloud.util.mapper.MapperUtil; import lombok.RequiredArgsConstructor; import org.springframework.core.env.Environment; import org.springframework.http.HttpStatus; @@ -16,6 +15,8 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.stream.Collectors; +import static com.roy.springcloud.catalogservice.mapper.MapperUtil.toObject; + @RestController @RequiredArgsConstructor @RequestMapping("/catalog-service") @@ -32,7 +33,7 @@ public class CatalogController { public ResponseEntity> getCatalogs() { List savedCatalogs = catalogService.getAllCatalogs(); List response = savedCatalogs.stream() - .map(catalog -> MapperUtil.toObject(catalog, CatalogResponse.class)) + .map(catalog -> toObject(catalog, CatalogResponse.class)) .collect(Collectors.toList()); return ResponseEntity.status(HttpStatus.OK).body(response); } diff --git a/catalog-service/src/main/java/com/roy/springcloud/catalogservice/mapper/MapperUtil.java b/catalog-service/src/main/java/com/roy/springcloud/catalogservice/mapper/MapperUtil.java new file mode 100644 index 0000000..977ad9a --- /dev/null +++ b/catalog-service/src/main/java/com/roy/springcloud/catalogservice/mapper/MapperUtil.java @@ -0,0 +1,24 @@ +package com.roy.springcloud.catalogservice.mapper; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.stream.Collectors; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class MapperUtil { + public static T toObject(S source, Class targetClass, String... ignoreProperties) { + T target = BeanUtils.instantiateClass(targetClass); + BeanUtils.copyProperties(source, target, ignoreProperties); + return target; + } + + public static List toList(List sources, Class targetClass, String... ignoreProperties) { + return sources.stream() + .map(source -> toObject(source, targetClass, ignoreProperties)) + .collect(Collectors.toList()); + } +} + diff --git a/catalog-service/src/main/java/com/roy/springcloud/catalogservice/service/impl/CatalogServiceImpl.java b/catalog-service/src/main/java/com/roy/springcloud/catalogservice/service/impl/CatalogServiceImpl.java index 6876ca6..f68c0e3 100644 --- a/catalog-service/src/main/java/com/roy/springcloud/catalogservice/service/impl/CatalogServiceImpl.java +++ b/catalog-service/src/main/java/com/roy/springcloud/catalogservice/service/impl/CatalogServiceImpl.java @@ -4,7 +4,6 @@ import com.roy.springcloud.catalogservice.domain.Catalog; import com.roy.springcloud.catalogservice.dto.CatalogDto; import com.roy.springcloud.catalogservice.repository.CatalogRepository; import com.roy.springcloud.catalogservice.service.CatalogService; -import com.roy.springcloud.util.mapper.MapperUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.env.Environment; @@ -13,6 +12,8 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import static com.roy.springcloud.catalogservice.mapper.MapperUtil.toObject; + @Slf4j @Service @RequiredArgsConstructor @@ -25,7 +26,7 @@ public class CatalogServiceImpl implements CatalogService { Iterable savedCatalogs = catalogRepository.findAll(); List response = new ArrayList<>(); savedCatalogs.forEach(catalog -> { - response.add(MapperUtil.toObject(catalog, CatalogDto.class)); + response.add(toObject(catalog, CatalogDto.class)); }); return response; } diff --git a/catalog-service/src/test/java/com/roy/springcloud/catalogservice/CatalogServiceApplicationTests.java b/catalog-service/src/test/java/com/roy/springcloud/catalogservice/CatalogServiceApplicationTests.java deleted file mode 100644 index 69c3857..0000000 --- a/catalog-service/src/test/java/com/roy/springcloud/catalogservice/CatalogServiceApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.roy.springcloud.catalogservice; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class CatalogServiceApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/document/containerization/docker_run.md b/document/containerization/docker_run.md new file mode 100644 index 0000000..a566473 --- /dev/null +++ b/document/containerization/docker_run.md @@ -0,0 +1,114 @@ +[이전 장(링크)](https://imprint.tistory.com/254) 에서는 `도커란 무엇인가`와 `도커 설치 방법`에 대해서 알아보았다. +이번 장에서는 `도커 이미지`를 실행하는 방법과 저장소에 `Push`, `Pull`하는 방법에 대해서 알아본다. +모든 소스 코드는 [깃 허브 (링크)](https://github.com/roy-zz/spring-cloud) 에 올려두었다. + +--- + +### Docker 실행 + +우리의 마이크로서비스가 사용하고 있는 `MariaDB`를 도커 이미지로 실행하는 방법에 대해서 알아본다. + +1. 이미지 확인 + +`hub.docker.com`에 접속하여 우리가 사용하려는 이미지 파일을 확인한다. + +![](docker_run_image/mariadb-in-dockerhub.png) + +2. 이미지 다운로드(생략 가능) + +아래의 커맨드를 입력하여 도커 이미지를 다운로드 한다. +컨테이너를 실행할 때 PC가 없다면 자동으로 다운로드 하지만 이번에는 단계를 나누어 진행한다. + +```bash +$ docker pull mariadb +``` + +![](docker_run_image/installed-mariadb-image.png) + +아래의 커맨드를 입력하여 도커 이미지 목록을 확인한다. + +```bash +$ docker images +``` + +![](docker_run_image/docker-images.png) + +3. 컨테이너 실행 + +아래의 커맨드를 입력하여 도커 컨테이너를 실행한다. + +```bash +$ docker run -d -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=true --name mariadb mariadb +``` + +![](docker_run_image/mariadb-container-run.png) + +아래의 커맨드를 입력하여 컨테이너 목록을 확인한다. + +```bash +$ docker ps +``` + +![](docker_run_image/mariadb-docker-ps-result.png) + +도커를 실행할 때 사용하는 옵션에 대한 정보는 공식 홈페이지나 아래의 이미지를 참고한다. + +![](docker_run_image/docker-run-options.png) + +4. 컨테이너 접속 (단순 접속 확인, 실행 과정과 무관) + +아래의 커맨드를 입력하여 도커 컨테이너에 접속하여 정상적으로 실행되었는지 DB 클라이언트를 통해 접속해본다. + +```bash +$ docker exec -it mariadb bash +``` + +![](docker_run_image/into-mariadb-container.png) + +5. 도커 로그 확인 (단순 로그 확인, 실행 과정과 무관) + +아래의 커맨드를 실행하여 도커의 로그를 확인해본다. + +```bash +$ docker logs -f mariadb +``` + +![](docker_run_image/mariadb-logs.png) + +--- + +### 이미지 생성 및 저장소 사용 + +우리의 마이크로서비스중 유저 서비스를 도커 이미지로 만들고 저장소(Docker Hub)에 `Push`하는 방법에 대해서 알아본다. + +1. Dockerfile 생성 + +`target` 디렉토리가 있는 경로에 아래와 같이 `Dockerfile`을 생성한다. + +```dockerfile +FROM openjdk:17-ea-11-jdk-slim +VOLUME /tmp +COPY target/user-service-1.0.jar UserService.jar +ENTRYPOINT ["java", "-jar", "UserService.jar"] +``` + +2. jar build + + + + + + + + + + + + + + +--- + +**참고한 강의:** + +- https://www.inflearn.com/course/%EC%8A%A4%ED%94%84%EB%A7%81-%ED%81%B4%EB%9D%BC%EC%9A%B0%EB%93%9C-%EB%A7%88%EC%9D%B4%ED%81%AC%EB%A1%9C%EC%84%9C%EB%B9%84%EC%8A%A4 \ No newline at end of file diff --git a/document/containerization/docker_run_image/docker-images.png b/document/containerization/docker_run_image/docker-images.png new file mode 100644 index 0000000..36bb582 Binary files /dev/null and b/document/containerization/docker_run_image/docker-images.png differ diff --git a/document/containerization/docker_run_image/docker-run-options.png b/document/containerization/docker_run_image/docker-run-options.png new file mode 100644 index 0000000..997606b Binary files /dev/null and b/document/containerization/docker_run_image/docker-run-options.png differ diff --git a/document/containerization/docker_run_image/installed-mariadb-image.png b/document/containerization/docker_run_image/installed-mariadb-image.png new file mode 100644 index 0000000..8ad96cb Binary files /dev/null and b/document/containerization/docker_run_image/installed-mariadb-image.png differ diff --git a/document/containerization/docker_run_image/into-mariadb-container.png b/document/containerization/docker_run_image/into-mariadb-container.png new file mode 100644 index 0000000..5213984 Binary files /dev/null and b/document/containerization/docker_run_image/into-mariadb-container.png differ diff --git a/document/containerization/docker_run_image/mariadb-container-run.png b/document/containerization/docker_run_image/mariadb-container-run.png new file mode 100644 index 0000000..f3a22f4 Binary files /dev/null and b/document/containerization/docker_run_image/mariadb-container-run.png differ diff --git a/document/containerization/docker_run_image/mariadb-docker-ps-result.png b/document/containerization/docker_run_image/mariadb-docker-ps-result.png new file mode 100644 index 0000000..ca379d6 Binary files /dev/null and b/document/containerization/docker_run_image/mariadb-docker-ps-result.png differ diff --git a/document/containerization/docker_run_image/mariadb-in-dockerhub.png b/document/containerization/docker_run_image/mariadb-in-dockerhub.png new file mode 100644 index 0000000..45adc09 Binary files /dev/null and b/document/containerization/docker_run_image/mariadb-in-dockerhub.png differ diff --git a/document/containerization/docker_run_image/mariadb-logs.png b/document/containerization/docker_run_image/mariadb-logs.png new file mode 100644 index 0000000..3c31dc7 Binary files /dev/null and b/document/containerization/docker_run_image/mariadb-logs.png differ diff --git a/order-service/build.gradle b/order-service/build.gradle index a6fa7ee..f990915 100644 --- a/order-service/build.gradle +++ b/order-service/build.gradle @@ -1,6 +1,26 @@ -dependencies { - implementation(project(":util")) +plugins { + id 'org.springframework.boot' version '2.6.6' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java-library' +} +group = 'com.roy' +version = '1.0' + +repositories { + mavenLocal() + mavenCentral() +} + +jar { + enabled(true) +} + +ext { + set('springCloudVersion', "2021.0.1") +} + +dependencies { implementation 'org.mariadb.jdbc:mariadb-java-client:3.0.4' implementation 'org.springframework.kafka:spring-kafka' implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/order-service/src/main/java/com/roy/springcloud/orderservice/controller/OrderController.java b/order-service/src/main/java/com/roy/springcloud/orderservice/controller/OrderController.java index 29ae7d6..138a934 100644 --- a/order-service/src/main/java/com/roy/springcloud/orderservice/controller/OrderController.java +++ b/order-service/src/main/java/com/roy/springcloud/orderservice/controller/OrderController.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -import static com.roy.springcloud.util.mapper.MapperUtil.toObject; +import static com.roy.springcloud.orderservice.mapper.MapperUtil.toObject; @RestController @RequiredArgsConstructor diff --git a/util/src/main/java/com/roy/springcloud/util/mapper/MapperUtil.java b/order-service/src/main/java/com/roy/springcloud/orderservice/mapper/MapperUtil.java similarity index 94% rename from util/src/main/java/com/roy/springcloud/util/mapper/MapperUtil.java rename to order-service/src/main/java/com/roy/springcloud/orderservice/mapper/MapperUtil.java index dc38a23..1513968 100644 --- a/util/src/main/java/com/roy/springcloud/util/mapper/MapperUtil.java +++ b/order-service/src/main/java/com/roy/springcloud/orderservice/mapper/MapperUtil.java @@ -1,4 +1,4 @@ -package com.roy.springcloud.util.mapper; +package com.roy.springcloud.orderservice.mapper; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/order-service/src/main/java/com/roy/springcloud/orderservice/service/impl/OrderServiceImpl.java b/order-service/src/main/java/com/roy/springcloud/orderservice/service/impl/OrderServiceImpl.java index 5d55146..27911b9 100644 --- a/order-service/src/main/java/com/roy/springcloud/orderservice/service/impl/OrderServiceImpl.java +++ b/order-service/src/main/java/com/roy/springcloud/orderservice/service/impl/OrderServiceImpl.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import static com.roy.springcloud.util.mapper.MapperUtil.toObject; +import static com.roy.springcloud.orderservice.mapper.MapperUtil.toObject; @Service @RequiredArgsConstructor diff --git a/order-service/src/test/java/com/roy/springcloud/orderservice/OrderServiceApplicationTests.java b/order-service/src/test/java/com/roy/springcloud/orderservice/OrderServiceApplicationTests.java deleted file mode 100644 index fa11ae3..0000000 --- a/order-service/src/test/java/com/roy/springcloud/orderservice/OrderServiceApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.roy.springcloud.orderservice; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class OrderServiceApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/settings.gradle b/settings.gradle index c61b0a1..f44a3bd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,9 @@ rootProject.name = 'springcloud' -include("discovery") -include("gateway") -include("test-server1") -include("test-server2") -include("user-service") -include("order-service") -include("catalog-service") -include("config") -include("util") \ No newline at end of file +include ':discovery' +include ':gateway' +include ':test-server1' +include ':test-server2' +include ':user-service' +include ':order-service' +include ':catalog-service' +include ':config' \ No newline at end of file diff --git a/user-service/Dockerfile b/user-service/Dockerfile new file mode 100644 index 0000000..c19c5b6 --- /dev/null +++ b/user-service/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:17-ea-11-jdk-slim +VOLUME /tmp +COPY target/user-service-1.0.jar UserService.jar +ENTRYPOINT ["java", "-jar", "UserService.jar"] \ No newline at end of file diff --git a/user-service/build.gradle b/user-service/build.gradle index f5fa7d9..c5b5c28 100644 --- a/user-service/build.gradle +++ b/user-service/build.gradle @@ -1,6 +1,26 @@ -dependencies { - implementation(project(":util")) +plugins { + id 'org.springframework.boot' version '2.6.6' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java-library' +} +group = 'com.roy' +version = '1.0' + +repositories { + mavenLocal() + mavenCentral() +} + +jar { + enabled(true) +} + +ext { + set('springCloudVersion', "2021.0.1") +} + +dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-web' @@ -21,8 +41,6 @@ dependencies { runtimeOnly 'com.h2database:h2:1.3.176' - developmentOnly 'org.springframework.boot:spring-boot-devtools' - annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/user-service/settings.gradle b/user-service/settings.gradle index eb2f57d..4469b17 100644 --- a/user-service/settings.gradle +++ b/user-service/settings.gradle @@ -1 +1 @@ -rootProject.name = 'user-service' +rootProject.name = 'user-service' \ No newline at end of file diff --git a/user-service/src/main/java/com/roy/springcloud/userservice/controller/MyUserController.java b/user-service/src/main/java/com/roy/springcloud/userservice/controller/MyUserController.java index c99035e..3aa455a 100644 --- a/user-service/src/main/java/com/roy/springcloud/userservice/controller/MyUserController.java +++ b/user-service/src/main/java/com/roy/springcloud/userservice/controller/MyUserController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; -import static com.roy.springcloud.util.mapper.MapperUtil.toObject; +import static com.roy.springcloud.userservice.util.mapper.MapperUtil.toObject; @RestController @RequestMapping("") diff --git a/user-service/src/main/java/com/roy/springcloud/userservice/service/impl/MyUserServiceImpl.java b/user-service/src/main/java/com/roy/springcloud/userservice/service/impl/MyUserServiceImpl.java index ae2c12a..77cf20b 100644 --- a/user-service/src/main/java/com/roy/springcloud/userservice/service/impl/MyUserServiceImpl.java +++ b/user-service/src/main/java/com/roy/springcloud/userservice/service/impl/MyUserServiceImpl.java @@ -23,7 +23,7 @@ import org.springframework.web.client.RestTemplate; import java.util.*; -import static com.roy.springcloud.util.mapper.MapperUtil.toObject; +import static com.roy.springcloud.userservice.util.mapper.MapperUtil.toObject; @Slf4j @Service diff --git a/user-service/src/main/java/com/roy/springcloud/userservice/util/mapper/MapperUtil.java b/user-service/src/main/java/com/roy/springcloud/userservice/util/mapper/MapperUtil.java new file mode 100644 index 0000000..8c587f8 --- /dev/null +++ b/user-service/src/main/java/com/roy/springcloud/userservice/util/mapper/MapperUtil.java @@ -0,0 +1,24 @@ +package com.roy.springcloud.userservice.util.mapper; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.stream.Collectors; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class MapperUtil { + public static T toObject(S source, Class targetClass, String... ignoreProperties) { + T target = BeanUtils.instantiateClass(targetClass); + BeanUtils.copyProperties(source, target, ignoreProperties); + return target; + } + + public static List toList(List sources, Class targetClass, String... ignoreProperties) { + return sources.stream() + .map(source -> toObject(source, targetClass, ignoreProperties)) + .collect(Collectors.toList()); + } +} + diff --git a/util/build.gradle b/util/build.gradle deleted file mode 100644 index fea0f1b..0000000 --- a/util/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -dependencies { - api 'org.springframework.boot:spring-boot-starter' - - compileOnly 'org.projectlombok:lombok' - - annotationProcessor 'org.projectlombok:lombok' -} diff --git a/util/gradle/wrapper/gradle-wrapper.jar b/util/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 41d9927..0000000 Binary files a/util/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/util/gradle/wrapper/gradle-wrapper.properties b/util/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 00e33ed..0000000 --- a/util/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/util/gradlew b/util/gradlew deleted file mode 100755 index 1b6c787..0000000 --- a/util/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/util/gradlew.bat b/util/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/util/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/util/settings.gradle b/util/settings.gradle deleted file mode 100644 index 28b50c8..0000000 --- a/util/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'util' diff --git a/util/src/main/resources/application.properties b/util/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/util/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/util/src/test/java/com/roy/springcloud/util/UtilApplicationTests.java b/util/src/test/java/com/roy/springcloud/util/UtilApplicationTests.java deleted file mode 100644 index 9977178..0000000 --- a/util/src/test/java/com/roy/springcloud/util/UtilApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.roy.springcloud.util; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class UtilApplicationTests { - - @Test - void contextLoads() { - } - -}