anderx лет назад: 5
Родитель
Сommit
8b191bff36

+ 0 - 4
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -8,7 +8,6 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,7 +31,6 @@ import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.easemob.EasemobUtils;
 import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.bo.InputUserIdentity;
 import com.goafanti.user.service.OrgHumanResourceService;
@@ -59,8 +57,6 @@ public class AdminApiController extends CertifyApiController {
 	private PasswordUtil					passwordUtil;
 	@Resource
 	private AdminService					adminService;
-	@Autowired
-	EasemobUtils							easemobUtils;
 
 	/**
 	 * 获取营销员及营销经理下拉

+ 4 - 3
src/main/java/com/goafanti/core/mybatis/JDBCIdGenerator.java

@@ -33,7 +33,7 @@ public class JDBCIdGenerator {
 
 	private static final Logger	logger						= LoggerFactory.getLogger(JDBCIdGenerator.class);
 
-	private static long			workerId;
+	private static long			workerId					=1001;
 
 	static {
 		Calendar calendar = Calendar.getInstance();
@@ -51,7 +51,8 @@ public class JDBCIdGenerator {
 	private long	lastTime;
 
 	static void initWorkerId() {
-		String workerId = System.getProperty("jdbc.worker.id");
+//		String workerId = System.getProperty("jdbc.worker.id");
+		String workerId = "1002";
 		if (StringUtils.isNoneBlank(workerId)) {
 			setWorkerId(Long.valueOf(workerId));
 			return;
@@ -71,7 +72,7 @@ public class JDBCIdGenerator {
 	 *            工作进程Id
 	 */
 	public static void setWorkerId(final Long workerId) {
-		LoggerUtils.debug(logger, "工作进程ID:[%s]", workerId);
+//		LoggerUtils.debug(logger, "工作进程ID:[%s]", workerId);
 		Assert.isTrue(workerId > 0L && workerId < WORKER_ID_MAX_VALUE, "工作进程ID不能为空,且小于1024");
 		JDBCIdGenerator.workerId = workerId;
 	}