From 9a6b8d8220e31d68058eb4700c4815fde3a361cb Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Sat, 7 Oct 2023 20:58:40 +0800 Subject: [PATCH 1/8] update --- .mvn/wrapper/MavenWrapperDownloader.java | 3 - .mvn/wrapper/maven-wrapper.properties | 3 - gradle/wrapper/gradle-wrapper.properties | 6 - gradlew | 244 ----------------------- gradlew.bat | 92 --------- release.properties | 26 --- settings.gradle | 11 - 7 files changed, 385 deletions(-) delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100644 gradlew delete mode 100644 gradlew.bat delete mode 100644 release.properties delete mode 100644 settings.gradle diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java index 298502d..ca3fde7 100644 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -1,6 +1,3 @@ -#set($symbol_pound='#') - #set($symbol_dollar='$') - #set($symbol_escape='\' ) /* * Copyright 2007-present the original author or authors. * diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 1f7ef15..a335475 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,8 +14,5 @@ # limitations under the License. # -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index f398c33..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip -networkTimeout=10000 -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100644 index 65dcd68..0000000 --- a/gradlew +++ /dev/null @@ -1,244 +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/HEAD/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 - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# 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*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - 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 \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# 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/gradlew.bat b/gradlew.bat deleted file mode 100644 index 93e3f59..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,92 +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=. -@rem This is normally unused -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% equ 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% equ 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! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/release.properties b/release.properties deleted file mode 100644 index 7d90a23..0000000 --- a/release.properties +++ /dev/null @@ -1,26 +0,0 @@ -#release configuration -#Thu Feb 02 15:01:23 CST 2023 -scm.commentPrefix=[maven-release-plugin] -exec.pomFileName=pom.xml -pushChanges=true -releaseStrategyId=default -project.scm.org.ylzl.eden.demo\:eden-demo-cola-app.empty=true -project.scm.org.ylzl.eden.demo\:eden-demo-cola-client.empty=true -project.scm.org.ylzl.eden.demo\:eden-demo-cola.empty=true -remoteTagging=true -scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} -projectVersionPolicyId=default -project.scm.org.ylzl.eden.demo\:eden-demo-cola-infrastructure.empty=true -scm.url=scm\:git\:ssh\://git@github.com/shiyindaxiaojie/eden-architect.git/eden-components/eden-dependencies/eden-parent/eden-demo-cola -scm.tagNameFormat=v@{project.version} -pinExternals=false -project.scm.org.ylzl.eden.demo\:eden-demo-cola-domain.empty=true -preparationGoals=clean verify -project.scm.org.ylzl.eden.demo\:eden-demo-cola-adapter.empty=true -scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} -exec.snapshotReleasePluginAllowed=true -exec.activateProfiles=codeup,unit-test -scm.developmentCommitComment=@{prefix} prepare for next development iteration -project.scm.org.ylzl.eden.demo\:eden-demo-cola-start.empty=true -scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} -completedPhase=scm-check-modifications diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 3545af7..0000000 --- a/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -rootProject.name = 'eden-demo-cola' -include(':eden-demo-cola-app') -include(':eden-demo-cola-client') -include(':eden-demo-cola-infrastructure') -include(':eden-demo-cola-domain') -include(':eden-demo-cola-adapter') -include(':eden-demo-cola-start') From ce88191916f17f091ce8a2518686a62f22f25928 Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Mon, 16 Oct 2023 20:47:52 +0800 Subject: [PATCH 2/8] update --- eden-demo-cola-start/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eden-demo-cola-start/pom.xml b/eden-demo-cola-start/pom.xml index 29b8922..e63c240 100644 --- a/eden-demo-cola-start/pom.xml +++ b/eden-demo-cola-start/pom.xml @@ -81,7 +81,7 @@ 128m 320m -Dserver.port=8080 -Dmanagement.server.port=9080 - 320m + dev USE_CURRENT_TIMESTAMP ${start-class} From 349e6eb441078e8def9dd08a9ab2ab320c58cd2a Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Mon, 16 Oct 2023 20:58:39 +0800 Subject: [PATCH 3/8] update --- ...org.ylzl.eden.demo.java-conventions.gradle | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 buildSrc/src/main/groovy/org.ylzl.eden.demo.java-conventions.gradle diff --git a/buildSrc/src/main/groovy/org.ylzl.eden.demo.java-conventions.gradle b/buildSrc/src/main/groovy/org.ylzl.eden.demo.java-conventions.gradle deleted file mode 100644 index c994b5e..0000000 --- a/buildSrc/src/main/groovy/org.ylzl.eden.demo.java-conventions.gradle +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'java-library' - id 'maven-publish' -} - -repositories { - mavenLocal() - maven { - url = uri('https://repo.maven.apache.org/maven2/') - } -} - -group = 'org.ylzl.eden.demo' -version = '0.0.1-SNAPSHOT' -java.sourceCompatibility = JavaVersion.VERSION_1_8 - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -tasks.withType(Javadoc) { - options.encoding = 'UTF-8' -} From 7abfae23c4c788e6783b01d28495d25047cc96e5 Mon Sep 17 00:00:00 2001 From: shiyindaxiaojie <1813986321@qq.com> Date: Wed, 1 Nov 2023 00:45:22 +0800 Subject: [PATCH 4/8] update --- .../src/main/resources/mapper/UserMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eden-demo-cola-infrastructure/src/main/resources/mapper/UserMapper.xml b/eden-demo-cola-infrastructure/src/main/resources/mapper/UserMapper.xml index d61dc18..add626f 100644 --- a/eden-demo-cola-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/eden-demo-cola-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -53,6 +53,9 @@ AND login = #{login} + + AND email = #{email} + From b66a7f072bbce35ab77e4695e076b15362087f07 Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Tue, 14 Nov 2023 20:58:56 +0800 Subject: [PATCH 5/8] add distributed-uid --- eden-demo-cola-infrastructure/pom.xml | 6 ++++++ .../src/main/resources/config/application.yml | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/eden-demo-cola-infrastructure/pom.xml b/eden-demo-cola-infrastructure/pom.xml index 2510c60..cb8ef0d 100644 --- a/eden-demo-cola-infrastructure/pom.xml +++ b/eden-demo-cola-infrastructure/pom.xml @@ -139,5 +139,11 @@ io.github.shiyindaxiaojie eden-dynamic-tp-spring-cloud-starter + + + + io.github.shiyindaxiaojie + eden-distributed-uid-spring-boot-starter + diff --git a/eden-demo-cola-start/src/main/resources/config/application.yml b/eden-demo-cola-start/src/main/resources/config/application.yml index 0555197..1f64419 100644 --- a/eden-demo-cola-start/src/main/resources/config/application.yml +++ b/eden-demo-cola-start/src/main/resources/config/application.yml @@ -172,6 +172,23 @@ mybatis-plus: # ORM 组件 call-setters-on-nulls: true use-column-label: true type-aliases-package: org.ylzl.eden.demo.infrastructure + id-generator: + type: segment # 号段生成 + +distributed-uid: + snowflake-generator: + enabled: false + coordinator: + type: zookeeper + zookeeper: + connect-string: lolalhost:2181 + segment-generator: + enabled: true + liquibase: + username: sa + password: demo + url: jdbc:h2:mem:db;DB_CLOSE_ON_EXIT=TRUE + driver-class-name: org.h2.Driver arthas: # 在线诊断工具 agent-id: ${spring.application.name}@${random.value} From e5144fb8df78610e6ed4e62b4e93da1b4c0e7154 Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Tue, 21 Nov 2023 20:51:56 +0800 Subject: [PATCH 6/8] add distributed-uid --- eden-demo-cola-infrastructure/pom.xml | 6 ++++++ eden-demo-cola-start/pom.xml | 6 ------ .../src/main/resources/config/application.yml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eden-demo-cola-infrastructure/pom.xml b/eden-demo-cola-infrastructure/pom.xml index cb8ef0d..e1ff637 100644 --- a/eden-demo-cola-infrastructure/pom.xml +++ b/eden-demo-cola-infrastructure/pom.xml @@ -112,6 +112,12 @@ io.github.shiyindaxiaojie eden-shardingsphere-spring-boot-starter + + + curator-client + org.apache.curator + + diff --git a/eden-demo-cola-start/pom.xml b/eden-demo-cola-start/pom.xml index e63c240..0320387 100644 --- a/eden-demo-cola-start/pom.xml +++ b/eden-demo-cola-start/pom.xml @@ -106,12 +106,6 @@ io.github.shiyindaxiaojie.eden.demo eden-demo-cola-adapter - - - curator-client - org.apache.curator - - diff --git a/eden-demo-cola-start/src/main/resources/config/application.yml b/eden-demo-cola-start/src/main/resources/config/application.yml index 1f64419..12d8ae8 100644 --- a/eden-demo-cola-start/src/main/resources/config/application.yml +++ b/eden-demo-cola-start/src/main/resources/config/application.yml @@ -173,15 +173,15 @@ mybatis-plus: # ORM 组件 use-column-label: true type-aliases-package: org.ylzl.eden.demo.infrastructure id-generator: - type: segment # 号段生成 + type: segment # 号段生成（snowflake/segment） -distributed-uid: +distributed-uid: # 分布式ID生成器 snowflake-generator: enabled: false coordinator: type: zookeeper zookeeper: - connect-string: lolalhost:2181 + connect-string: localhost:2181 segment-generator: enabled: true liquibase: @@ -264,7 +264,7 @@ xxl: # 分布式调度平台 cat: # 实时监控平台 enabled: false # 默认关闭，请按需开启 -opentracing: # Jaeger +opentracing: # 开放式链路跟踪规范 jaeger: service-name: ${spring.application.name} enabled: false From fa1d7a2bed6bfe0d3855a38eb03409d5a889d8b1 Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Mon, 15 Jan 2024 19:40:00 +0800 Subject: [PATCH 7/8] update --- .../org/ylzl/eden/demo/adapter/user/job/UserJobHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eden-demo-cola-adapter/src/main/java/org/ylzl/eden/demo/adapter/user/job/UserJobHandler.java b/eden-demo-cola-adapter/src/main/java/org/ylzl/eden/demo/adapter/user/job/UserJobHandler.java index b87d57b..63fe216 100644 --- a/eden-demo-cola-adapter/src/main/java/org/ylzl/eden/demo/adapter/user/job/UserJobHandler.java +++ b/eden-demo-cola-adapter/src/main/java/org/ylzl/eden/demo/adapter/user/job/UserJobHandler.java @@ -20,7 +20,6 @@ import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.ylzl.eden.spring.integration.xxljob.XxlJobRegister; /** * 用户信息离线处理 @@ -32,7 +31,8 @@ @Component public class UserJobHandler { - @XxlJobRegister(desc = "用户信息离线处理", author = "梦想歌", cron = "30 * * * * ?") // 自动注册到XxlJob + // 目前 XxlJob2.x 开源版本扩展性特别差，暂时不支持 自动注册到 XxlJob + // @XxlJobRegister(desc = "用户信息离线处理", author = "梦想歌", cron = "30 * * * * ?") @XxlJob(value = "userJobHandler", init = "init", destroy = "destroy") public void jobHandler() throws Exception { XxlJobHelper.log("XXL-JOB, Hello World."); From 25903440c3eda63a46c2d52133c6357411ed0fcb Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Mon, 5 Aug 2024 17:00:55 +0800 Subject: [PATCH 8/8] update --- docker/Dockerfile | 7 +++- docker/entrypoint.sh | 42 +++++++++++++++---- .../src/main/docker/jib/entrypoint.sh | 42 +++++++++++++++---- 3 files changed, 75 insertions(+), 16 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 652fe64..88353cb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,12 +24,15 @@ ARG HOME=/app ARG LOG=$HOME/logs ENV WORKDIR $HOME ENV START_DELAY_SECS 1 -ENV JVM_DEBUG "n" ENV JVM_XMS "1g" ENV JVM_XMX "1g" -ENV JVM_XMN "512m" +ENV JVM_XSS "256k" ENV JVM_MS "128m" ENV JVM_MMS "320m" +ENV USE_HEAP_DUMP "y" +ENV USE_GC_LOG "y" +ENV USE_LARGE_PAGES "n" +ENV DEBUG "n" ENV SPRING_PROFILES_ACTIVE "dev" ENV SERVER_PORT "8080" ENV MANAGEMENT_SERVER_PORT "9080" diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index f1cbfe0..29969f9 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,13 +1,41 @@ #!/bin/bash -JAVA_OPTS="${JAVA_OPTS} -XX:+UseG1GC" -JAVA_OPTS="${JAVA_OPTS} -server -Xms${JVM_XMS} -Xmx${JVM_XMX} -Xmn${JVM_XMN} -XX:MetaspaceSize=${JVM_MS} -XX:MaxMetaspaceSize=${JVM_MMS}" -JAVA_OPTS="${JAVA_OPTS} -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${WORKDIR}/logs/java_heapdump.hprof" -JAVA_OPTS="${JAVA_OPTS} -XX:-UseLargePages" -if [[ "${JVM_DEBUG}" == "y" ]]; then +JAVA_OPTS="${JAVA_OPTS} -server -XX:+AlwaysPreTouch -XX:-DisplayVMOutput -XX:+PrintFlagsFinal" +JAVA_OPTS="${JAVA_OPTS} -XX:-OmitStackTraceInFastThrow" +JAVA_OPTS="${JAVA_OPTS} -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+UnlockCommercialFeatures" +JAVA_OPTS="${JAVA_OPTS} -XX:+FlightRecorder -XX:+DebugNonSafepoints -XX:+SafepointTimeout -XX:SafepointTimeoutDelay=500" +JAVA_OPTS="${JAVA_OPTS} -XX:+PrintSafepointStatistics -XX:PrintSafepointStatisticsCount=1" +JAVA_OPTS="${JAVA_OPTS} -Xms${JVM_XMS} -Xmx${JVM_XMX} -Xss${JVM_XSS} -XX:MetaspaceSize=${JVM_MS} -XX:MaxMetaspaceSize=${JVM_MMS}" +JAVA_OPTS="${JAVA_OPTS} -XX:ConcGCThreads=6 -XX:ParallelGCThreads=8" + +if [[ "${USE_G1_GC}" == "y" ]]; then + echo "G1 garbage collection is enabled." + JAVA_OPTS="${JAVA_OPTS} -XX:+UseG1GC -XX:G1LogLevel=finest -XX:G1NewSizePercent=50 -XX:MaxGCPauseMillis=200" + JAVA_OPTS="${JAVA_OPTS} -XX:InitiatingHeapOccupancyPercent=45 -XX:G1MixedGCLiveThresholdPercent=65" +fi + +if [[ "${USE_HEAP_DUMP}" == "y" ]]; then + echo "Heap dump path is '${WORKDIR}/logs/jvm_heap_dump.hprof'." + JAVA_OPTS="${JAVA_OPTS} -XX:HeapDumpPath=${WORKDIR}/logs/jvm_heap_dump.hprof -XX:+HeapDumpOnOutOfMemoryError" +fi + +if [[ "${USE_GC_LOG}" == "y" ]]; then + echo "GC log path is '/dev/shm/logs/jvm_gc.log'." + JAVA_OPTS="${JAVA_OPTS} -XX:LogFile=/dev/shm/logs/jvm_gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps" + JAVA_OPTS="${JAVA_OPTS} -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=10m" + JAVA_OPTS="${JAVA_OPTS} -XX:+PrintReferenceGC -XX:+PrintHeapAtGC -XX:+PrintGCApplicationStoppedTime" +fi + +if [[ "${USE_LARGE_PAGES}" == "y" ]]; then + echo "Use large pages." + JAVA_OPTS="${JAVA_OPTS} -XX:+UseLargePages" +fi + +if [[ "${DEBUG}" == "y" ]]; then + echo "Attach to remote JVM using port 5005." JAVA_OPTS="${JAVA_OPTS} -Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n" fi -echo "The application will start in ${START_DELAY_SECS}s..." +echo "The application will start in ${START_DELAY_SECS}s." sleep ${START_DELAY_SECS} -exec java $JAVA_OPTS -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom "org.springframework.boot.loader.JarLauncher" "$@" +exec java $JAVA_OPTS -noverify -Djava.security.egd=file:/dev/./urandom "org.springframework.boot.loader.JarLauncher" "$@" diff --git a/eden-demo-cola-start/src/main/docker/jib/entrypoint.sh b/eden-demo-cola-start/src/main/docker/jib/entrypoint.sh index 05dfdb7..75a239e 100644 --- a/eden-demo-cola-start/src/main/docker/jib/entrypoint.sh +++ b/eden-demo-cola-start/src/main/docker/jib/entrypoint.sh @@ -1,13 +1,41 @@ #!/bin/bash -JAVA_OPTS="${JAVA_OPTS} -XX:+UseG1GC" -JAVA_OPTS="${JAVA_OPTS} -server -Xms${JVM_XMS} -Xmx${JVM_XMX} -Xmn${JVM_XMN} -XX:MetaspaceSize=${JVM_MS} -XX:MaxMetaspaceSize=${JVM_MMS}" -JAVA_OPTS="${JAVA_OPTS} -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${WORKDIR}/logs/java_heapdump.hprof" -JAVA_OPTS="${JAVA_OPTS} -XX:-UseLargePages" -if [[ "${JVM_DEBUG}" == "y" ]]; then +JAVA_OPTS="${JAVA_OPTS} -server -XX:+AlwaysPreTouch -XX:-DisplayVMOutput -XX:+PrintFlagsFinal" +JAVA_OPTS="${JAVA_OPTS} -XX:-OmitStackTraceInFastThrow" +JAVA_OPTS="${JAVA_OPTS} -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+UnlockCommercialFeatures" +JAVA_OPTS="${JAVA_OPTS} -XX:+FlightRecorder -XX:+DebugNonSafepoints -XX:+SafepointTimeout -XX:SafepointTimeoutDelay=500" +JAVA_OPTS="${JAVA_OPTS} -XX:+PrintSafepointStatistics -XX:PrintSafepointStatisticsCount=1" +JAVA_OPTS="${JAVA_OPTS} -Xms${JVM_XMS} -Xmx${JVM_XMX} -Xss${JVM_XSS} -XX:MetaspaceSize=${JVM_MS} -XX:MaxMetaspaceSize=${JVM_MMS}" +JAVA_OPTS="${JAVA_OPTS} -XX:ConcGCThreads=6 -XX:ParallelGCThreads=8" + +if [[ "${USE_G1_GC}" == "y" ]]; then + echo "G1 garbage collection is enabled." + JAVA_OPTS="${JAVA_OPTS} -XX:+UseG1GC -XX:G1LogLevel=finest -XX:G1NewSizePercent=50 -XX:MaxGCPauseMillis=200" + JAVA_OPTS="${JAVA_OPTS} -XX:InitiatingHeapOccupancyPercent=45 -XX:G1MixedGCLiveThresholdPercent=65" +fi + +if [[ "${USE_HEAP_DUMP}" == "y" ]]; then + echo "Heap dump path is '${WORKDIR}/logs/jvm_heap_dump.hprof'." + JAVA_OPTS="${JAVA_OPTS} -XX:HeapDumpPath=${WORKDIR}/logs/jvm_heap_dump.hprof -XX:+HeapDumpOnOutOfMemoryError" +fi + +if [[ "${USE_GC_LOG}" == "y" ]]; then + echo "GC log path is '/dev/shm/logs/jvm_gc.log'." + JAVA_OPTS="${JAVA_OPTS} -XX:LogFile=/dev/shm/logs/jvm_gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps" + JAVA_OPTS="${JAVA_OPTS} -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=10m" + JAVA_OPTS="${JAVA_OPTS} -XX:+PrintReferenceGC -XX:+PrintHeapAtGC -XX:+PrintGCApplicationStoppedTime" +fi + +if [[ "${USE_LARGE_PAGES}" == "y" ]]; then + echo "Use large pages." + JAVA_OPTS="${JAVA_OPTS} -XX:+UseLargePages" +fi + +if [[ "${DEBUG}" == "y" ]]; then + echo "Attach to remote JVM using port 5005." JAVA_OPTS="${JAVA_OPTS} -Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n" fi -echo "The application will start in ${START_DELAY_SECS}s..." +echo "The application will start in ${START_DELAY_SECS}s." sleep ${START_DELAY_SECS} -exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "org.ylzl.eden.demo.ColaApplication" "$@" +exec java ${JAVA_OPTS} -noverify -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "org.ylzl.eden.demo.ColaApplication" "$@"