diff --git a/miaosha-admin/miaosha-admin-api/src/main/java/com/geekq/admin/entity/Account.java b/miaosha-admin/miaosha-admin-api/src/main/java/com/geekq/admin/entity/Account.java index 2d29238..899fa3b 100644 --- a/miaosha-admin/miaosha-admin-api/src/main/java/com/geekq/admin/entity/Account.java +++ b/miaosha-admin/miaosha-admin-api/src/main/java/com/geekq/admin/entity/Account.java @@ -1,6 +1,6 @@ package com.geekq.admin.entity; -import com.geekq.common.utils.MD5.MD5Utils; +import com.geekq.common.utils.md5.MD5Utils; import com.geekq.common.utils.numcal.BidConst; import lombok.Getter; import lombok.Setter; diff --git a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/JsonUtils.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/JsonUtils.java index 0ffcde5..e04d372 100644 --- a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/JsonUtils.java +++ b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/JsonUtils.java @@ -69,5 +69,4 @@ public class JsonUtils { return null; } - } diff --git a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java index be16406..3fbc2ce 100644 --- a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java +++ b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java @@ -115,21 +115,6 @@ public class SnowflakeIdWorker { SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0); return idWorker.nextId(); } - - // ==============================Methods========================================== - - /** - * 测试 - */ - public static void main(String[] args) { - SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0); - for (int i = 0; i < 1000; i++) { - long id = idWorker.nextId(); - System.out.println(Long.toBinaryString(id)); - System.out.println(id); - } - } - /** * 获得下一个ID (该方法是线程安全的) * @@ -193,5 +178,4 @@ public class SnowflakeIdWorker { return System.currentTimeMillis(); } - } diff --git a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/MD5/MD5Utils.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/md5/MD5Utils.java similarity index 97% rename from miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/MD5/MD5Utils.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/md5/MD5Utils.java index 39f4517..2668ace 100644 --- a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/MD5/MD5Utils.java +++ b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/md5/MD5Utils.java @@ -1,4 +1,4 @@ -package com.geekq.common.utils.MD5; +package com.geekq.common.utils.md5; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; diff --git a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java index 6779529..16038ed 100644 --- a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java +++ b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java @@ -7,7 +7,7 @@ package com.geekq.common.utils.numcal; */ public class BitStatesUtils { public final static Long OP_BASIC_INFO = 1L; //用户注册成功的标示,及为默认初始状态 - public final static Long OP_BIND_PHONE = 2L << 0; //用户绑定手机状态码 + public final static Long OP_BIND_PHONE = 2L; //用户绑定手机状态码 public final static Long OP_BIND_EMAIL = 2L << 1;//用户绑定邮箱 public final static Long OP_BASE_INFO = 2L << 2;//填写基本资料 public final static Long OP_REAL_AUTH = 2L << 3;//用户实名认证 diff --git a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/CalculatetUtil.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/CalculateUtil.java similarity index 98% rename from miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/CalculatetUtil.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/CalculateUtil.java index 09eb670..0f70bd6 100644 --- a/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/CalculatetUtil.java +++ b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/CalculateUtil.java @@ -5,10 +5,9 @@ import java.math.RoundingMode; /** * 计算器Util - * * @author 邱润泽 */ -public class CalculatetUtil { +public class CalculateUtil { public static final BigDecimal ONE_HUNDRED = new BigDecimal("100.0000"); public static final BigDecimal NUMBER_MONTHS_OF_YEAR = new BigDecimal( @@ -221,8 +220,6 @@ public class CalculatetUtil { * 计算借款管理费 * * @param bidRequestAmount 借款金额 - * @param returnType 还款类型 - * @param monthes2Return 还款期限 * @return */ public static BigDecimal calAccountManagementCharge( diff --git a/miaosha-admin/miaosha-admin-service/src/main/java/com/geekq/admin/service/impl/LogininfoServiceImpl.java b/miaosha-admin/miaosha-admin-service/src/main/java/com/geekq/admin/service/impl/LogininfoServiceImpl.java index 5e88651..ede2fbe 100644 --- a/miaosha-admin/miaosha-admin-service/src/main/java/com/geekq/admin/service/impl/LogininfoServiceImpl.java +++ b/miaosha-admin/miaosha-admin-service/src/main/java/com/geekq/admin/service/impl/LogininfoServiceImpl.java @@ -12,7 +12,7 @@ import com.geekq.admin.service.ILogininfoService; import com.geekq.admin.service.RedisCacheStorageService; import com.geekq.common.enums.Constants; import com.geekq.common.enums.ResultStatus; -import com.geekq.common.utils.MD5.MD5Utils; +import com.geekq.common.utils.md5.MD5Utils; import com.geekq.common.utils.resultbean.ResultGeekQ; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java deleted file mode 100644 index 566b526..0000000 --- a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.geekq.miaosha.redis;//package com.geekq.miaosha.redis; -// -//import org.apache.commons.lang3.StringUtils; -//import org.redisson.Redisson; -//import org.redisson.api.RedissonClient; -//import org.redisson.config.Config; -//import org.redisson.config.SentinelServersConfig; -//import org.redisson.config.SingleServerConfig; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -//import org.springframework.boot.context.properties.EnableConfigurationProperties; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -// -//@Configuration -//@ConditionalOnClass(Config.class) -//@EnableConfigurationProperties(RedissonProperties.class) -//public class RedissonAutoConfiguration { -// -// @Autowired -// private RedissonProperties redssionProperties; -// -// /** -// * 哨兵模式自动装配 -// * @return -// */ -// @Bean -// @ConditionalOnProperty(name="redisson.master-name") -// RedissonClient redissonSentinel() { -// Config config = new Config(); -// SentinelServersConfig serverConfig = config.useSentinelServers().addSentinelAddress(redssionProperties.getSentinelAddresses()) -// .setMasterName(redssionProperties.getMasterName()) -// .setTimeout(redssionProperties.getTimeout()) -// .setMasterConnectionPoolSize(redssionProperties.getMasterConnectionPoolSize()) -// .setSlaveConnectionPoolSize(redssionProperties.getSlaveConnectionPoolSize()); -// -// if(StringUtils.isNotBlank(redssionProperties.getPassword())) { -// serverConfig.setPassword(redssionProperties.getPassword()); -// } -// return Redisson.create(config); -// } -// -// /** -// * 单机模式自动装配 -// * @return -// */ -// @Bean -// @ConditionalOnProperty(name="redisson.address") -// RedissonClient redissonSingle() { -// Config config = new Config(); -// SingleServerConfig serverConfig = config.useSingleServer() -// .setAddress(redssionProperties.getAddress()) -// .setTimeout(redssionProperties.getTimeout()) -// .setConnectionPoolSize(redssionProperties.getConnectionPoolSize()) -// .setConnectionMinimumIdleSize(redssionProperties.getConnectionMinimumIdleSize()); -// -// if(StringUtils.isNotBlank(redssionProperties.getPassword())) { -// serverConfig.setPassword(redssionProperties.getPassword()); -// } -// -// return Redisson.create(config); -// } -// -// /** -// * 装配locker类,并将实例注入到RedissLockUtil中 -// * @return -// */ -// @Bean -// DistributedLocker distributedLocker(RedissonClient redissonSingle) { -// RedissonDistributedLocker locker = new RedissonDistributedLocker(); -// locker.setRedissonClient(redissonSingle); -// RedissLockUtil.setLocker(locker); -// return locker; -// } -//} diff --git a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java deleted file mode 100644 index 96bbbca..0000000 --- a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.geekq.miaosha.redis;//package com.geekq.miaosha.redis; -// -//import org.redisson.api.RLock; -//import org.redisson.api.RedissonClient; -// -//import java.util.concurrent.TimeUnit; -// -//public class RedissonDistributedLocker implements DistributedLocker { -// -// private RedissonClient redissonClient; -// -// @Override -// public void lock(String lockKey) { -// RLock lock = redissonClient.getLock(lockKey); -// lock.lock(); -// } -// -// @Override -// public void unlock(String lockKey) { -// RLock lock = redissonClient.getLock(lockKey); -// lock.unlock(); -// } -// -// @Override -// public void lock(String lockKey, int leaseTime) { -// RLock lock = redissonClient.getLock(lockKey); -// lock.lock(leaseTime, TimeUnit.SECONDS); -// } -// -// @Override -// public void lock(String lockKey, TimeUnit unit ,int timeout) { -// RLock lock = redissonClient.getLock(lockKey); -// lock.lock(timeout, unit); -// } -// -// public void setRedissonClient(RedissonClient redissonClient) { -// this.redissonClient = redissonClient; -// } -//} \ No newline at end of file diff --git a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java deleted file mode 100644 index 6306e91..0000000 --- a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.geekq.miaosha.redis;//package com.geekq.miaosha.redis; -// -//import org.springframework.boot.context.properties.ConfigurationProperties; -// -//@ConfigurationProperties(prefix = "redisson") -//public class RedissonProperties { -// -// private int timeout = 3000; -// -// private String address; -// -// private String password; -// -// private int connectionPoolSize = 64; -// -// private int connectionMinimumIdleSize=10; -// -// private int slaveConnectionPoolSize = 250; -// -// private int masterConnectionPoolSize = 250; -// -// private String[] sentinelAddresses; -// -// private String masterName; -// -// public int getTimeout() { -// return timeout; -// } -// -// public void setTimeout(int timeout) { -// this.timeout = timeout; -// } -// -// public int getSlaveConnectionPoolSize() { -// return slaveConnectionPoolSize; -// } -// -// public void setSlaveConnectionPoolSize(int slaveConnectionPoolSize) { -// this.slaveConnectionPoolSize = slaveConnectionPoolSize; -// } -// -// public int getMasterConnectionPoolSize() { -// return masterConnectionPoolSize; -// } -// -// public void setMasterConnectionPoolSize(int masterConnectionPoolSize) { -// this.masterConnectionPoolSize = masterConnectionPoolSize; -// } -// -// public String[] getSentinelAddresses() { -// return sentinelAddresses; -// } -// -// public void setSentinelAddresses(String sentinelAddresses) { -// this.sentinelAddresses = sentinelAddresses.split(","); -// } -// -// public String getMasterName() { -// return masterName; -// } -// -// public void setMasterName(String masterName) { -// this.masterName = masterName; -// } -// -// public String getPassword() { -// return password; -// } -// -// public void setPassword(String password) { -// this.password = password; -// } -// -// public String getAddress() { -// return address; -// } -// -// public void setAddress(String address) { -// this.address = address; -// } -// -// public int getConnectionPoolSize() { -// return connectionPoolSize; -// } -// -// public void setConnectionPoolSize(int connectionPoolSize) { -// this.connectionPoolSize = connectionPoolSize; -// } -// -// public int getConnectionMinimumIdleSize() { -// return connectionMinimumIdleSize; -// } -// -// public void setConnectionMinimumIdleSize(int connectionMinimumIdleSize) { -// this.connectionMinimumIdleSize = connectionMinimumIdleSize; -// } -//} -// diff --git a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonService.java deleted file mode 100644 index f7f1ce2..0000000 --- a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonService.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.geekq.miaosha.redis;//package com.geekq.miaosha.redis; -// -//import org.redisson.api.*; -//import org.redisson.config.Config; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//import java.io.IOException; -// -///** -// * redisson操作类 -// */ -//@Service("redissonService") -//public class RedissonService { -// -// @Autowired -// private RedissonClient redissonClient; -// -// public void getRedissonClient() throws IOException { -// Config config = redissonClient.getConfig(); -// System.out.println(config.toJSON().toString()); -// } -// -// /**` -// * 获取字符串对象 -// * -// * @param objectName -// * @return -// */ -// public RBucket getRBucket(String objectName) { -// RBucket bucket = redissonClient.getBucket(objectName); -// return bucket; -// } -// -// /** -// * 获取Map对象 -// * -// * @param objectName -// * @return -// */ -// public RMap getRMap(String objectName) { -// RMap map = redissonClient.getMap(objectName); -// return map; -// } -// -// /** -// * 获取有序集合 -// * -// * @param objectName -// * @return -// */ -// public RSortedSet getRSortedSet(String objectName) { -// RSortedSet sortedSet = redissonClient.getSortedSet(objectName); -// return sortedSet; -// } -// -// /** -// * 获取集合 -// * -// * @param objectName -// * @return -// */ -// public RSet getRSet(String objectName) { -// RSet rSet = redissonClient.getSet(objectName); -// return rSet; -// } -// -// /** -// * 获取列表 -// * -// * @param objectName -// * @return -// */ -// public RList getRList(String objectName) { -// RList rList = redissonClient.getList(objectName); -// return rList; -// } -// -// /** -// * 获取队列 -// * -// * @param objectName -// * @return -// */ -// public RQueue getRQueue(String objectName) { -// RQueue rQueue = redissonClient.getQueue(objectName); -// return rQueue; -// } -// -// /** -// * 获取双端队列 -// * -// * @param objectName -// * @return -// */ -// public RDeque getRDeque(String objectName) { -// RDeque rDeque = redissonClient.getDeque(objectName); -// return rDeque; -// } -// -// -// /** -// * 获取锁 -// * -// * @param objectName -// * @return -// */ -// public RLock getRLock(String objectName) { -// RLock rLock = redissonClient.getLock(objectName); -// return rLock; -// } -// -// /** -// * 获取读取锁 -// * -// * @param objectName -// * @return -// */ -// public RReadWriteLock getRWLock(String objectName) { -// RReadWriteLock rwlock = redissonClient.getReadWriteLock(objectName); -// return rwlock; -// } -// -// /** -// * 获取原子数 -// * -// * @param objectName -// * @return -// */ -// public RAtomicLong getRAtomicLong(String objectName) { -// RAtomicLong rAtomicLong = redissonClient.getAtomicLong(objectName); -// return rAtomicLong; -// } -// -// /** -// * 获取记数锁 -// * -// * @param objectName -// * @return -// */ -// public RCountDownLatch getRCountDownLatch(String objectName) { -// RCountDownLatch rCountDownLatch = redissonClient.getCountDownLatch(objectName); -// return rCountDownLatch; -// } -// -//} \ No newline at end of file diff --git a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java index d1f4214..3513f82 100644 --- a/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java +++ b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java @@ -10,26 +10,6 @@ import java.util.concurrent.CountDownLatch; public class RedisLimitRateWithLUA { - public static void main(String[] args) { - final CountDownLatch latch = new CountDownLatch(1); - - for (int i = 0; i < 20; i++) { - new Thread(new Runnable() { - public void run() { - try { - latch.await(); - System.out.println("请求是否被执行:" + accquire()); - } catch (Exception e) { - e.printStackTrace(); - } - } - }).start(); - - } - - latch.countDown(); - } - public static boolean accquire() throws IOException, URISyntaxException { Jedis jedis = new Jedis("39.107.245.253"); diff --git a/miaosha-v2/mvnw b/miaosha-v2/mvnw deleted file mode 100644 index 5551fde..0000000 --- a/miaosha-v2/mvnw +++ /dev/null @@ -1,286 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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 -# -# http://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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - 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 - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - 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 - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - wget "$jarUrl" -O "$wrapperJarPath" - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - curl -o "$wrapperJarPath" "$jarUrl" - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/miaosha-v2/mvnw.cmd b/miaosha-v2/mvnw.cmd deleted file mode 100644 index e5cfb0a..0000000 --- a/miaosha-v2/mvnw.cmd +++ /dev/null @@ -1,161 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" -FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - echo Found %WRAPPER_JAR% -) else ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" - echo Finished downloading %WRAPPER_JAR% -) -@REM End of extension - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/mvnw b/mvnw deleted file mode 100755 index 5bf251c..0000000 --- a/mvnw +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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 -# -# http://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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - 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 - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - 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 - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100755 index 019bd74..0000000 --- a/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 1d85d20..e3102d1 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ com.alibaba dubbo - 2.6.6 + 2.6.9 org.apache.curator