yonge vor 4 Jahren
Ursprung
Commit
cbbf1ea6d3

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LuckDrawPrize.java

@@ -2,7 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.ym.mec.common.enums.BaseEnum;
 

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/LuckDrawPrizeServiceImpl.java

@@ -3,8 +3,8 @@ package com.ym.mec.biz.service.impl;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -93,7 +93,7 @@ public class LuckDrawPrizeServiceImpl extends BaseServiceImpl<Integer, LuckDrawP
 		// 抽奖逻辑
 		List<LuckDrawPrize> luckDraws = luckDrawPrizeDao.queryEnabledList(group);
 		if (luckDraws != null) {
-			int randomNum = RandomUtils.nextInt(DRAW_BASE_NUMBER);
+			int randomNum = RandomUtils.nextInt(0, DRAW_BASE_NUMBER);
 			double start = 0;
 			double chances = 0;
 			for (LuckDrawPrize luckDraw : luckDraws) {

+ 6 - 0
pom.xml

@@ -261,6 +261,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-lang</groupId>
+					<artifactId>commons-lang</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 

+ 2 - 2
workflowy/src/main/java/org/snaker/engine/access/AbstractDBAccess.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.snaker.engine.DBAccess;

+ 1 - 1
workflowy/src/main/java/org/snaker/engine/access/Page.java

@@ -16,7 +16,7 @@ package org.snaker.engine.access;
 
 import java.util.List;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.beans.factory.annotation.Value;
 
 /**

+ 1 - 1
workflowy/src/main/java/org/snaker/engine/access/QueryFilter.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.snaker.engine.Completion;
 import org.snaker.engine.core.ServiceContext;
 import org.snaker.engine.helper.AssertHelper;

+ 1 - 1
workflowy/src/main/java/org/snaker/engine/access/dialect/SQLServerDialect.java

@@ -14,7 +14,7 @@
  */
 package org.snaker.engine.access.dialect;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.snaker.engine.access.Page;
 import org.snaker.engine.helper.StringHelper;
 

+ 1 - 1
workflowy/src/main/java/org/snaker/engine/core/OrderService.java

@@ -17,7 +17,7 @@ package org.snaker.engine.core;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.snaker.engine.Completion;
 import org.snaker.engine.IOrderService;
 import org.snaker.engine.SnakerEngine;

+ 1 - 1
workflowy/src/main/java/org/snaker/engine/helper/StringHelper.java

@@ -14,7 +14,7 @@
  */
 package org.snaker.engine.helper;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.snaker.engine.SnakerException;
 
 /**

+ 1 - 1
workflowy/src/main/java/org/snaker/engine/impl/SchedulerInterceptor.java

@@ -17,7 +17,7 @@ package org.snaker.engine.impl;
 import java.util.Date;
 import java.util.Map;
 
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.snaker.engine.SnakerInterceptor;

+ 1 - 1
workflowy/src/main/java/org/snaker/engine/parser/impl/SubProcessParser.java

@@ -14,7 +14,7 @@
  */
 package org.snaker.engine.parser.impl;
 
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.snaker.engine.helper.StringHelper;
 import org.snaker.engine.model.NodeModel;
 import org.snaker.engine.model.SubProcessModel;