diff --git a/api/build.gradle b/api/build.gradle deleted file mode 100644 index 77b6af6..0000000 --- a/api/build.gradle +++ /dev/null @@ -1,45 +0,0 @@ -buildscript { - ext { - springBootVersion = '1.5.6.RELEASE' - } - repositories { - maven { - url 'https://maven.aliyun.com/repository/public' - } - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - } -} - -group 'smartvenue' -version '2.0.0' - -apply plugin: 'java' -apply plugin: 'org.springframework.boot' - -sourceCompatibility = 1.8 - -repositories { - //mavenCentral() - maven { - url 'https://maven.aliyun.com/repository/public' - } -} - -jar { - baseName = 'sv-api' -} -ext { - nettyVersion = '4.1.10.Final' -} -dependencies { - compile fileTree(include: '*.jar', dir: 'src/libs') - compile project(':service') - compile "io.netty:netty-all:${nettyVersion}" - compile 'mysql:mysql-connector-java:6.0.6' -} - -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} diff --git a/api/pom.xml b/api/pom.xml new file mode 100644 index 0000000..2229c00 --- /dev/null +++ b/api/pom.xml @@ -0,0 +1,59 @@ + + + + smartvenue + smartvenue-parent + 2.0.0 + ../pom.xml + + + 4.0.0 + sv-api + ${smartvenue.version} + + + + smartvenue + sv-service + + + + io.netty + netty-all + 4.1.10.Final + + + mysql + mysql-connector-java + 6.0.6 + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + ../target/boot/api + executable + + + + + repackage + + + + + + + + diff --git a/build.gradle b/build.gradle deleted file mode 100644 index fe59980..0000000 --- a/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -group 'smartvenue' -version '1.0-SNAPSHOT' - -apply plugin: 'java' - -sourceCompatibility = 1.8 - -repositories { - //mavenCentral() - maven { - url 'https://maven.aliyun.com/repository/public' - } -} - -dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' -} - -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} diff --git a/entity/build.gradle b/entity/build.gradle deleted file mode 100644 index 741a2a6..0000000 --- a/entity/build.gradle +++ /dev/null @@ -1,87 +0,0 @@ -group 'smartvenue' -version '1.0-SNAPSHOT' -ext { - springBootVersion = '1.5.7.RELEASE' -} - - -apply plugin: 'java' -apply plugin: "com.arenagod.gradle.MybatisGenerator" - -sourceCompatibility = 1.8 - -repositories { - maven { - url 'https://maven.aliyun.com/repository/public' - } -} - -dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' - compile fileTree(include: '*.jar', dir: 'src/libs') - compile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}" - compile "org.springframework.boot:spring-boot-starter-jetty:${springBootVersion}" - compile "org.springframework.boot:spring-boot-devtools:${springBootVersion}" - compile "org.springframework.boot:spring-boot-starter-web:${springBootVersion}" - compile "org.springframework.boot:spring-boot-starter-data-redis:${springBootVersion}" - compile "org.springframework.boot:spring-boot-starter-aop:${springBootVersion}" - compile "org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" - compile "com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" - compile 'com.github.binarywang:weixin-java-miniapp:2.8.0' - compile 'com.github.binarywang:weixin-java-pay:2.8.0' - compile 'com.alibaba:druid-spring-boot-starter:1.1.0' - compile 'org.apache.httpcomponents:fluent-hc:4.5.3' - compile 'org.apache.commons:commons-lang3:3.6' - compile 'org.apache.commons:commons-text:1.1' - compile 'commons-beanutils:commons-beanutils:1.9.3' - compile 'mysql:mysql-connector-java:6.0.6' - compile 'com.aliyun.oss:aliyun-sdk-oss:2.5.0' - compile 'commons-io:commons-io:2.5' - compile 'commons-codec:commons-codec:1.10' - compile 'commons-collections:commons-collections:3.2.2' - compile 'com.aliyun.oss:aliyun-sdk-oss:2.5.0' - compile 'com.google.zxing:javase:3.3.0' - compile 'com.aliyun:aliyun-java-sdk-core:3.5.0' - compile 'com.aliyun:aliyun-java-sdk-sms:3.0.0-rc1' - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.4' - compile "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}" - compile group: 'javax.mail', name: 'mail', version: '1.4.7' - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0' - compile group: 'org.apache.poi', name: 'poi-ooxml', version: '3.17' - compile group: 'org.springframework.boot', name: 'spring-boot-starter-freemarker', version: '1.5.9.RELEASE' - compile("org.springframework.boot:spring-boot-devtools") - compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.10' - compile "org.apache.httpcomponents:httpclient:4.4" - compile "org.apache.httpcomponents:httpmime:4.4" - compile group: 'com.github.davidmoten', name: 'geo', version: '0.7.6' - compile group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.3.9' - compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.10' - compile group: 'dom4j', name: 'dom4j', version: '1.6.1' - compile "org.bouncycastle:bcprov-jdk15:1.46" -} - -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} - -apply plugin: "com.arenagod.gradle.MybatisGenerator" - -configurations { - mybatisGenerator -} - -mybatisGenerator { - verbose = true - configFile = 'src/main/resources/tools/generatorConfig.xml' -} - -buildscript { - repositories { - maven { - url 'https://maven.aliyun.com/repository/gradle-plugin' - } - } - dependencies { - classpath("gradle.plugin.com.arenagod.gradle:mybatis-generator-plugin:1.4") - } -} diff --git a/entity/pom.xml b/entity/pom.xml new file mode 100644 index 0000000..0adb22b --- /dev/null +++ b/entity/pom.xml @@ -0,0 +1,204 @@ + + + + smartvenue + smartvenue-parent + 2.0.0 + ../pom.xml + + + 4.0.0 + sv-entity + ${smartvenue.version} + + + org.springframework.boot + spring-boot-starter-jetty + 1.5.7.RELEASE + + + org.springframework.boot + spring-boot-devtools + 1.5.7.RELEASE + + + org.springframework.boot + spring-boot-starter-web + 1.5.7.RELEASE + + + org.springframework.boot + spring-boot-starter-data-redis + 1.5.7.RELEASE + + + org.springframework.boot + spring-boot-starter-aop + 1.5.7.RELEASE + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.1 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.2.5 + + + com.github.binarywang + weixin-java-miniapp + 2.8.0 + + + com.github.binarywang + weixin-java-pay + 2.8.0 + + + com.alibaba + druid-spring-boot-starter + 1.1.0 + + + org.apache.httpcomponents + fluent-hc + 4.5.3 + + + org.apache.commons + commons-lang3 + 3.6 + + + org.apache.commons + commons-text + 1.1 + + + commons-beanutils + commons-beanutils + 1.9.3 + + + mysql + mysql-connector-java + 6.0.6 + + + com.aliyun.oss + aliyun-sdk-oss + 2.5.0 + + + commons-io + commons-io + 2.5 + + + commons-codec + commons-codec + 1.10 + + + commons-collections + commons-collections + 3.2.2 + + + com.google.zxing + javase + 3.3.0 + + + com.aliyun + aliyun-java-sdk-core + 3.5.0 + + + com.aliyun + aliyun-java-sdk-sms + 3.0.0-rc1 + + + com.google.code.gson + gson + 2.8.4 + + + org.springframework.boot + spring-boot-configuration-processor + 1.5.7.RELEASE + + + javax.mail + mail + 1.4.7 + + + org.apache.poi + poi-ooxml + 3.17 + + + org.springframework.boot + spring-boot-starter-freemarker + 1.5.9.RELEASE + + + com.thoughtworks.xstream + xstream + 1.4.10 + + + org.apache.httpcomponents + httpclient + 4.4 + + + org.apache.httpcomponents + httpmime + 4.4 + + + com.github.davidmoten + geo + 0.7.6 + + + org.java-websocket + Java-WebSocket + 1.3.9 + + + dom4j + dom4j + 1.6.1 + + + org.bouncycastle + bcprov-jdk15 + 1.46 + + + junit + junit + 4.12 + test + + + + com.ydd.framwork.core + framework-core + 2.1.5 + + + com.dw.ccm.wechat.base + wechat-base + 1.0.47-RELEASE + + + + diff --git a/entity/src/libs/framework-core-2.1.5.jar b/entity/src/libs/framework-core-2.1.5.jar deleted file mode 100644 index f7db198..0000000 Binary files a/entity/src/libs/framework-core-2.1.5.jar and /dev/null differ diff --git a/entity/src/libs/wechat-base-1.0.47-RELEASE.jar b/entity/src/libs/wechat-base-1.0.47-RELEASE.jar deleted file mode 100644 index 3ea67d5..0000000 Binary files a/entity/src/libs/wechat-base-1.0.47-RELEASE.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 8951634..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Thu Jun 04 17:02:40 CST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-all.zip -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew deleted file mode 100644 index 5891d69..0000000 --- a/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## 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="-Dfile.encoding=UTF-8" - -# 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 - ;; - 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, switch paths to Windows format before running java -if $cygwin ; 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=$((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" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 5bc16da..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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 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="-Dfile.encoding=UTF-8" - -@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 init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -: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/netty-pad/build.gradle b/netty-pad/build.gradle deleted file mode 100644 index 81dd8ea..0000000 --- a/netty-pad/build.gradle +++ /dev/null @@ -1,45 +0,0 @@ -buildscript { - ext { - springBootVersion = '1.5.6.RELEASE' - } - repositories { - maven { - url 'http://maven.aliyun.com/nexus/content/groups/public/' - } - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - } -} -apply plugin: 'java' -apply plugin: 'org.springframework.boot' - -group 'smartvenue' -version '1.0-SNAPSHOT' - -sourceCompatibility = 1.8 - - -repositories { -// maven {url 'http://maven.ydd100.cn/repository/maven-public/'} - //mavenCentral() - maven { - url 'http://maven.aliyun.com/nexus/content/groups/public/' - } -} -ext { - version = '1.0' - springBootVersion = '1.5.4.RELEASE' - nettyVersion = '4.1.10.Final' - junitVersion = "4.11" - jacksonVersion = "2.5.0" -} - -dependencies { - compile fileTree(include: '*.jar', dir: 'src/libs') - compile project(':service') - compile "io.netty:netty-all:${nettyVersion}" - compile 'mysql:mysql-connector-java:6.0.6' - - -} diff --git a/netty-pad/pom.xml b/netty-pad/pom.xml new file mode 100644 index 0000000..117e616 --- /dev/null +++ b/netty-pad/pom.xml @@ -0,0 +1,58 @@ + + + + smartvenue + smartvenue-parent + 2.0.0 + ../pom.xml + + + 4.0.0 + netty-pad + ${smartvenue.version} + + + + smartvenue + sv-service + + + + io.netty + netty-all + 4.1.10.Final + + + mysql + mysql-connector-java + 6.0.6 + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + ../target/boot/netty + executable + + + + + repackage + + + + + + + + diff --git a/oms/build.gradle b/oms/build.gradle deleted file mode 100644 index 48137e2..0000000 --- a/oms/build.gradle +++ /dev/null @@ -1,49 +0,0 @@ -group 'smartvenue' -version '1.0.0' -ext { - springBootVersion = '1.5.7.RELEASE' -} - - -apply plugin: 'java' -apply plugin: 'org.springframework.boot' - -sourceCompatibility = 1.8 - -buildscript { - repositories { - //mavenCentral() - maven { - url 'https://maven.aliyun.com/repository/public' - } - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.4.RELEASE") - } -} - - -repositories { - //mavenCentral() - maven { - url 'https://maven.aliyun.com/repository/public' - } -} - -jar { - baseName = 'sv-oms' -} - -dependencies { - compile fileTree(include: '*.jar', dir: 'src/libs') - compile project(':service') - compile 'org.apache.shiro:shiro-spring-boot-starter:1.4.0' - compile 'org.apache.shiro:shiro-ehcache:1.4.0' - compile 'mysql:mysql-connector-java:6.0.6' - - -} - -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} diff --git a/oms/pom.xml b/oms/pom.xml new file mode 100644 index 0000000..6fac529 --- /dev/null +++ b/oms/pom.xml @@ -0,0 +1,62 @@ + + + + smartvenue + smartvenue-parent + 2.0.0 + ../pom.xml + + + 4.0.0 + sv-oms + ${smartvenue.version} + + + smartvenue + sv-service + + + + org.apache.shiro + shiro-spring-boot-starter + 1.4.0 + + + org.apache.shiro + shiro-ehcache + 1.4.0 + + + mysql + mysql-connector-java + 6.0.6 + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + ../target/boot/oms + executable + + + + + repackage + + + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..7eeb2a3 --- /dev/null +++ b/pom.xml @@ -0,0 +1,103 @@ + + + + org.springframework.boot + spring-boot-starter-parent + 1.5.7.RELEASE + + 4.0.0 + smartvenue + smartvenue-parent + 2.0.0 + pom + + + 1.8 + 2.0.0 + 1.5.7.RELEASE + + + + + + smartvenue + sv-entity + ${smartvenue.version} + + + smartvenue + sv-api + ${smartvenue.version} + + + smartvenue + netty-pad + ${smartvenue.version} + + + smartvenue + sv-oms + ${smartvenue.version} + + + smartvenue + sv-service + ${smartvenue.version} + + + + + org.springframework.boot + spring-boot-starter-web + ${spring.boot.version} + + + org.springframework.boot + spring-boot-starter-test + ${spring.boot.version} + test + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + 3.3 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20 + + true + 1 + + **/*Tests.java + **/*Test.java + + + **/Abstract*.java + + + + + + + + api + entity + oms + service + netty-pad + + + diff --git a/service/build.gradle b/service/build.gradle deleted file mode 100644 index cd199db..0000000 --- a/service/build.gradle +++ /dev/null @@ -1,45 +0,0 @@ -group 'smartvenue' -version '1.0.0' -ext { - springBootVersion = '1.5.7.RELEASE' -} - - - -apply plugin: 'java' - -sourceCompatibility = 1.8 -buildscript { - repositories { - //mavenCentral() - maven { - url 'https://maven.aliyun.com/repository/public' - } - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.4.RELEASE") - } -} - - -repositories { - //mavenCentral() - maven { - url 'https://maven.aliyun.com/repository/public' - } -} - - - -dependencies { - compile fileTree(include: '*.jar', dir: 'src/libs') - compile project(':entity') - testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}" - - -} - -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} - diff --git a/service/pom.xml b/service/pom.xml new file mode 100644 index 0000000..930ba19 --- /dev/null +++ b/service/pom.xml @@ -0,0 +1,26 @@ + + + + smartvenue + smartvenue-parent + 2.0.0 + ../pom.xml + + + 4.0.0 + sv-service + ${smartvenue.version} + + + smartvenue + sv-entity + + + + org.springframework.boot + spring-boot-starter-test + + + + diff --git a/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java b/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java index a26d8a4..2a57ac2 100644 --- a/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java +++ b/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java @@ -18,7 +18,6 @@ import com.ydd.framework.core.entity.enums.StatusEnum; import com.ydd.framework.core.exception.ServiceException; import com.ydd.framework.core.service.impl.BaseServiceImpl; import org.apache.commons.lang3.time.DateFormatUtils; -import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.RedisTemplate; diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 847f405..0000000 --- a/settings.gradle +++ /dev/null @@ -1,6 +0,0 @@ -rootProject.name = 'smartvenue' -include 'service' -include 'api' -include 'oms' -include 'entity' -include 'netty-pad'