Skip to content

C
cloud-platform
Commit d9c281e4 authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-captcha-branch'

parents 36136f57 a461742d
Hide whitespace changes
Inline Side-by-side
Showing with 975 additions and 29 deletions
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java
View file @ d9c281e4
......@@ -5,22 +5,14 @@ import com.github.wxiaoqi.security.auth.service.AuthService;
import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.ClientUtil;
import com.github.wxiaoqi.security.common.util.EntityUtils;
import com.github.wxiaoqi.security.common.util.IpUtil;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
......@@ -83,9 +75,9 @@ public class AuthController {
return new ObjectRestResponse<>();
}
@RequestMapping(value = "/sendsms", method = RequestMethod.POST)
public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String username, @RequestParam(value="type",defaultValue="0")Integer type)throws Exception{
public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String username, @RequestParam(value="type",defaultValue="0")Integer type, String pointList)throws Exception{
log.info(username+"----require sendsms...");
return appAuthService.sendsms(username,type);
return appAuthService.sendsms(username,type,pointList);
}
@RequestMapping(value = "/register", method = RequestMethod.POST)
public JSONObject register(@RequestParam(value="username",defaultValue="")String username,
......@@ -178,7 +170,7 @@ public class AuthController {
@RequestMapping(value = "other/sendsms", method = RequestMethod.GET)
public JSONObject otherSendsms(@RequestParam(value="username",defaultValue="")String username, @RequestParam(value="type",defaultValue="0")Integer type)throws Exception{
log.info(username+"----require sendsms...");
return appAuthService.sendsms(username,type);
return appAuthService.sendsms(username,type, "");
}
@RequestMapping(value = "/otherLogin", method = RequestMethod.POST)
......
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/feign/IUserService.java
View file @ d9c281e4
......@@ -29,7 +29,7 @@ public interface IUserService {
AppUserInfo AppValidate(@RequestBody JwtAuthenticationRequest authenticationRequest);
@RequestMapping(value = "/api/app/user/sendsms", method = RequestMethod.POST)
public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String username, @RequestParam(value="type",defaultValue="0")Integer type);
public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList")String pointList);
@RequestMapping(value = "/api/app/user/register", method = RequestMethod.POST)
public JSONObject register( @RequestParam(value="username",defaultValue="")String username,
@RequestParam(value="mobilecode",defaultValue="")String mobilecode,
......
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java
View file @ d9c281e4
......@@ -4,16 +4,13 @@ package com.github.wxiaoqi.security.auth.service;
import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
public interface AuthService {
String login(JwtAuthenticationRequest authenticationRequest) throws Exception;
ObjectRestResponse loginSmall(JwtAuthenticationRequest authenticationRequest) throws Exception;
String refresh(String oldToken) throws Exception;
void validate(String token) throws Exception;
JSONObject sendsms(String username, Integer type) throws Exception;
JSONObject sendsms(String username, Integer type, String pointList) throws Exception;
JSONObject register(String username, String mobilecode, String password,String code) throws Exception;
JSONObject wxregister( String username, String mobilecode, String password, String nickname, String headimgurl, String openid, String unionid, Integer type,Integer isQQ,String code) throws Exception;
JSONObject checkBindWechat(String username) throws Exception;
......
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java
View file @ d9c281e4
......@@ -13,14 +13,11 @@ import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletRequest;
/**
* @author keliii
*/
......@@ -69,8 +66,9 @@ public class AppAuthServiceImpl implements AuthService {
jwtTokenUtil.getInfoFromToken(token);
}
@Override
public JSONObject sendsms(String username, Integer type) throws Exception {
return userService.sendsms(username,type);
public JSONObject sendsms(String username, Integer type, String pointList) throws Exception {
pointList = pointList == null ? "" : pointList;
return userService.sendsms(username,type,pointList);
}
@Override
......
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java
View file @ d9c281e4
......@@ -65,8 +65,8 @@ public class AuthServiceImpl implements AuthService {
return jwtTokenUtil.generateToken(jwtTokenUtil.getInfoFromToken(oldToken));
}
@Override
public JSONObject sendsms(String username, Integer type) throws Exception {
return userService.sendsms(username,type);
public JSONObject sendsms(String username, Integer type, String pointList) throws Exception {
return userService.sendsms(username,type, pointList);
}
@Override
public JSONObject register(String username, String mobilecode, String password,String code) throws Exception {
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/constant/RedisKey.java
View file @ d9c281e4
......@@ -7,4 +7,10 @@ public class RedisKey {
*/
public static final String CONSTANT_CODE_PREFIX ="cache:mobilecode:";
/**
* 图片验证码
*/
public static final String CAPTCHA_PHONE_PREFIX = "captcha:phone:";
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java
View file @ d9c281e4
......@@ -8,7 +8,6 @@ import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
import com.github.wxiaoqi.security.admin.vo.ImiVo;
import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
......@@ -72,8 +71,8 @@ public class AppUserRest {
*/
@RequestMapping(value = "/user/sendsms", method = RequestMethod.POST)
public @ResponseBody
JSONObject sendsms(@RequestParam(value="username",defaultValue="")String username, @RequestParam(value="type",defaultValue="0")Integer type){
return appPermissionService.sendSMS(username,type);
JSONObject sendsms(@RequestParam(value="username",defaultValue="")String username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList")String pointList){
return appPermissionService.sendSMS(username,type, pointList);
}
/**
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
View file @ d9c281e4
......@@ -160,7 +160,7 @@ public class AppPermissionService {
* @return phone手机号 type:类型(0用户注册,1微信绑定,2人脸注册,3忘记密码,4直接发送验证码) 改写发送验证码方法（暂时通过测试）
*/
public JSONObject sendSMS(String phone, Integer type) {
public JSONObject sendSMS(String phone, Integer type, String pointList) {
if (StringUtils.isBlank(phone) || type == null) {
return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
}
......@@ -170,11 +170,15 @@ public class AppPermissionService {
}
// 组织返回结果集
JSONObject result = new JSONObject();
if (type == 0) {
if (type == 0) {// 注册验证码
AppUserLogin rsUserLogin = appUserLoginBiz.checkeUserLogin(phone);
if (rsUserLogin != null) {
return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已存在");
}
ObjectRestResponse<Boolean> objectRestResponse = thirdFeign.verify(phone, pointList);
if (objectRestResponse.getData() == null || objectRestResponse.getData() == false) {
return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "图片验证码验证失败");
}
} else if (type == 1) {
AppUserLogin rsUserLogin = appUserLoginBiz.checkeUserLogin(phone);
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/CaptchaType.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.constant;
/**
* 验证码类型
* @author stx
* @date 2018/11/5 11:07
* @desc
*/
public enum CaptchaType {
BLOCK_PUZZLE("BLOCK_PUZZLE", "滑块拼图"),
CLICK_WORD("CLICK_WORD", "点选文字"),
;
private String name;
private String desc;
CaptchaType(String name, String desc) {
this.name = name;
this.desc = desc;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/RedisKey.java
View file @ d9c281e4
......@@ -103,4 +103,7 @@ public class RedisKey {
* 服务器上传压缩包文件序号
*/
public static final String UPLOAD_ZIP_NO_PREFIX ="upload:zip:no:";
public static final String CAPTCHA_PHONE_PREFIX = "captcha:phone:";
}
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/CaptchaBaseParam.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.dto;
import java.io.Serializable;
/**
* 基础入参对象
* @author stx
* @date 2018/11/5 16:35
* @desc
*/
public class CaptchaBaseParam implements Serializable {
private String urlOrPath;
public String getUrlOrPath() {
return urlOrPath;
}
public void setUrlOrPath(String urlOrPath) {
this.urlOrPath = urlOrPath;
}
}
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/VerifyDto.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.dto;
import lombok.Data;
@Data
public class VerifyDto {
String list;
String pointList;
}
\ No newline at end of file
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java
View file @ d9c281e4
......@@ -90,4 +90,7 @@ public interface ThirdFeign {
@GetMapping("/info/app/unauth/getAliPayUserInfo")
public ObjectRestResponse<String> getAliPayUserInfo(@RequestParam(value = "code")String code);
@RequestMapping("/captcha/app/unauth/verify")
ObjectRestResponse<Boolean> verify(@RequestParam(value = "phone")String phone, @RequestParam(value = "pointList")String pointList);
}
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/utils/ImageUtils.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.utils;
import java.io.File;
public class ImageUtils {
public static String getClickWordBgPath (){
String imagePath = "/data/www/resources/images/pic-click";
File file = new File(imagePath);
String[] files = file.list();
int randomNum = RandomUtils.getRandomInt(1 , files.length);
String path = files[randomNum];
return imagePath+"/" + path;
}
public static String getBlockPuzzleBgPath (){
String imagePath = "/data/www/resources/images/jigsaw/original";
File file = new File(imagePath);
String[] files = file.list();
int randomNum = RandomUtils.getRandomInt(1 , files.length);
String path = files[randomNum];
return imagePath+"\\" + path;
}
public static String getBlockPuzzleJigsawPath (){
String imagePath = "/data/www/resources/images/jigsaw/slidingBlock";
File file = new File(imagePath);
String[] files = file.list();
int randomNum = RandomUtils.getRandomInt(1 , files.length);
String path = files[randomNum];
return imagePath+"\\" + path;
}
public static void main(String[] args) {
System.out.println(getBlockPuzzleBgPath());
}
}
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/utils/RandomUtils.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.utils;
import java.util.Random;
/**
* @author stx
* @date 2018/11/5 11:39
* @desc
*/
public class RandomUtils {
/**
* 获取随机中文
*
* @return
*/
public static String getRandomHan(String hanZi) {
String ch = hanZi.charAt(new Random().nextInt(hanZi.length())) + "";
return ch;
}
/**
* 随机范围内数字
* @param startNum
* @param endNum
* @return
*/
public static Integer getRandomInt(int startNum, int endNum) {
return new Random().nextInt(endNum-startNum) + startNum;
}
}
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/utils/base64Change.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.utils;
import org.apache.commons.lang3.StringUtils;
import sun.misc.BASE64Decoder;
import sun.misc.BASE64Encoder;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.*;
public class base64Change {
/**
* @param imgStr base64编码字符串
* @param path 图片路径-具体到文件
*/
public static boolean generateImage(String imgStr, String path) {
if (imgStr == null)
return false;
BASE64Decoder decoder = new BASE64Decoder();
try {
// 解密
byte[] b = decoder.decodeBuffer(imgStr);
// 处理数据
for (int i = 0; i < b.length; ++i) {
if (b[i] < 0) {
b[i] += 256;
}
}
OutputStream out = new FileOutputStream(path);
out.write(b);
out.flush();
out.close();
return true;
} catch (Exception e) {
return false;
}
}
public static void main(String[] args) {
String path = "d:\\1.jpg";
String imgFile = "D:\\Downloads\\light_yan-captcha-master\\captcha\\images\\pic-click\\bg5.png";//待处理的图片
String imgpath = GetImageStr(imgFile);
System.out.println(generateImage(imgpath, path));
}
//图片转化成base64字符串
public static String GetImageStr(String imgFile)
{//将图片文件转化为字节数组字符串，并对其进行Base64编码处理
// 地址也有写成"F:/deskBG/86619-107.jpg"形式的
try {
return encodeToString(imgFile);
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
public static String encodeToString(String imagePath) throws IOException {
String type = StringUtils.substring(imagePath, imagePath.lastIndexOf(".") + 1);
BufferedImage image = ImageIO.read(new File(imagePath));
String imageString = null;
ByteArrayOutputStream bos = new ByteArrayOutputStream();
try {
ImageIO.write(image, type, bos);
byte[] imageBytes = bos.toByteArray();
BASE64Encoder encoder = new BASE64Encoder();
imageString = encoder.encode(imageBytes);
bos.close();
} catch (IOException e) {
e.printStackTrace();
}
return imageString;
}
}
\ No newline at end of file
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/vo/BlockPuzzleCaptchaVO.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.vo;
import java.awt.*;
/**
* @author stx
* @date 2018/11/5 17:15
* @desc
*/
public class BlockPuzzleCaptchaVO extends CaptchaBaseVO {
/** 点选坐标 */
private Point point;
/** 滑块图片base64 */
private String jigsawImageBase64;
public Point getPoint() {
return point;
}
public void setPoint(Point point) {
this.point = point;
}
public String getJigsawImageBase64() {
return jigsawImageBase64;
}
public void setJigsawImageBase64(String jigsawImageBase64) {
this.jigsawImageBase64 = jigsawImageBase64;
}
}
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/vo/CaptchaBaseVO.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.vo;
import java.io.Serializable;
/**
* 验证码返回基础对象
*/
public class CaptchaBaseVO implements Serializable {
/** 原生图片base64 */
private String originalImageBase64;
public String getOriginalImageBase64() {
return originalImageBase64;
}
public void setOriginalImageBase64(String originalImageBase64) {
this.originalImageBase64 = originalImageBase64;
}
}
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/vo/ClickWordCaptchaVO.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.vo;
import lombok.Data;
import java.awt.*;
import java.util.List;
@Data
public class ClickWordCaptchaVO extends CaptchaBaseVO {
/** 点选文字 */
private List<String> wordList;
/** 点选坐标 */
private List<Point> pointList;
private Integer width;
private Integer height;
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/CaptchaController.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.controller;
import com.alibaba.fastjson.JSONArray;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.xxfc.platform.universal.constant.CaptchaType;
import com.xxfc.platform.universal.constant.RedisKey;
import com.xxfc.platform.universal.dto.CaptchaBaseParam;
import com.xxfc.platform.universal.service.AbstractCaptcha;
import com.xxfc.platform.universal.service.CaptchaFactory;
import com.xxfc.platform.universal.service.ICaptchaFactory;
import com.xxfc.platform.universal.utils.ImageUtils;
import com.xxfc.platform.universal.vo.CaptchaBaseVO;
import com.xxfc.platform.universal.vo.ClickWordCaptchaVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.awt.*;
import java.util.concurrent.TimeUnit;
/**
* 图片验证码
*/
@Controller
@RequestMapping(value = "/captcha")
@Slf4j
public class CaptchaController {
@Autowired
RedisTemplate redisTemplate;
@RequestMapping("/app/unauth/blockPuzzle")
@ResponseBody
ObjectRestResponse blockPuzzle() {
ICaptchaFactory captchaFactory = new CaptchaFactory();
AbstractCaptcha captcha = captchaFactory.getInstance(CaptchaType.BLOCK_PUZZLE);
CaptchaBaseParam captchaBaseParam = new CaptchaBaseParam();
captchaBaseParam.setUrlOrPath(ImageUtils.getBlockPuzzleBgPath());
captcha.setJigsawUrlOrPath(ImageUtils.getBlockPuzzleJigsawPath());
CaptchaBaseVO dataVO = captcha.create(captchaBaseParam);
return ObjectRestResponse.succ(dataVO);
}
@RequestMapping("/app/unauth/clickWord")
@ResponseBody
ObjectRestResponse clickWord(String phone) {
ICaptchaFactory captchaFactory = new CaptchaFactory();
AbstractCaptcha captcha = captchaFactory.getInstance(CaptchaType.CLICK_WORD);
CaptchaBaseParam captchaBaseParam = new CaptchaBaseParam();
captchaBaseParam.setUrlOrPath(ImageUtils.getClickWordBgPath());
captcha.setFontColorRandom(false);
ClickWordCaptchaVO dataVO = (ClickWordCaptchaVO) captcha.create(captchaBaseParam);
log.info("获取注册验证码：》》》{}", dataVO.getPointList());
if (dataVO.getPointList() != null) {
try {
String redisLockKey = RedisKey.CAPTCHA_PHONE_PREFIX + phone;
String captchaCode = redisTemplate.opsForValue().get(redisLockKey) == null ? "" : redisTemplate.opsForValue().get(redisLockKey).toString();
if (StringUtils.isNotBlank(captchaCode)) {
redisTemplate.delete(redisLockKey);
}
Boolean suc = redisTemplate.opsForValue().setIfAbsent(redisLockKey, JSONArray.toJSONString(dataVO.getPointList()));
if (suc) {
redisTemplate.expire(redisLockKey, 5, TimeUnit.MINUTES);//5分钟内过期
dataVO.setPointList(null);
}
} catch (Exception e) {
log.error(e.getMessage(), e);
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
}
return ObjectRestResponse.succ(dataVO);
}
@RequestMapping("/app/unauth/verify")
@ResponseBody
ObjectRestResponse<Boolean> verify(String phone, String pointList) {
if (StringUtils.isBlank(phone) || StringUtils.isBlank(pointList)) {
return ObjectRestResponse.paramIsEmpty();
}
String redisLockKey = RedisKey.CAPTCHA_PHONE_PREFIX + phone;
String captchaCode = redisTemplate.opsForValue().get(redisLockKey) == null ? "" : redisTemplate.opsForValue().get(redisLockKey).toString();
log.info("【注册验证码坐标】：》》》》》 {}", captchaCode);
log.info("【注册验证码用户点选坐标】：》》》》》 {}", pointList);
if (StringUtils.isBlank(captchaCode)) {
log.error("【注册验证码坐标为空,请重新验证】");
return ObjectRestResponse.succ(false);
}
ICaptchaFactory captchaFactory = new CaptchaFactory();
AbstractCaptcha captcha = captchaFactory.getInstance(CaptchaType.CLICK_WORD);
boolean flag = captcha.verification(JSONArray.parseArray(captchaCode, Point.class), JSONArray.parseArray(pointList,Point.class));
return ObjectRestResponse.succ(flag);
}
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/interceptor/CaptchaException.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.interceptor;
/**
* @author stx
* @date 2018/11/5 11:15
* @desc
*/
public class CaptchaException extends RuntimeException {
private static final long serialVersionUID = 5950168740799888303L;
public CaptchaException(){
super();
}
public CaptchaException(String message){
super(message);
}
public CaptchaException(String message, Throwable cause){
super(message, cause);
}
public CaptchaException(Throwable cause){
super(cause);
}
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/AbstractCaptcha.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.service;
import com.xxfc.platform.universal.dto.CaptchaBaseParam;
import com.xxfc.platform.universal.interceptor.CaptchaException;
import com.xxfc.platform.universal.vo.CaptchaBaseVO;
import org.apache.commons.lang3.StringUtils;
import sun.misc.BASE64Encoder;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.List;
/**
* 图行验证码抽象方法
*/
public abstract class AbstractCaptcha {
protected static final String URL_PREFIX_HTTP = "http://";
protected static final String URL_PREFIX_HTTPS = "https://";
protected static final String IMAGE_TYPE_PNG = "png";
/** 滑块拼图图片地址 */
private String jigsawUrlOrPath;
/** 点选文字 字体总个数 */
private int wordTotalCount = 4;
/** 点选文字 字体颜色是否随机 */
private boolean fontColorRandom = Boolean.TRUE;
public abstract CaptchaBaseVO create(CaptchaBaseParam captchaParam);
public abstract boolean verification(List<Point> pointList, List<Point> pointList1);
/**
*
* 获取原生图片
* @param urlOrPath
* @return
*/
protected static BufferedImage getBufferedImage (String urlOrPath) {
if (StringUtils.isBlank(urlOrPath)) {
throw new CaptchaException("urlOrPath is empty.");
}
BufferedImage sampleImage = null;
try {
if (urlOrPath.startsWith(URL_PREFIX_HTTP) || urlOrPath.startsWith(URL_PREFIX_HTTPS)) {
sampleImage = ImageIO.read(new URL(urlOrPath));
} else {
sampleImage = ImageIO.read(new File(urlOrPath));
}
} catch (IOException e ){
throw new CaptchaException("urlOrPath is url or path error.");
}
// todo 可以考虑验证下尺寸 300 * 155
return sampleImage;
}
/**
* 图片转base64 字符串
* @param templateImage
* @return
*/
protected String getImageToBase64Str (BufferedImage templateImage){
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
ImageIO.write(templateImage, "png", baos);
} catch (IOException e) {
throw new CaptchaException("ImageIO.write is error", e);
}
byte[] bytes = baos.toByteArray();
BASE64Encoder encoder = new BASE64Encoder();
return encoder.encodeBuffer(bytes).trim().replaceAll("\n", "").replaceAll("\r", "");
}
public String getJigsawUrlOrPath() {
return jigsawUrlOrPath;
}
public void setJigsawUrlOrPath(String jigsawUrlOrPath) {
this.jigsawUrlOrPath = jigsawUrlOrPath;
}
public int getWordTotalCount() {
return wordTotalCount;
}
public void setWordTotalCount(int wordTotalCount) {
this.wordTotalCount = wordTotalCount;
}
public boolean isFontColorRandom() {
return fontColorRandom;
}
public void setFontColorRandom(boolean fontColorRandom) {
this.fontColorRandom = fontColorRandom;
}
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/BlockPuzzleCaptcha.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.service;
import com.alibaba.fastjson.JSON;
import com.xxfc.platform.universal.dto.CaptchaBaseParam;
import com.xxfc.platform.universal.interceptor.CaptchaException;
import com.xxfc.platform.universal.vo.BlockPuzzleCaptchaVO;
import com.xxfc.platform.universal.vo.CaptchaBaseVO;
import org.apache.commons.lang3.StringUtils;
import sun.misc.BASE64Encoder;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.util.List;
import java.util.Random;
/**
* 滑块拼图验证码
* @author stx
* @date 2018/11/5 11:12
* @desc
*/
public class BlockPuzzleCaptcha extends AbstractCaptcha {
@Override
public CaptchaBaseVO create(CaptchaBaseParam captchaParam) {
if (captchaParam == null
|| StringUtils.isBlank(captchaParam.getUrlOrPath())) {
throw new CaptchaException("参数不正确，captchaParam："+JSON.toJSONString(captchaParam));
}
if (StringUtils.isBlank(getJigsawUrlOrPath())){
throw new CaptchaException("参数不正确，请设置jigsawUrlOrPath 参数");
}
//原生图片
BufferedImage originalImage = getBufferedImage(captchaParam.getUrlOrPath());
//抠图图片
BufferedImage jigsawImage = getBufferedImage(getJigsawUrlOrPath());
return pictureTemplatesCut(originalImage, jigsawImage);
}
@Override
public boolean verification(List<Point> pointList, List<Point> pointList1) {
return false;
}
/**
* 根据模板切图
*
* @throws Exception
*/
public static CaptchaBaseVO pictureTemplatesCut(BufferedImage originalImage, BufferedImage jigsawImage){
try {
BlockPuzzleCaptchaVO dataVO = new BlockPuzzleCaptchaVO();
int originalWidth = originalImage.getWidth();
int originalHeight = originalImage.getHeight();
int jigsawWidth = jigsawImage.getWidth();
int jigsawHeight = jigsawImage.getHeight();
//随机生成拼图坐标
Point point = generateJigsawPoint(originalWidth, originalHeight, jigsawWidth, jigsawHeight);
int x = (int)point.getX();
int y = (int)point.getY();
//生成新的拼图图像
BufferedImage newJigsawImage = new BufferedImage(jigsawWidth, jigsawHeight, jigsawImage.getType());
Graphics2D graphics = newJigsawImage.createGraphics();
graphics.setBackground(Color.white);
int bold = 5;
BufferedImage subImage = originalImage.getSubimage(x, 0, jigsawWidth, jigsawHeight);
// 获取拼图区域
newJigsawImage = DealCutPictureByTemplate(subImage, jigsawImage, newJigsawImage);
// 设置“抗锯齿”的属性
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
graphics.setStroke(new BasicStroke(bold, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
graphics.drawImage(newJigsawImage, 0, 0, null);
graphics.dispose();
ByteArrayOutputStream os = new ByteArrayOutputStream();//新建流。
ImageIO.write(newJigsawImage, IMAGE_TYPE_PNG, os);//利用ImageIO类提供的write方法，将bi以png图片的数据模式写入流。
byte[] jigsawImages = os.toByteArray();
// 源图生成遮罩
byte[] oriCopyImages = DealOriPictureByTemplate(originalImage, jigsawImage, x, 0);
BASE64Encoder encoder = new BASE64Encoder();
dataVO.setOriginalImageBase64(encoder.encode(oriCopyImages));
dataVO.setPoint(point);
dataVO.setJigsawImageBase64(encoder.encode(jigsawImages));
return dataVO;
} catch (Exception e){
throw new CaptchaException(e);
}
}
/**
* 抠图后原图生成
*
* @param oriImage
* @param templateImage
* @param x
* @param y
* @return
* @throws Exception
*/
private static byte[] DealOriPictureByTemplate(BufferedImage oriImage, BufferedImage templateImage, int x,
int y) throws Exception {
// 源文件备份图像矩阵 支持alpha通道的rgb图像
BufferedImage ori_copy_image = new BufferedImage(oriImage.getWidth(), oriImage.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
// 源文件图像矩阵
int[][] oriImageData = getData(oriImage);
// 模板图像矩阵
int[][] templateImageData = getData(templateImage);
//copy 源图做不透明处理
for (int i = 0; i < oriImageData.length; i++) {
for (int j = 0; j < oriImageData[0].length; j++) {
int rgb = oriImage.getRGB(i, j);
int r = (0xff & rgb);
int g = (0xff & (rgb >> 8));
int b = (0xff & (rgb >> 16));
//无透明处理
rgb = r + (g << 8) + (b << 16) + (255 << 24);
ori_copy_image.setRGB(i, j, rgb);
}
}
for (int i = 0; i < templateImageData.length; i++) {
for (int j = 0; j < templateImageData[0].length - 5; j++) {
int rgb = templateImage.getRGB(i, j);
//对源文件备份图像(x+i,y+j)坐标点进行透明处理
if (rgb != 16777215 && rgb <= 0) {
int rgb_ori = ori_copy_image.getRGB(x + i, y + j);
int r = (0xff & rgb_ori);
int g = (0xff & (rgb_ori >> 8));
int b = (0xff & (rgb_ori >> 16));
rgb_ori = r + (g << 8) + (b << 16) + (150 << 24);
ori_copy_image.setRGB(x + i, y + j, rgb_ori);
} else {
//do nothing
}
}
}
ByteArrayOutputStream os = new ByteArrayOutputStream();//新建流。
ImageIO.write(ori_copy_image, "png", os);//利用ImageIO类提供的write方法，将bi以png图片的数据模式写入流。
byte b[] = os.toByteArray();//从流中获取数据数组。
return b;
}
/**
* 根据模板图片抠图
* @param oriImage
* @param templateImage
* @param targetImage
* @return
* @throws Exception
*/
private static BufferedImage DealCutPictureByTemplate(BufferedImage oriImage, BufferedImage templateImage,
BufferedImage targetImage) throws Exception {
// 源文件图像矩阵
int[][] oriImageData = getData(oriImage);
// 模板图像矩阵
int[][] templateImageData = getData(templateImage);
// 模板图像宽度
for (int i = 0; i < templateImageData.length; i++) {
// 模板图片高度
for (int j = 0; j < templateImageData[0].length; j++) {
// 如果模板图像当前像素点不是白色 copy源文件信息到目标图片中
int rgb = templateImageData[i][j];
if (rgb != 16777215 && rgb <= 0) {
targetImage.setRGB(i, j, oriImageData[i][j]);
}
}
}
return targetImage;
}
/**
* 生成图像矩阵
* @param
* @return
* @throws Exception
*/
private static int[][] getData(BufferedImage bimg){
int[][] data = new int[bimg.getWidth()][bimg.getHeight()];
for (int i = 0; i < bimg.getWidth(); i++) {
for (int j = 0; j < bimg.getHeight(); j++) {
data[i][j] = bimg.getRGB(i, j);
}
}
return data;
}
/**
* 随机生成拼图坐标
* @param originalWidth
* @param originalHeight
* @param jigsawWidth
* @param jigsawHeight
* @return
*/
private static Point generateJigsawPoint(int originalWidth, int originalHeight, int jigsawWidth, int jigsawHeight) {
Random random = new Random();
int widthDifference = originalWidth - jigsawWidth;
int heightDifference = originalHeight - jigsawHeight;
int x, y = 0;
if (widthDifference <= 0) {
x = 5;
} else {
x = random.nextInt(originalWidth - jigsawWidth) + 5;
}
if (heightDifference <= 0) {
y = 5;
} else {
y = random.nextInt(originalHeight - jigsawHeight) + 5;
}
return new Point(x, y);
}
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CaptchaFactory.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.service;
import com.xxfc.platform.universal.constant.CaptchaType;
/**
* @author stx
* @date 2018/11/5 11:11
* @desc
*/
public class CaptchaFactory implements ICaptchaFactory{
@Override
public AbstractCaptcha getInstance(CaptchaType captchaType) {
if (CaptchaType.CLICK_WORD.getName().equals(captchaType.getName())){
return new ClickWordCaptcha();
} else if (CaptchaType.BLOCK_PUZZLE.getName().equals(captchaType.getName())) {
return new BlockPuzzleCaptcha();
}
return null;
}
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/ClickWordCaptcha.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.service;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.xxfc.platform.universal.dto.CaptchaBaseParam;
import com.xxfc.platform.universal.interceptor.CaptchaException;
import com.xxfc.platform.universal.utils.RandomUtils;
import com.xxfc.platform.universal.vo.ClickWordCaptchaVO;
import org.apache.commons.lang3.StringUtils;
import java.awt.*;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* 点选文字验证码
*/
public class ClickWordCaptcha extends AbstractCaptcha {
private static String HAN_ZI = "\u7684\u4e00\u4e86\u662f\u6211\u4e0d\u5728\u4eba\u4eec\u6709\u6765\u4ed6\u8fd9\u4e0a\u7740\u4e2a\u5730\u5230\u5927\u91cc\u8bf4\u5c31\u53bb\u5b50\u5f97\u4e5f\u548c\u90a3\u8981\u4e0b\u770b\u5929\u65f6\u8fc7\u51fa\u5c0f\u4e48\u8d77\u4f60\u90fd\u628a\u597d\u8fd8\u591a\u6ca1\u4e3a\u53c8\u53ef\u5bb6\u5b66\u53ea\u4ee5\u4e3b\u4f1a\u6837\u5e74\u60f3\u751f\u540c\u8001\u4e2d\u5341\u4ece\u81ea\u9762\u524d\u5934\u9053\u5b83\u540e\u7136\u8d70\u5f88\u50cf\u89c1\u4e24\u7528\u5979\u56fd\u52a8\u8fdb\u6210\u56de\u4ec0\u8fb9\u4f5c\u5bf9\u5f00\u800c\u5df1\u4e9b\u73b0\u5c71\u6c11\u5019\u7ecf\u53d1\u5de5\u5411\u4e8b\u547d\u7ed9\u957f\u6c34\u51e0\u4e49\u4e09\u58f0\u4e8e\u9ad8\u624b\u77e5\u7406\u773c\u5fd7\u70b9\u5fc3\u6218\u4e8c\u95ee\u4f46\u8eab\u65b9\u5b9e\u5403\u505a\u53eb\u5f53\u4f4f\u542c\u9769\u6253\u5462\u771f\u5168\u624d\u56db\u5df2\u6240\u654c\u4e4b\u6700\u5149\u4ea7\u60c5\u8def\u5206\u603b\u6761\u767d\u8bdd\u4e1c\u5e2d\u6b21\u4eb2\u5982\u88ab\u82b1\u53e3\u653e\u513f\u5e38\u6c14\u4e94\u7b2c\u4f7f\u5199\u519b\u5427\u6587\u8fd0\u518d\u679c\u600e\u5b9a\u8bb8\u5feb\u660e\u884c\u56e0\u522b\u98de\u5916\u6811\u7269\u6d3b\u90e8\u95e8\u65e0\u5f80\u8239\u671b\u65b0\u5e26\u961f\u5148\u529b\u5b8c\u5374\u7ad9\u4ee3\u5458\u673a\u66f4\u4e5d\u60a8\u6bcf\u98ce\u7ea7\u8ddf\u7b11\u554a\u5b69\u4e07\u5c11\u76f4\u610f\u591c\u6bd4\u9636\u8fde\u8f66\u91cd\u4fbf\u6597\u9a6c\u54ea\u5316\u592a\u6307\u53d8\u793e\u4f3c\u58eb\u8005\u5e72\u77f3\u6ee1\u65e5\u51b3\u767e\u539f\u62ff\u7fa4\u7a76\u5404\u516d\u672c\u601d\u89e3\u7acb\u6cb3\u6751\u516b\u96be\u65e9\u8bba\u5417\u6839\u5171\u8ba9\u76f8\u7814\u4eca\u5176\u4e66\u5750\u63a5\u5e94\u5173\u4fe1\u89c9\u6b65\u53cd\u5904\u8bb0\u5c06\u5343\u627e\u4e89\u9886\u6216\u5e08\u7ed3\u5757\u8dd1\u8c01\u8349\u8d8a\u5b57\u52a0\u811a\u7d27\u7231\u7b49\u4e60\u9635\u6015\u6708\u9752\u534a\u706b\u6cd5\u9898\u5efa\u8d76\u4f4d\u5531\u6d77\u4e03\u5973\u4efb\u4ef6\u611f\u51c6\u5f20\u56e2\u5c4b\u79bb\u8272\u8138\u7247\u79d1\u5012\u775b\u5229\u4e16\u521a\u4e14\u7531\u9001\u5207\u661f\u5bfc\u665a\u8868\u591f\u6574\u8ba4\u54cd\u96ea\u6d41\u672a\u573a\u8be5\u5e76\u5e95\u6df1\u523b\u5e73\u4f1f\u5fd9\u63d0\u786e\u8fd1\u4eae\u8f7b\u8bb2\u519c\u53e4\u9ed1\u544a\u754c\u62c9\u540d\u5440\u571f\u6e05\u9633\u7167\u529e\u53f2\u6539\u5386\u8f6c\u753b\u9020\u5634\u6b64\u6cbb\u5317\u5fc5\u670d\u96e8\u7a7f\u5185\u8bc6\u9a8c\u4f20\u4e1a\u83dc\u722c\u7761\u5174\u5f62\u91cf\u54b1\u89c2\u82e6\u4f53\u4f17\u901a\u51b2\u5408\u7834\u53cb\u5ea6\u672f\u996d\u516c\u65c1\u623f\u6781\u5357\u67aa\u8bfb\u6c99\u5c81\u7ebf\u91ce\u575a\u7a7a\u6536\u7b97\u81f3\u653f\u57ce\u52b3\u843d\u94b1\u7279\u56f4\u5f1f\u80dc\u6559\u70ed\u5c55\u5305\u6b4c\u7c7b\u6e10\u5f3a\u6570\u4e61\u547c\u6027\u97f3\u7b54\u54e5\u9645\u65e7\u795e\u5ea7\u7ae0\u5e2e\u5566\u53d7\u7cfb\u4ee4\u8df3\u975e\u4f55\u725b\u53d6\u5165\u5cb8\u6562\u6389\u5ffd\u79cd\u88c5\u9876\u6025\u6797\u505c\u606f\u53e5\u533a\u8863\u822c\u62a5\u53f6\u538b\u6162\u53d4\u80cc\u7ec6";
private static String HAN_ZI_FONT = "宋体";
private static int HAN_ZI_SIZE = 60;
private static int HAN_ZI_SIZE_HALF = 60;
@Override
public ClickWordCaptchaVO create(CaptchaBaseParam captchaParam) {
if (captchaParam == null
|| StringUtils.isBlank(captchaParam.getUrlOrPath())) {
throw new CaptchaException("参数不正确，captchaParam："+JSON.toJSONString(captchaParam));
}
BufferedImage bufferedImage = getBufferedImage(captchaParam.getUrlOrPath());
return getImageData(bufferedImage);
}
@Override
public boolean verification(List<Point> pointList, List<Point> pointList1) {
if (pointList == null
|| pointList1 == null
|| pointList.size() == 0
|| pointList.size() != pointList1.size()) {
throw new CaptchaException("点选文字验证码坐标信息为空或者不相等，pointList:"+JSON.toJSON(pointList)+",pointList1:" +JSON.toJSONString(pointList1));
}
for (int i = 0; i < pointList.size(); i++){
Point point = pointList.get(i);
Point point1 = pointList1.get(i);
int x = (int)point.getX();
int y = (int)point.getY();
int x1 = (int)point1.getX();
int y1 = (int)point1.getY();
if (Math.abs(x-x1) <= HAN_ZI_SIZE_HALF && Math.abs(y-y1) <= HAN_ZI_SIZE_HALF){
return true;
}
}
return false;
}
private ClickWordCaptchaVO getImageData(BufferedImage backgroundImage) {
ClickWordCaptchaVO dataVO = new ClickWordCaptchaVO();
List<String> wordList = new ArrayList<String>();
List<Point> pointList = new ArrayList();
Graphics backgroundGraphics = backgroundImage.getGraphics();
int width = backgroundImage.getWidth();
int height = backgroundImage.getHeight();
dataVO.setWidth(width);
dataVO.setHeight(height);
Font font = new Font(HAN_ZI_FONT, Font.BOLD, HAN_ZI_SIZE);
int wordCount = getWordTotalCount();
//定义随机1到arr.length某一个字不参与校验
int num = RandomUtils.getRandomInt(1, wordCount);
Set<String> currentWords = new HashSet<String>();
for (int i = 0; i < wordCount; i++) {
String word;
do {
word = RandomUtils.getRandomHan(HAN_ZI);
currentWords.add(word);
} while (!currentWords.contains(word));
//随机字体坐标
Point point = randomWordPoint(900, 478, i, wordCount);
//随机字体颜色
if (true){
backgroundGraphics.setColor(new Color(RandomUtils.getRandomInt(1,255),RandomUtils.getRandomInt(1,255),RandomUtils.getRandomInt(1,255)));
} else {
backgroundGraphics.setColor(Color.BLACK);
}
//设置角度
AffineTransform affineTransform = new AffineTransform();
affineTransform.rotate(Math.toRadians(RandomUtils.getRandomInt(50, 85)), 0, 0);
Font rotatedFont = font.deriveFont(affineTransform);
backgroundGraphics.setFont(rotatedFont);
backgroundGraphics.drawString(word, (int)point.getX(), (int)point.getY());
if ((num-1) != i) {
wordList.add(word);
pointList.add(point);
}
}
//创建合并图片
BufferedImage combinedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
Graphics combinedGraphics = combinedImage.getGraphics();
combinedGraphics.drawImage(backgroundImage, 0, 0, null);
int index =RandomUtils.getRandomInt(0, wordList.size()-1).intValue();
Point point = pointList.get(index);
dataVO.setOriginalImageBase64(getImageToBase64Str(backgroundImage));
List<Point> list = Lists.newArrayList();
list.add(point);
dataVO.setPointList(list);
String word = wordList.get(index);
List<String> wordString = Lists.newArrayList();
wordString.add(word);
dataVO.setWordList(wordString);
return dataVO;
}
/**
* 随机字体循环排序下标
* @param imageWidth 图片宽度
* @param imageHeight 图片高度
* @param wordSortIndex 字体循环排序下标(i)
* @param wordCount 字数量
* @return
*/
private static Point randomWordPoint(int imageWidth, int imageHeight, int wordSortIndex, int wordCount) {
int avgWidth = imageWidth / (wordCount+1);
int x, y;
if (avgWidth < HAN_ZI_SIZE_HALF){
x = RandomUtils.getRandomInt(1, imageWidth);
} else {
if (wordSortIndex == 0) {
x = RandomUtils.getRandomInt(1, avgWidth * (wordSortIndex+1) );
}else {
x = RandomUtils.getRandomInt(avgWidth * wordSortIndex, avgWidth * (wordSortIndex+1) );
}
}
y = RandomUtils.getRandomInt(1, imageHeight - HAN_ZI_SIZE_HALF);
return new Point(x, y);
}
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/ICaptchaFactory.java 0 → 100644
View file @ d9c281e4
package com.xxfc.platform.universal.service;
import com.xxfc.platform.universal.constant.CaptchaType;
/**
* 获取验证码实例工厂类
* @author stx
* @date 2018/11/5 11:06
* @desc
*/
public interface ICaptchaFactory {
AbstractCaptcha getInstance(CaptchaType captchaType);
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
View file @ d9c281e4
......@@ -351,7 +351,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
oldValue.setRetCompany(vehicleBookRecord.getRetCompany());
BookRecordUpdateLog bookRecordUpdateLog = new BookRecordUpdateLog();
bookRecordUpdateLog.setBookRecordId(vehicleBookRecord.getId());
bookRecordUpdateLog.setOldRetCompanyId(vehicleBookRecord.getRetCompany());
bookRecordUpdateLog.setOldRetCompanyId(oldValue.getRetCompany());
bookRecordUpdateLog.setNewRetCompanyId(vehicleBookRecord.getRetCompany());
bookRecordUpdateLog.setOperaterId(userDTO.getId());
bookRecordUpdateLog.setOperaterName(userDTO.getName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment