Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/SmsCodeController.java

@@ -1,28 +1,32 @@
 package com.ym.mec.auth.web.controller;
 
-import com.google.code.kaptcha.Constants;
-import com.google.code.kaptcha.Producer;
-import com.google.code.kaptcha.servlet.KaptchaServlet;
-import com.ym.mec.auth.config.constant.SecurityConstants;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.validcode.SmsCodeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+
+import java.awt.image.BufferedImage;
+import java.util.concurrent.TimeUnit;
+
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
+import com.google.code.kaptcha.Constants;
+import com.google.code.kaptcha.Producer;
+import com.google.code.kaptcha.servlet.KaptchaServlet;
+import com.ym.mec.auth.config.constant.SecurityConstants;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.validcode.SmsCodeService;
 
 @RestController
 @RequestMapping("code")

mec-common/common-core/src/main/java/com/ym/mec/common/redis/service/RedisCache.java

@@ -68,4 +68,8 @@ public class RedisCache<K, V> implements Cache<K, V> {
 	public void setRedisTemplate(RedisTemplate<K, V> redisTemplate) {
 		this.redisTemplate = redisTemplate;
 	}
+
+	public RedisTemplate<K, V> getRedisTemplate() {
+		return redisTemplate;
+	}
 }

mec-common/common-core/src/main/java/com/ym/mec/common/service/IdGeneratorService.java

@@ -0,0 +1,17 @@
+package com.ym.mec.common.service;
+
+public interface IdGeneratorService {
+
+	/**
+	 * 根据业务名称生产id
+	 * @param biz
+	 * @return
+	 */
+	long generatorId(String biz);
+
+	/**
+	 * 自动生成id
+	 * @return
+	 */
+	long generatorId();
+}

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -0,0 +1,89 @@
+package com.ym.mec.common.service.impl;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Service;
+
+import com.google.common.base.Strings;
+import com.ym.mec.common.redis.service.RedisCache;
+import com.ym.mec.common.service.IdGeneratorService;
+
+@Service
+public class RedisIdGeneratorService implements IdGeneratorService {
+
+	private final static Logger log = LoggerFactory.getLogger(RedisIdGeneratorService.class);
+
+	private static final String keyPrefix = "smart";
+
+	@Autowired
+	private RedisCache<String,Object> redisCache;
+
+	/**
+	 * @Description
+	 * @author butterfly
+	 */
+	private String getIDPrefix() {
+		Date date = new Date();
+		Calendar c = Calendar.getInstance();
+		c.setTime(date);
+		int year = c.get(Calendar.YEAR);
+		int month = c.get(Calendar.MONTH) + 1;
+		int day = c.get(Calendar.DAY_OF_MONTH); // 今天是第多少天
+		int hour = c.get(Calendar.HOUR_OF_DAY);
+		int minute = c.get(Calendar.MINUTE);
+		int second = c.get(Calendar.SECOND);
+		String monthFmt = String.format("%1$02d", month);
+		String dayFmt = String.format("%1$02d", day); // 0补位操作 必须满足三位
+		String hourFmt = String.format("%1$02d", hour); // 0补位操作 必须满足2位
+		String minuteFmt = String.format("%1$02d", minute); // 0补位操作 必须满足2位
+		String secondFmt = String.format("%1$02d", second); // 0补位操作 必须满足2位
+		StringBuffer prefix = new StringBuffer();
+		prefix.append((year - 2000)).append(monthFmt).append(dayFmt).append(hourFmt).append(minuteFmt).append(secondFmt);
+		return prefix.toString();
+	}
+
+	/**
+	 * @author butterfly
+	 */
+	private long incrDistrId(String biz) {
+		String prefix = getIDPrefix();
+		String orderId = null;
+		String key = "#{biz}:id:".replace("#{biz}", biz).concat(prefix); // 001
+		RedisTemplate<String, Object> redisTemplate = redisCache.getRedisTemplate();
+		try {
+			ValueOperations<String, Object> valueOper = redisTemplate.opsForValue();
+			Long index = valueOper.increment(key, 1);
+			orderId = prefix.concat(String.format("%1$03d", index)); // 补位操作 保证满足3位
+		} catch (Exception ex) {
+			log.error("分布式订单号生成失败异常。。。。。", ex);
+		} finally {
+			redisTemplate.expire(key, 600, TimeUnit.SECONDS);// 保留10分钟内的key
+		}
+		if (Strings.isNullOrEmpty(orderId))
+			return 0;
+		return Long.parseLong(orderId);
+	}
+
+	/**
+	 * @Description 生成分布式ID
+	 * @author butterfly
+	 */
+	@Override
+	public long generatorId(String biz) {
+		// 转成数字类型，可排序
+		return incrDistrId(biz);
+	}
+
+	@Override
+	public long generatorId() {
+		return incrDistrId(keyPrefix);
+	}
+	
+}