diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4f27a85 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +### Example user template template +### Example user template + +# IntelliJ project files +.idea +*.iml +out +gen diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c72b229 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ + +build: + exec ./build.sh + +deploy: + exec ./deploy.sh + +clean: + exec ./clean.sh + + +.PHONY : build deploy clean \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..d26dbe7 --- /dev/null +++ b/build.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env sh + +set -ex + +BUILD_VERSION="0.0.1-SNAPSHOT" +MODULE_PATH="./web-svc-demo" + +cd $MODULE_PATH || exit + +./gradlew build +mkdir output +cp "./build/libs/web-svc-demo-$BUILD_VERSION.jar" ./output/app.jar \ No newline at end of file diff --git a/clean.sh b/clean.sh new file mode 100755 index 0000000..21e67a7 --- /dev/null +++ b/clean.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +set -ex + +MODULE_PATH="./web-svc-demo" + +cd $MODULE_PATH || exit + +./gradlew clean \ No newline at end of file diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..cc47801 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env sh + +set -ex + +MODULE_PATH="./web-svc-demo" + +cp "$MODULE_PATH/output/*" /app/ \ No newline at end of file diff --git a/exec.sh b/exec.sh deleted file mode 100644 index 8a52699..0000000 --- a/exec.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e - -while true ; do - echo "executing..." - sleep 1 -done \ No newline at end of file diff --git a/upack.json b/upack.json index 316851a..9ceb83a 100644 --- a/upack.json +++ b/upack.json @@ -1,15 +1,15 @@ { - "name": "test", + "name": "test-java", "version": "v1alpha1", - "description": "test pack", + "description": "test java pack", "engines": { "build": "alpine:3", "deploy": "alpine:3" }, "build_steps": [ - "echo \"build step 1\"", "echo \"build step 2\"" + "make build", "make clean" ], - "deploy_steps": ["chmod +x exec.sh"], - "main": "./exec.sh", + "deploy_steps": ["make deploy"], + "main": "java -jar /app/app.jar", "author": "test" } \ No newline at end of file diff --git a/web-svc-demo/.gitignore b/web-svc-demo/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/web-svc-demo/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/web-svc-demo/build.gradle b/web-svc-demo/build.gradle new file mode 100644 index 0000000..2646580 --- /dev/null +++ b/web-svc-demo/build.gradle @@ -0,0 +1,35 @@ +plugins { + id 'org.springframework.boot' version '2.5.4' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'cn.idmesh' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '1.8' + +repositories { + maven { url 'https://maven.aliyun.com/repository/jcenter' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } +} + +dependencies { + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:2.5.3" + implementation 'org.springframework.boot:spring-boot-starter-web:2.5.3' + testImplementation 'org.springframework.boot:spring-boot-starter-test:2.5.3' +} + +test { + useJUnitPlatform() +} + +allprojects { + repositories { + maven { url 'https://maven.aliyun.com/repository/jcenter' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + } +} \ No newline at end of file diff --git a/web-svc-demo/gradle/wrapper/gradle-wrapper.jar b/web-svc-demo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/web-svc-demo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/web-svc-demo/gradle/wrapper/gradle-wrapper.properties b/web-svc-demo/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..05679dc --- /dev/null +++ b/web-svc-demo/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/web-svc-demo/gradlew b/web-svc-demo/gradlew new file mode 100755 index 0000000..744e882 --- /dev/null +++ b/web-svc-demo/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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 "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/web-svc-demo/gradlew.bat b/web-svc-demo/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/web-svc-demo/gradlew.bat @@ -0,0 +1,89 @@ +@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/web-svc-demo/settings.gradle b/web-svc-demo/settings.gradle new file mode 100644 index 0000000..04a04a3 --- /dev/null +++ b/web-svc-demo/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'web-svc-demo' \ No newline at end of file diff --git a/web-svc-demo/src/main/java/cn/idmesh/config/GreetingConfig.java b/web-svc-demo/src/main/java/cn/idmesh/config/GreetingConfig.java new file mode 100644 index 0000000..8c0bab5 --- /dev/null +++ b/web-svc-demo/src/main/java/cn/idmesh/config/GreetingConfig.java @@ -0,0 +1,20 @@ +package cn.idmesh.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +@PropertySource(value = "classpath:application.properties") +@ConfigurationProperties(prefix = "greeting") +public class GreetingConfig { + private String message; + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/web-svc-demo/src/main/java/cn/idmesh/controller/Greeting.java b/web-svc-demo/src/main/java/cn/idmesh/controller/Greeting.java new file mode 100644 index 0000000..0d7d0fb --- /dev/null +++ b/web-svc-demo/src/main/java/cn/idmesh/controller/Greeting.java @@ -0,0 +1,20 @@ +package cn.idmesh.controller; + +import cn.idmesh.config.GreetingConfig; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Map; + +@RestController +public class Greeting { + @Resource + private GreetingConfig greetingConfig; + + @GetMapping(path = "/greeting") + public Map greeting() { + return Collections.singletonMap("message", greetingConfig.getMessage()); + } +} diff --git a/web-svc-demo/src/main/java/cn/idmesh/websvcdemo/WebSvcDemoApplication.java b/web-svc-demo/src/main/java/cn/idmesh/websvcdemo/WebSvcDemoApplication.java new file mode 100644 index 0000000..8117a44 --- /dev/null +++ b/web-svc-demo/src/main/java/cn/idmesh/websvcdemo/WebSvcDemoApplication.java @@ -0,0 +1,17 @@ +package cn.idmesh.websvcdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@ComponentScan(basePackages = {"cn.idmesh"}) +@ConfigurationPropertiesScan(basePackages = {"cn.idmesh.config"}) +public class WebSvcDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(WebSvcDemoApplication.class, args); + } + +} diff --git a/web-svc-demo/src/main/resources/application.properties b/web-svc-demo/src/main/resources/application.properties new file mode 100644 index 0000000..1a23dfc --- /dev/null +++ b/web-svc-demo/src/main/resources/application.properties @@ -0,0 +1,2 @@ +greeting.message=hello + diff --git a/web-svc-demo/src/test/java/cn/idmesh/websvcdemo/WebSvcDemoApplicationTests.java b/web-svc-demo/src/test/java/cn/idmesh/websvcdemo/WebSvcDemoApplicationTests.java new file mode 100644 index 0000000..6bb58ac --- /dev/null +++ b/web-svc-demo/src/test/java/cn/idmesh/websvcdemo/WebSvcDemoApplicationTests.java @@ -0,0 +1,13 @@ +package cn.idmesh.websvcdemo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class WebSvcDemoApplicationTests { + + @Test + void contextLoads() { + } + +}