Skip to content

C
cloud-platform
Commit 015f6679 authored by libin's avatar libin
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

parents 2c0e0fab db8fafaf
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 2843 deletions
ace-auth/ace-auth-server/src/main/resources/bootstrap.yml
View file @ 015f6679
...@@ -14,6 +14,8 @@ spring: ...@@ -14,6 +14,8 @@ spring:
nacos: nacos:
config: config:
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
#共用配置，暂定一个
shared-dataids: common-dev.yaml
--- ---
spring: spring:
profiles: pro profiles: pro
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserLogin.java
View file @ 015f6679
...@@ -18,6 +18,8 @@ public class AppUserLogin { ...@@ -18,6 +18,8 @@ public class AppUserLogin {
private int id; private int id;
@Column(name = "im_userid") @Column(name = "im_userid")
private Integer imUserid; private Integer imUserid;
@Column(name = "im_password")
private String imPassword;
@Column(name = "username") @Column(name = "username")
private String username; private String username;
private String password; private String password;
......
ace-modules/ace-admin/pom.xml
View file @ 015f6679
...@@ -40,6 +40,11 @@ ...@@ -40,6 +40,11 @@
<artifactId>xx-universal-api</artifactId> <artifactId>xx-universal-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>com.xxfc.platform</groupId>
<artifactId>xx-im-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java
View file @ 015f6679
...@@ -33,7 +33,7 @@ import java.util.List; ...@@ -33,7 +33,7 @@ import java.util.List;
@EnableDiscoveryClient @EnableDiscoveryClient
@EnableCircuitBreaker @EnableCircuitBreaker
@SpringBootApplication @SpringBootApplication
@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.universal.feign"}) @EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.xxfc.platform"})
@EnableScheduling @EnableScheduling
@EnableAceAuthClient @EnableAceAuthClient
@EnableAceCache @EnableAceCache
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java
View file @ 015f6679
...@@ -78,6 +78,7 @@ public class AppUserRest { ...@@ -78,6 +78,7 @@ public class AppUserRest {
mobilecode, null, null,0); mobilecode, null, null,0);
} }
/** /**
* 微信注册/微信绑定 * 微信注册/微信绑定
* @param username * @param username
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
View file @ 015f6679
...@@ -9,12 +9,14 @@ import com.github.wxiaoqi.security.admin.constant.RedisKey; ...@@ -9,12 +9,14 @@ import com.github.wxiaoqi.security.admin.constant.RedisKey;
import com.github.wxiaoqi.security.admin.entity.*; import com.github.wxiaoqi.security.admin.entity.*;
import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo; import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
import com.github.wxiaoqi.security.api.vo.user.AppUserInfo; import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
import com.github.wxiaoqi.security.common.msg.BaseResponse;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.EmojiFilter; import com.github.wxiaoqi.security.common.util.EmojiFilter;
import com.github.wxiaoqi.security.common.util.VerificationUtils; import com.github.wxiaoqi.security.common.util.VerificationUtils;
import com.github.wxiaoqi.security.common.util.process.ResultCode; import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.util.process.SystemConfig; import com.github.wxiaoqi.security.common.util.process.SystemConfig;
import com.github.wxiaoqi.security.common.util.result.JsonResultUtil; import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
import com.xxfc.platform.im.feign.ImFeign;
import com.xxfc.platform.universal.feign.ThirdFeign; import com.xxfc.platform.universal.feign.ThirdFeign;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -23,9 +25,10 @@ import org.springframework.data.redis.core.RedisTemplate; ...@@ -23,9 +25,10 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
...@@ -44,6 +47,9 @@ public class AppPermissionService { ...@@ -44,6 +47,9 @@ public class AppPermissionService {
@Autowired @Autowired
ThirdFeign thirdFeign; ThirdFeign thirdFeign;
@Autowired
ImFeign imFeign;
private BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(12); private BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(12);
@Autowired @Autowired
private RedisTemplate userRedisTemplate; private RedisTemplate userRedisTemplate;
...@@ -56,9 +62,9 @@ public class AppPermissionService { ...@@ -56,9 +62,9 @@ public class AppPermissionService {
public AppUserInfo validate(String username, String password) { public AppUserInfo validate(String username, String password) {
AppUserInfo info = new AppUserInfo(); AppUserInfo info = new AppUserInfo();
AppUserLogin user = appUserLoginBiz.checkeUserLogin(username); AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
if (user!=null&&encoder.matches(password, user.getPassword())) { if (user != null && encoder.matches(password, user.getPassword())) {
info.setUsername(user.getUsername()); info.setUsername(user.getUsername());
info.setId(user.getId()+""); info.setId(user.getId() + "");
} }
return info; return info;
} }
...@@ -128,10 +134,10 @@ public class AppPermissionService { ...@@ -128,10 +134,10 @@ public class AppPermissionService {
return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "手机号未注册"); return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "手机号未注册");
} }
// String sms = PassportUtil.SendSMS(phone, SystemConfig.SENDSMS_TITLE); // String sms = PassportUtil.SendSMS(phone, SystemConfig.SENDSMS_TITLE);
String mobilecode=null; String mobilecode = null;
JSONObject data=thirdFeign.send(phone); JSONObject data = thirdFeign.send(phone);
if(data!=null&&data.getInteger("status")== ResultCode.SUCCESS_CODE){ if (data != null && data.getInteger("status") == ResultCode.SUCCESS_CODE) {
mobilecode=data.getString("data"); mobilecode = data.getString("data");
} }
log.info("调用短信发送接口返回值为：{}", mobilecode); log.info("调用短信发送接口返回值为：{}", mobilecode);
// 判断返回值是否为空，并且是否可以转换成JSONObject // 判断返回值是否为空，并且是否可以转换成JSONObject
...@@ -139,10 +145,10 @@ public class AppPermissionService { ...@@ -139,10 +145,10 @@ public class AppPermissionService {
return JsonResultUtil.createDefaultFail(); return JsonResultUtil.createDefaultFail();
try { try {
result.put("mobilecode", mobilecode); result.put("mobilecode", mobilecode);
String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX+phone+mobilecode; String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX + phone + mobilecode;
Boolean suc = userRedisTemplate.opsForValue().setIfAbsent(redisLockKey, mobilecode); Boolean suc = userRedisTemplate.opsForValue().setIfAbsent(redisLockKey, mobilecode);
if(suc){ if (suc) {
userRedisTemplate.expire(redisLockKey,5, TimeUnit.MINUTES);//5分钟内过期 userRedisTemplate.expire(redisLockKey, 5, TimeUnit.MINUTES);//5分钟内过期
} }
} catch (Exception e) { } catch (Exception e) {
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常"); return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
...@@ -160,13 +166,13 @@ public class AppPermissionService { ...@@ -160,13 +166,13 @@ public class AppPermissionService {
*/ */
@Transactional @Transactional
public JSONObject register(String username, String password, String headimgurl, public JSONObject register(String username, String password, String headimgurl,
String nickname, String mobilecode,String openId, String unionid,Integer type) { String nickname, String mobilecode, String openId, String unionid, Integer type) {
// 判断参数和验证码 // 判断参数和验证码
if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) { if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) {
return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空"); return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
} }
String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX+username+mobilecode; String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX + username + mobilecode;
String mobilecodeRedis=userRedisTemplate.opsForValue().get(redisLockKey)==null?"":userRedisTemplate.opsForValue().get(redisLockKey).toString(); String mobilecodeRedis = userRedisTemplate.opsForValue().get(redisLockKey) == null ? "" : userRedisTemplate.opsForValue().get(redisLockKey).toString();
log.error("注册接口，获取redis中的验证码：" + mobilecodeRedis); log.error("注册接口，获取redis中的验证码：" + mobilecodeRedis);
// 获取到缓存的验证码后要先清空缓存对应键的值 // 获取到缓存的验证码后要先清空缓存对应键的值
userRedisTemplate.delete(redisLockKey); userRedisTemplate.delete(redisLockKey);
...@@ -174,7 +180,7 @@ public class AppPermissionService { ...@@ -174,7 +180,7 @@ public class AppPermissionService {
return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误"); return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
} }
// 是否已存在 // 是否已存在
AppUserLogin user = appUserLoginBiz.checkeUserLogin(username); AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
if (null != user) { if (null != user) {
return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已存在"); return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已存在");
} }
...@@ -187,9 +193,9 @@ public class AppPermissionService { ...@@ -187,9 +193,9 @@ public class AppPermissionService {
appUserLogin.setIsdel(0); appUserLogin.setIsdel(0);
appUserLogin.setStatus(0); appUserLogin.setStatus(0);
//QQ //QQ
if(type==1&&StringUtils.isNotBlank(openId)){ if (type == 1 && StringUtils.isNotBlank(openId)) {
appUserLogin.setOpenid(openId); appUserLogin.setOpenid(openId);
}else{ } else {
if (StringUtils.isNotBlank(openId)) { if (StringUtils.isNotBlank(openId)) {
appUserLogin.setWxOpenid(openId); appUserLogin.setWxOpenid(openId);
} }
...@@ -200,7 +206,7 @@ public class AppPermissionService { ...@@ -200,7 +206,7 @@ public class AppPermissionService {
appUserLogin.setCreatetime(now); appUserLogin.setCreatetime(now);
appUserLogin.setUpdatetime(now); appUserLogin.setUpdatetime(now);
appUserLoginBiz.insertSelective(appUserLogin); appUserLoginBiz.insertSelective(appUserLogin);
Integer userid=appUserLogin.getId(); Integer userid = appUserLogin.getId();
log.error("注册：新增登陆用户信息： " + userid); log.error("注册：新增登陆用户信息： " + userid);
// 新增用户详情 // 新增用户详情
AppUserDetail rsUserDetail = new AppUserDetail(); AppUserDetail rsUserDetail = new AppUserDetail();
...@@ -214,9 +220,20 @@ public class AppPermissionService { ...@@ -214,9 +220,20 @@ public class AppPermissionService {
log.error("注册：新增用户详情： " + userid); log.error("注册：新增用户详情： " + userid);
// 登录结果要做做统一处理 // 登录结果要做做统一处理
JSONObject data = autoLogin(userid, username, headimgurl, nickname); JSONObject data = autoLogin(userid, username, headimgurl, nickname);
/* // 到im注册，获取返回结果 // 到im注册，获取返回结果
Map<String,Object> map=registerIm(username,appUserLogin.getPassword(),nickname);
if(map!=null){
Integer imUserId=Integer.parseInt(map.get("userId").toString());
String access_token=map.get("access_token").toString();
String imPassword=map.get("password").toString();
if(imUserId!=null&&imUserId>0&&StringUtils.isNotBlank(imPassword)){
AppUserLogin userLogin = new AppUserLogin();
userLogin.setId(userid);
userLogin.setImPassword(imPassword);
userLogin.setImUserid(imUserId);
}
}
*/
if (data != null) { if (data != null) {
return JsonResultUtil.createSuccessResultWithObj(data); return JsonResultUtil.createSuccessResultWithObj(data);
} else { } else {
...@@ -233,26 +250,26 @@ public class AppPermissionService { ...@@ -233,26 +250,26 @@ public class AppPermissionService {
*/ */
public JSONObject autoLogin(Integer userid, String username, String headimgurl, String nickname) { public JSONObject autoLogin(Integer userid, String username, String headimgurl, String nickname) {
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
AppUserLogin userLoign = appUserLoginBiz.selectById(userid); AppUserLogin userLoign = appUserLoginBiz.selectById(userid);
if (userLoign!=null) { if (userLoign != null) {
data.put("nickname", nickname); data.put("nickname", nickname);
data.put("headerurl",headimgurl); data.put("headerurl", headimgurl);
AppUserDetail appUserDetail=appUserDetailBiz.getUserByUserid(userid); AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userid);
if(appUserDetail!=null){ if (appUserDetail != null) {
if(StringUtils.isNotBlank(appUserDetail.getNickname())){ if (StringUtils.isNotBlank(appUserDetail.getNickname())) {
data.put("nickname", appUserDetail.getNickname()); data.put("nickname", appUserDetail.getNickname());
} }
if(StringUtils.isNotBlank(appUserDetail.getHeadimgurl())){ if (StringUtils.isNotBlank(appUserDetail.getHeadimgurl())) {
data.put("headerurl", appUserDetail.getHeadimgurl()); data.put("headerurl", appUserDetail.getHeadimgurl());
} }
} }
// 缓存操作 // 缓存操作
String token=""; String token = "";
String imtoken_=""; String imtoken_ = "";
//userRedisTemplate.opsForValue().set("token_" + userid,token, SystemConfig.REDISTOKENTIME, TimeUnit.SECONDS); //userRedisTemplate.opsForValue().set("token_" + userid,token, SystemConfig.REDISTOKENTIME, TimeUnit.SECONDS);
//userRedisTemplate.opsForValue().set("imtoken_" + userid,imtoken_,SystemConfig.REDISTOKENTIME, TimeUnit.SECONDS); //userRedisTemplate.opsForValue().set("imtoken_" + userid,imtoken_,SystemConfig.REDISTOKENTIME, TimeUnit.SECONDS);
// 返回结果 // 返回结果
// data.put("token", token); // data.put("token", token);
data.put("username", username); data.put("username", username);
data.put("userid", userid); data.put("userid", userid);
...@@ -262,6 +279,7 @@ public class AppPermissionService { ...@@ -262,6 +279,7 @@ public class AppPermissionService {
/** /**
* 微信绑定/注册 * 微信绑定/注册
*
* @param username * @param username
* @param password * @param password
* @param openId * @param openId
...@@ -274,7 +292,7 @@ public class AppPermissionService { ...@@ -274,7 +292,7 @@ public class AppPermissionService {
*/ */
@Transactional @Transactional
public JSONObject weCahtRegister(String username, String password, String openId, public JSONObject weCahtRegister(String username, String password, String openId,
String unionid, String nickname,String headimgurl, int type, String mobilecode,Integer isQQ) { String unionid, String nickname, String headimgurl, int type, String mobilecode, Integer isQQ) {
// 校验参数和验证码 // 校验参数和验证码
if (StringUtils.isBlank(username) || StringUtils.isBlank(mobilecode)) { if (StringUtils.isBlank(username) || StringUtils.isBlank(mobilecode)) {
return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空"); return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
...@@ -287,7 +305,7 @@ public class AppPermissionService { ...@@ -287,7 +305,7 @@ public class AppPermissionService {
try { try {
// 获取缓存用户信息 // 获取缓存用户信息
log.error("weCahtRegister:" + openId); log.error("weCahtRegister:" + openId);
if(StringUtils.isNotBlank(openId)) { if (StringUtils.isNotBlank(openId)) {
if (StringUtils.isNotBlank(nickname)) { if (StringUtils.isNotBlank(nickname)) {
// 转换特殊字符 // 转换特殊字符
nickname = EmojiFilter.filterEmoji(nickname); nickname = EmojiFilter.filterEmoji(nickname);
...@@ -299,24 +317,24 @@ public class AppPermissionService { ...@@ -299,24 +317,24 @@ public class AppPermissionService {
} }
if (type == 1) { // 绑定 if (type == 1) { // 绑定
Long now = System.currentTimeMillis() / 1000; Long now = System.currentTimeMillis() / 1000;
AppUserLogin userLogin = appUserLoginBiz.checkeUserLogin(username); AppUserLogin userLogin = appUserLoginBiz.checkeUserLogin(username);
if ((isQQ==1&&StringUtils.isNotBlank(userLogin.getOpenid()))||(isQQ==0&&StringUtils.isNotBlank(userLogin.getWxOpenid()))) { if ((isQQ == 1 && StringUtils.isNotBlank(userLogin.getOpenid())) || (isQQ == 0 && StringUtils.isNotBlank(userLogin.getWxOpenid()))) {
// 已绑定微信 // 已绑定微信
return JsonResultUtil.createFailedResultMsg(ResultCode.WX_BIND_CODE); return JsonResultUtil.createFailedResultMsg(ResultCode.WX_BIND_CODE);
} }
Integer userid = userLogin.getId(); Integer userid = userLogin.getId();
if(isQQ==1){ if (isQQ == 1) {
userLogin.setOpenid(openId); userLogin.setOpenid(openId);
}else{ } else {
userLogin.setWxOpenid(openId); userLogin.setWxOpenid(openId);
// 添加unionid // 添加unionid
userLogin.setUnionid(unionid); userLogin.setUnionid(unionid);
} }
userLogin.setUpdatetime(now); userLogin.setUpdatetime(now);
appUserLoginBiz.updateSelectiveById(userLogin); appUserLoginBiz.updateSelectiveById(userLogin);
AppUserDetail userDetail=appUserDetailBiz.getUserByUserid(userid); AppUserDetail userDetail = appUserDetailBiz.getUserByUserid(userid);
if(userDetail==null){ if (userDetail == null) {
userDetail=new AppUserDetail(); userDetail = new AppUserDetail();
userDetail.setUserid(userid); userDetail.setUserid(userid);
userDetail.setHeadimgurl(headimgurl); userDetail.setHeadimgurl(headimgurl);
userDetail.setNickname(nickname); userDetail.setNickname(nickname);
...@@ -324,7 +342,7 @@ public class AppPermissionService { ...@@ -324,7 +342,7 @@ public class AppPermissionService {
userDetail.setUpdatetime(now); userDetail.setUpdatetime(now);
userDetail.setIsdel(0); userDetail.setIsdel(0);
appUserDetailBiz.insertSelective(userDetail); appUserDetailBiz.insertSelective(userDetail);
}else { } else {
userDetail.setHeadimgurl(headimgurl); userDetail.setHeadimgurl(headimgurl);
userDetail.setNickname(nickname); userDetail.setNickname(nickname);
appUserDetailBiz.updateSelectiveById(userDetail); appUserDetailBiz.updateSelectiveById(userDetail);
...@@ -336,7 +354,7 @@ public class AppPermissionService { ...@@ -336,7 +354,7 @@ public class AppPermissionService {
} }
} else if (type == 2) { // 新增 } else if (type == 2) { // 新增
JSONObject register = register(username, password, headimgurl, nickname, mobilecode, JSONObject register = register(username, password, headimgurl, nickname, mobilecode,
openId, unionid,isQQ); openId, unionid, isQQ);
if (register.getInteger("status") != ResultCode.SUCCESS_CODE) { if (register.getInteger("status") != ResultCode.SUCCESS_CODE) {
if (register.getInteger("status") == ResultCode.EXIST_CODE) { if (register.getInteger("status") == ResultCode.EXIST_CODE) {
return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已存在"); return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已存在");
...@@ -385,54 +403,55 @@ public class AppPermissionService { ...@@ -385,54 +403,55 @@ public class AppPermissionService {
/** /**
* 微信登录 * 微信登录
*
* @param openId * @param openId
* @return * @return
*/ */
@Transactional @Transactional
public JSONObject weCahtLogin(String openId,Integer isQQ) { public JSONObject weCahtLogin(String openId, Integer isQQ) {
if (StringUtils.isBlank(openId)) { if (StringUtils.isBlank(openId)) {
return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空"); return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
} }
AppUserLogin userLogin = appUserLoginBiz.getUserByOpenid(openId,isQQ); AppUserLogin userLogin = appUserLoginBiz.getUserByOpenid(openId, isQQ);
if(userLogin==null){ if (userLogin == null) {
return JsonResultUtil.createFailedResult(ResultCode.WXNOTEXIST_CODE, "该微信号尚未绑定手机号"); return JsonResultUtil.createFailedResult(ResultCode.WXNOTEXIST_CODE, "该微信号尚未绑定手机号");
} }
if(userLogin.getStatus()==1){ if (userLogin.getStatus() == 1) {
return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已被禁用"); return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已被禁用");
} }
Integer userid=userLogin.getId(); Integer userid = userLogin.getId();
AppUserDetail userDetail=appUserDetailBiz.getUserByUserid(userid); AppUserDetail userDetail = appUserDetailBiz.getUserByUserid(userid);
String headimgurl=""; String headimgurl = "";
String nickname=""; String nickname = "";
if(userDetail!=null){ if (userDetail != null) {
headimgurl=userDetail.getHeadimgurl(); headimgurl = userDetail.getHeadimgurl();
nickname=userDetail.getNickname(); nickname = userDetail.getNickname();
} }
JSONObject data = autoLogin(userid,userLogin.getUsername(),headimgurl,nickname); JSONObject data = autoLogin(userid, userLogin.getUsername(), headimgurl, nickname);
if (data != null) { if (data != null) {
return JsonResultUtil.createSuccessResultWithObj(data); return JsonResultUtil.createSuccessResultWithObj(data);
} }
return JsonResultUtil.createDefaultFail(); return JsonResultUtil.createDefaultFail();
} }
public JSONObject login(String username, String password,String mobilecode,int type) { public JSONObject login(String username, String password, String mobilecode, int type) {
if (StringUtils.isBlank(username) || ((StringUtils.isBlank(password)&&type==1)|| (StringUtils.isBlank(mobilecode)&&type==2))) { if (StringUtils.isBlank(username) || ((StringUtils.isBlank(password) && type == 1) || (StringUtils.isBlank(mobilecode) && type == 2))) {
return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "请求参数为空"); return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "请求参数为空");
} }
try { try {
AppUserLogin user = appUserLoginBiz.checkeUserLogin(username); AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
if(type==1){ if (type == 1) {
if (user==null||!encoder.matches(password,user.getPassword())) if (user == null || !encoder.matches(password, user.getPassword()))
return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户名或密码错误"); return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户名或密码错误");
}else { } else {
String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX+username+mobilecode; String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX + username + mobilecode;
String mobilecodeRedis=userRedisTemplate.opsForValue().get(redisLockKey)==null?"":userRedisTemplate.opsForValue().get(redisLockKey).toString(); String mobilecodeRedis = userRedisTemplate.opsForValue().get(redisLockKey) == null ? "" : userRedisTemplate.opsForValue().get(redisLockKey).toString();
log.error("验证码登录接口，获取redis中的验证码：" + mobilecodeRedis); log.error("验证码登录接口，获取redis中的验证码：" + mobilecodeRedis);
// 获取到缓存的验证码后要先清空缓存对应键的值 // 获取到缓存的验证码后要先清空缓存对应键的值
userRedisTemplate.delete(redisLockKey); userRedisTemplate.delete(redisLockKey);
if (StringUtils.isBlank(mobilecodeRedis)) if (StringUtils.isBlank(mobilecodeRedis))
return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误"); return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
if (user==null) if (user == null)
return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "用户不存在"); return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "用户不存在");
} }
...@@ -441,79 +460,141 @@ public class AppPermissionService { ...@@ -441,79 +460,141 @@ public class AppPermissionService {
return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已被禁用"); return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已被禁用");
} }
Integer userid = user.getId(); Integer userid = user.getId();
String nickname=SystemConfig.USER_NIKENAME_DEFAULT+(int)((Math.random()*9+1)*100000); String nickname = SystemConfig.USER_NIKENAME_DEFAULT + (int) ((Math.random() * 9 + 1) * 100000);
JSONObject data = autoLogin(userid,user.getUsername(),SystemConfig.USER_HEADER_URL_DEFAULT,nickname); JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname);
if (data != null) { if (data != null) {
return JsonResultUtil.createSuccessResultWithObj(data); return JsonResultUtil.createSuccessResultWithObj(data);
} }
return JsonResultUtil.createDefaultFail(); return JsonResultUtil.createDefaultFail();
}catch (Exception e) { } catch (Exception e) {
log.error("userlogin->error:{}", e.getMessage(), e); log.error("userlogin->error:{}", e.getMessage(), e);
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常"); return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
} }
} }
@Transactional @Transactional
public JSONObject reset(String username, String mobilecode, String password) { public JSONObject reset(String username, String mobilecode, String password) {
if (StringUtils.isBlank(username) || StringUtils.isBlank(mobilecode)|| StringUtils.isBlank(password)) { if (StringUtils.isBlank(username) || StringUtils.isBlank(mobilecode) || StringUtils.isBlank(password)) {
return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "请求参数为空"); return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "请求参数为空");
} }
try { try {
String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX+username+mobilecode; String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX + username + mobilecode;
String mobilecodeRedis=userRedisTemplate.opsForValue().get(redisLockKey)==null?"":userRedisTemplate.opsForValue().get(redisLockKey).toString(); String mobilecodeRedis = userRedisTemplate.opsForValue().get(redisLockKey) == null ? "" : userRedisTemplate.opsForValue().get(redisLockKey).toString();
log.error("验证码登录接口，获取redis中的验证码：" + mobilecodeRedis); log.error("验证码登录接口，获取redis中的验证码：" + mobilecodeRedis);
// 获取到缓存的验证码后要先清空缓存对应键的值 // 获取到缓存的验证码后要先清空缓存对应键的值
userRedisTemplate.delete(redisLockKey); userRedisTemplate.delete(redisLockKey);
if (StringUtils.isBlank(mobilecodeRedis)){ if (StringUtils.isBlank(mobilecodeRedis)) {
return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误"); return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
} }
AppUserLogin user = appUserLoginBiz.checkeUserLogin(username); AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
if(user==null){ if (user == null) {
return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "用户不存在"); return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "用户不存在");
}
user.setPassword(password);
appUserLoginBiz.updatePasswordById(user);
Integer userid = user.getId();
String nickname = SystemConfig.USER_NIKENAME_DEFAULT + (int) ((Math.random() * 9 + 1) * 100000);
JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname);
if (data != null) {
return JsonResultUtil.createSuccessResultWithObj(data);
}
return JsonResultUtil.createDefaultFail();
} catch (Exception e) {
log.error("userlogin->error:{}", e.getMessage(), e);
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
} }
user.setPassword(password);
appUserLoginBiz.updatePasswordById(user);
Integer userid=user.getId();
String nickname=SystemConfig.USER_NIKENAME_DEFAULT+(int)((Math.random()*9+1)*100000);
JSONObject data = autoLogin(userid,user.getUsername(),SystemConfig.USER_HEADER_URL_DEFAULT,nickname);
if (data != null) {
return JsonResultUtil.createSuccessResultWithObj(data);
}
return JsonResultUtil.createDefaultFail();
}catch (Exception e) {
log.error("userlogin->error:{}", e.getMessage(), e);
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
} }
//实名认证 //实名认证
@Transactional @Transactional
public ObjectRestResponse upAuthentication(Integer userid, String idNumber, Integer status) { public ObjectRestResponse upAuthentication(Integer userid, String idNumber, Integer status) {
if(userid==null||userid==0||(status==1&&StringUtils.isBlank(idNumber))){ if (userid == null || userid == 0 || (status == 1 && StringUtils.isBlank(idNumber))) {
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空"); return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
} }
try { try {
AppUserLogin user=appUserLoginBiz.getUserById(userid); AppUserLogin user = appUserLoginBiz.getUserById(userid);
if(user==null){ if (user == null) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "用户不存在"); return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "用户不存在");
} }
if(user.getCertificationStatus()==1){ if (user.getCertificationStatus() == 1) {
return ObjectRestResponse.createFailedResultWithObj(ResultCode.EXIST_CODE, "用户已认证",user.getIdNumber()); return ObjectRestResponse.createFailedResultWithObj(ResultCode.EXIST_CODE, "用户已认证", user.getIdNumber());
} }
if(status==1){ if (status == 1) {
String username=user.getUsername(); String username = user.getUsername();
user=new AppUserLogin(); user = new AppUserLogin();
user.setId(userid); user.setId(userid);
user.setUsername(username); user.setUsername(username);
user.setIdNumber(idNumber); user.setIdNumber(idNumber);
user.setCertificationStatus(1); user.setCertificationStatus(1);
appUserLoginBiz.updateSelectiveById(user); appUserLoginBiz.updateSelectiveById(user);
} }
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
}catch (Exception e) { } catch (Exception e) {
log.error("upAuthentication->error:{}", e.getMessage(), e); log.error("upAuthentication->error:{}", e.getMessage(), e);
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常"); return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
} }
} }
//注册im
public Map<String, Object> registerIm(String username, String password, String nickname) {
log.error("------注册registerIm----username====="+username+"-----password==="+password+"---nickname==="+nickname);
Map<String, Object> map = new HashMap<>();
map.put("telephone", username);
map.put("password", password);
map.put("nickname", nickname);
BaseResponse response = imFeign.register(map);
log.error("registerIm->response:{}", response);
if (response.getStatus() == ResultCode.SUCCESS_CODE) {
String result = response.getMessage();
log.error("------im注册----result======"+result);
if (StringUtils.isNotBlank(result)) {
JSONObject object = JSONObject.parseObject(result);
password = object.getString("password");
if (StringUtils.isNotBlank(result)) {
map.put("password", password);
}
JSONObject data = object.getJSONObject("data");
log.error("------im注册----data======"+data);
if (data != null) {
map.put("userId", data.getString("userId"));
map.put("access_token", data.getString("access_token"));
} else {
map.put("userId", "");
map.put("access_token", "");
}
}
}
return map;
}
//登录im
public String loginIm(String username, String password, String userId) {
log.error("------登录loginIm----username====="+username+"-----password==="+password+"---userId==="+userId);
Map<String, Object> map = new HashMap<>();
map.put("telephone", username);
map.put("password", password);
map.put("userId", userId);
BaseResponse response = imFeign.login(map);
log.error("registerIm->response:{}", response);
String access_token = "";
if (response.getStatus() == ResultCode.SUCCESS_CODE) {
String result = response.getMessage();
log.error("------im登录----result======"+result);
if (StringUtils.isNotBlank(result)) {
JSONObject object = JSONObject.parseObject(result);
JSONObject data = object.getJSONObject("data");
log.error("------im登录----data======"+data);
if (data != null) {
access_token = data.getString("access_token");
}
}
}
log.error("------im登录----access_token======"+access_token);
return access_token;
}
} }
ace-modules/ace-admin/src/main/resources/bootstrap.yml
View file @ 015f6679
...@@ -16,6 +16,8 @@ spring: ...@@ -16,6 +16,8 @@ spring:
nacos: nacos:
config: config:
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
#共用配置，暂定一个
shared-dataids: common-dev.yaml
--- ---
spring: spring:
......
pom.xml
View file @ 015f6679
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
<module>ace-sidecar</module> <module>ace-sidecar</module>
<module>ace-control</module> <module>ace-control</module>
<module>ace-modules</module> <module>ace-modules</module>
<module>xx-member</module>
<module>xx-member-api</module>
<module>xx-third-party</module>
<module>xx-third-party-api</module>
<module>vehicle</module> <module>vehicle</module>
<module>xx-app</module> <module>xx-app</module>
<module>xx-common</module> <module>xx-common</module>
......
xx-im/xx-im-api/pom.xml
View file @ 015f6679
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xxfc.platform</groupId>
<artifactId>xx-im-api</artifactId> <artifactId>xx-im-api</artifactId>
......
xx-member-api/pom.xml deleted 100644 → 0
View file @ 2c0e0fab
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xx-member-api</artifactId>
<dependencies>
<!-- ace -->
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<!-- 持久层 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.3</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
xx-member-api/src/main/java/com/xxfc/member/vo/MemberFamilyInfoVo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.vo;
import lombok.Data;
@Data
public class MemberFamilyInfoVo {
private Integer id;
/**
* 会员id
*/
private Integer memberId;
/**
* 姓名
*/
private String name;
/**
* 关系
*/
private String relationship;
}
xx-member-api/src/main/java/com/xxfc/member/vo/MemberInfoVo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class MemberInfoVo {
private Integer id;
/**
* 姓名
*/
private String name;
/**
* 性别(0:男,1:女)
*/
private Boolean sex;
/**
* 卡号
*/
private String cardNumber;
/**
* 生日
*/
@JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
private Date birthday;
/**
* 身份证号
*/
private String idNumber;
/**
* 证件地址
*/
private String certificateAddress;
/**
* 电子邮件
*/
private String email;
/**
* 微信
*/
private String wx;
/**
* 会员类型(0:会员,1:VIP会员,2:砖石会员)
*/
private Byte memberType;
/**
* 联系电话
*/
private String telephone;
/**
* 手机
*/
private String mobilePhone;
/**
* 常住地址
*/
private String address;
/**
* 工作单位
*/
private String workplace;
/**
* 职务
*/
private String job;
/**
* 邀约人
*/
private String inviter;
/**
* 职业
*/
private String profession;
/**
* 支付方式(0:现金,1:刷卡,2:微信支付,3:支付宝支付,4:银行转账)
*/
private Byte payType;
/**
* 会员签名日期
*/
@JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
private Date memberSignatureDate;
/**
* 经理
*/
private String manager;
/**
* 经理签名日期
*/
@JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
private Date managerSignatureDate;
/**
* 创建日期
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private Date createDate;
/**
* 创建人用户id
*/
private Integer createUserId;
/**
* 创建人姓名
*/
private String createUserName;
/**
* 会员状态(-1:停用,0:未审核,1:正常)
*/
private Byte state;
private List<MemberFamilyInfoVo> family;
public List<MemberFamilyInfoVo> getFamily() {
return family;
}
public void setFamily(List<MemberFamilyInfoVo> family) {
this.family = family;
}
}
xx-member/pom.xml deleted 100644 → 0
View file @ 2c0e0fab
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xx-member</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- service -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!-- ace -->
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>xx-member-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-client</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-cache</artifactId>
<version>0.0.2</version>
</dependency>
<!-- 持久层 -->
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper-spring-boot-starter</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot2-starter</artifactId>
<version>1.1.10</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- utils -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.33</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.2</version>
<configuration>
<configurationFile>
${basedir}/src/main/resources/builder/generatorConfig.xml
</configurationFile>
<overwrite>true</overwrite>
<verbose>true</verbose>
</configuration>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.30</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper</artifactId>
<version>${mapper.version}</version>
</dependency>
</dependencies>
</plugin>
<!-- mybatis generator自动生成代码 -->
<!-- <plugin>-->
<!-- <groupId>org.mybatis.generator</groupId>-->
<!-- <artifactId>mybatis-generator-maven-plugin</artifactId>-->
<!-- <version>1.3.7</version>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId> mysql</groupId>-->
<!-- <artifactId> mysql-connector-java</artifactId>-->
<!-- <version>8.0.15</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.mybatis.generator</groupId>-->
<!-- <artifactId>mybatis-generator-core</artifactId>-->
<!-- <version>1.3.7</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>tk.mybatis</groupId>-->
<!-- <artifactId>mapper</artifactId>-->
<!-- <version>4.0.4</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>Generate MyBatis Artifacts</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>generate</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- <configuration>-->
<!-- &lt;!&ndash;允许移动生成的文件 &ndash;&gt;-->
<!-- <verbose>true</verbose>-->
<!-- &lt;!&ndash; 是否覆盖 &ndash;&gt;-->
<!-- <overwrite>true</overwrite>-->
<!-- &lt;!&ndash; 自动生成的配置 &ndash;&gt;-->
<!-- <configurationFile>-->
<!-- src/main/resources/builder/mybatis-generator.xml</configurationFile>-->
<!-- </configuration>-->
<!-- </plugin>-->
</plugins>
</build>
</project>
\ No newline at end of file
xx-member/src/main/java/com/xxfc/member/MemberApplication.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member;
import com.ace.cache.EnableAceCache;
import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication
@EnableDiscoveryClient
@EnableAceAuthClient
@EnableAceCache
@EnableTransactionManagement
@MapperScan("com.xxfc.member.mapper")
@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign"})
public class MemberApplication {
public static void main(String[] args) {
SpringApplication.run(MemberApplication.class, args);
}
}
xx-member/src/main/java/com/xxfc/member/config/WebConfiguration.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.config;
import com.github.wxiaoqi.security.auth.client.interceptor.ServiceAuthRestInterceptor;
import com.github.wxiaoqi.security.auth.client.interceptor.UserAuthRestInterceptor;
import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.util.ArrayList;
import java.util.Collections;
@Configuration("memberWebConfig")
@Primary
public class WebConfiguration implements WebMvcConfigurer {
@Bean
GlobalExceptionHandler getGlobalExceptionHandler() {
return new GlobalExceptionHandler();
}
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(getServiceAuthRestInterceptor()).
addPathPatterns(getIncludePathPatterns()).addPathPatterns("/member/info/**");
registry.addInterceptor(getUserAuthRestInterceptor()).
addPathPatterns(getIncludePathPatterns());
}
@Bean
ServiceAuthRestInterceptor getServiceAuthRestInterceptor() {
return new ServiceAuthRestInterceptor();
}
@Bean
UserAuthRestInterceptor getUserAuthRestInterceptor() {
return new UserAuthRestInterceptor();
}
/**
* 需要用户和服务认证判断的路径
* @return
*/
private ArrayList<String> getIncludePathPatterns() {
ArrayList<String> list = new ArrayList<>();
String[] urls = {
"/member/info/**"
};
Collections.addAll(list, urls);
return list;
}
}
xx-member/src/main/java/com/xxfc/member/controller/MemberInfoController.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.controller;
import com.github.wxiaoqi.security.common.msg.BaseResponse;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.msg.TableResultResponse;
import com.xxfc.member.service.MemberInfoService;
import com.xxfc.member.vo.MemberInfoVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("member/info")
public class MemberInfoController {
@Autowired
MemberInfoService memberInfoService;
@PostMapping("")
public BaseResponse insert(@RequestBody MemberInfoVo memberInfoVo) {
memberInfoService.insert(memberInfoVo);
return new BaseResponse();
}
@DeleteMapping("/{id}")
public BaseResponse delete(@PathVariable("id") Integer id) {
memberInfoService.deleteById(id);
return new BaseResponse();
}
@GetMapping("/{id}")
public ObjectRestResponse<MemberInfoVo> get(@PathVariable("id") Integer id) {
return new ObjectRestResponse<MemberInfoVo>().data(memberInfoService.selectById(id));
}
@GetMapping("/all")
public TableResultResponse<MemberInfoVo> getAll(String name, Integer page, Integer limit) {
return new TableResultResponse<MemberInfoVo>().data(memberInfoService.selectAll(name, page, limit));
}
@PutMapping("")
public BaseResponse update(@RequestBody MemberInfoVo memberInfoVo) {
memberInfoService.updateSelectiveById(memberInfoVo);
return new BaseResponse();
}
}
xx-member/src/main/java/com/xxfc/member/entity/MemberFamilyInfo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.entity;
import javax.persistence.*;
@Table(name = "member_family_info")
public class MemberFamilyInfo {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY, generator = "JDBC")
private Integer id;
@Column(name = "member_id")
private Integer memberId;
/**
* 姓名
*/
private String name;
/**
* 关系
*/
private String relationship;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return member_id
*/
public Integer getMemberId() {
return memberId;
}
/**
* @param memberId
*/
public void setMemberId(Integer memberId) {
this.memberId = memberId;
}
/**
* 获取姓名
*
* @return name - 姓名
*/
public String getName() {
return name;
}
/**
* 设置姓名
*
* @param name 姓名
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* 获取关系
*
* @return relationship - 关系
*/
public String getRelationship() {
return relationship;
}
/**
* 设置关系
*
* @param relationship 关系
*/
public void setRelationship(String relationship) {
this.relationship = relationship == null ? null : relationship.trim();
}
}
\ No newline at end of file
xx-member/src/main/java/com/xxfc/member/entity/MemberInfo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.entity;
import javax.persistence.*;
import java.util.Date;
@Table(name = "member_info")
public class MemberInfo {
public static final Boolean SEX_MAN = false;
public static final Boolean SEX_WOMAN = true;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY, generator = "JDBC")
private Integer id;
/**
* 姓名
*/
private String name;
/**
* 性别(0:男,1:女)
*/
private Boolean sex;
/**
* 卡号
*/
@Column(name = "card_number")
private String cardNumber;
/**
* 生日
*/
private Date birthday;
/**
* 身份证号
*/
@Column(name = "id_number")
private String idNumber;
/**
* 证件地址
*/
@Column(name = "certificate_address")
private String certificateAddress;
/**
* 电子邮件
*/
private String email;
/**
* 微信
*/
private String wx;
/**
* 会员类型(0:会员,1:VIP会员,2:砖石会员)
*/
@Column(name = "member_type")
private Byte memberType;
/**
* 联系电话
*/
private String telephone;
/**
* 手机
*/
@Column(name = "mobile_phone")
private String mobilePhone;
/**
* 常住地址
*/
private String address;
/**
* 工作单位
*/
private String workplace;
/**
* 职务
*/
private String job;
/**
* 邀约人
*/
private String inviter;
/**
* 职业
*/
private String profession;
/**
* 支付方式(0:现金,1:刷卡,2:微信支付,3:支付宝支付,4:银行转账)
*/
@Column(name = "pay_type")
private Byte payType;
/**
* 会员签名日期
*/
@Column(name = "member_signature_date")
private Date memberSignatureDate;
/**
* 经理
*/
private String manager;
/**
* 经理签名日期
*/
@Column(name = "manager_signature_date")
private Date managerSignatureDate;
/**
* 创建日期
*/
@Column(name = "create_date")
private Date createDate;
/**
* 创建人用户id
*/
@Column(name = "create_user_id")
private Integer createUserId;
/**
* 创建人姓名
*/
@Column(name = "create_user_name")
private String createUserName;
/**
* 会员状态(-1:停用,0:未审核,1:正常)
*/
private Byte state;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* 获取姓名
*
* @return name - 姓名
*/
public String getName() {
return name;
}
/**
* 设置姓名
*
* @param name 姓名
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* 获取性别(0:男,1:女)
*
* @return sex - 性别(0:男,1:女)
*/
public Boolean getSex() {
return sex;
}
/**
* 设置性别(0:男,1:女)
*
* @param sex 性别(0:男,1:女)
*/
public void setSex(Boolean sex) {
this.sex = sex;
}
/**
* 获取卡号
*
* @return card_number - 卡号
*/
public String getCardNumber() {
return cardNumber;
}
/**
* 设置卡号
*
* @param cardNumber 卡号
*/
public void setCardNumber(String cardNumber) {
this.cardNumber = cardNumber == null ? null : cardNumber.trim();
}
/**
* 获取生日
*
* @return birthday - 生日
*/
public Date getBirthday() {
return birthday;
}
/**
* 设置生日
*
* @param birthday 生日
*/
public void setBirthday(Date birthday) {
this.birthday = birthday;
}
/**
* 获取身份证号
*
* @return id_number - 身份证号
*/
public String getIdNumber() {
return idNumber;
}
/**
* 设置身份证号
*
* @param idNumber 身份证号
*/
public void setIdNumber(String idNumber) {
this.idNumber = idNumber == null ? null : idNumber.trim();
}
/**
* 获取证件地址
*
* @return certificate_address - 证件地址
*/
public String getCertificateAddress() {
return certificateAddress;
}
/**
* 设置证件地址
*
* @param certificateAddress 证件地址
*/
public void setCertificateAddress(String certificateAddress) {
this.certificateAddress = certificateAddress == null ? null : certificateAddress.trim();
}
/**
* 获取电子邮件
*
* @return email - 电子邮件
*/
public String getEmail() {
return email;
}
/**
* 设置电子邮件
*
* @param email 电子邮件
*/
public void setEmail(String email) {
this.email = email == null ? null : email.trim();
}
/**
* 获取微信
*
* @return wx - 微信
*/
public String getWx() {
return wx;
}
/**
* 设置微信
*
* @param wx 微信
*/
public void setWx(String wx) {
this.wx = wx == null ? null : wx.trim();
}
/**
* 获取会员类型(0:会员,1:VIP会员,2:砖石会员)
*
* @return member_type - 会员类型(0:会员,1:VIP会员,2:砖石会员)
*/
public Byte getMemberType() {
return memberType;
}
/**
* 设置会员类型(0:会员,1:VIP会员,2:砖石会员)
*
* @param memberType 会员类型(0:会员,1:VIP会员,2:砖石会员)
*/
public void setMemberType(Byte memberType) {
this.memberType = memberType;
}
/**
* 获取联系电话
*
* @return telephone - 联系电话
*/
public String getTelephone() {
return telephone;
}
/**
* 设置联系电话
*
* @param telephone 联系电话
*/
public void setTelephone(String telephone) {
this.telephone = telephone == null ? null : telephone.trim();
}
/**
* 获取手机
*
* @return mobile_phone - 手机
*/
public String getMobilePhone() {
return mobilePhone;
}
/**
* 设置手机
*
* @param mobilePhone 手机
*/
public void setMobilePhone(String mobilePhone) {
this.mobilePhone = mobilePhone == null ? null : mobilePhone.trim();
}
/**
* 获取常住地址
*
* @return address - 常住地址
*/
public String getAddress() {
return address;
}
/**
* 设置常住地址
*
* @param address 常住地址
*/
public void setAddress(String address) {
this.address = address == null ? null : address.trim();
}
/**
* 获取工作单位
*
* @return workplace - 工作单位
*/
public String getWorkplace() {
return workplace;
}
/**
* 设置工作单位
*
* @param workplace 工作单位
*/
public void setWorkplace(String workplace) {
this.workplace = workplace == null ? null : workplace.trim();
}
/**
* 获取职务
*
* @return job - 职务
*/
public String getJob() {
return job;
}
/**
* 设置职务
*
* @param job 职务
*/
public void setJob(String job) {
this.job = job == null ? null : job.trim();
}
/**
* 获取邀约人
*
* @return inviter - 邀约人
*/
public String getInviter() {
return inviter;
}
/**
* 设置邀约人
*
* @param inviter 邀约人
*/
public void setInviter(String inviter) {
this.inviter = inviter == null ? null : inviter.trim();
}
/**
* 获取职业
*
* @return profession - 职业
*/
public String getProfession() {
return profession;
}
/**
* 设置职业
*
* @param profession 职业
*/
public void setProfession(String profession) {
this.profession = profession == null ? null : profession.trim();
}
/**
* 获取支付方式(0:现金,1:刷卡,2:微信支付,3:支付宝支付,4:银行转账)
*
* @return pay_type - 支付方式(0:现金,1:刷卡,2:微信支付,3:支付宝支付,4:银行转账)
*/
public Byte getPayType() {
return payType;
}
/**
* 设置支付方式(0:现金,1:刷卡,2:微信支付,3:支付宝支付,4:银行转账)
*
* @param payType 支付方式(0:现金,1:刷卡,2:微信支付,3:支付宝支付,4:银行转账)
*/
public void setPayType(Byte payType) {
this.payType = payType;
}
/**
* 获取会员签名日期
*
* @return member_signature_date - 会员签名日期
*/
public Date getMemberSignatureDate() {
return memberSignatureDate;
}
/**
* 设置会员签名日期
*
* @param memberSignatureDate 会员签名日期
*/
public void setMemberSignatureDate(Date memberSignatureDate) {
this.memberSignatureDate = memberSignatureDate;
}
/**
* 获取经理
*
* @return manager - 经理
*/
public String getManager() {
return manager;
}
/**
* 设置经理
*
* @param manager 经理
*/
public void setManager(String manager) {
this.manager = manager == null ? null : manager.trim();
}
/**
* 获取经理签名日期
*
* @return manager_signature_date - 经理签名日期
*/
public Date getManagerSignatureDate() {
return managerSignatureDate;
}
/**
* 设置经理签名日期
*
* @param managerSignatureDate 经理签名日期
*/
public void setManagerSignatureDate(Date managerSignatureDate) {
this.managerSignatureDate = managerSignatureDate;
}
/**
* 获取创建日期
*
* @return create_date - 创建日期
*/
public Date getCreateDate() {
return createDate;
}
/**
* 设置创建日期
*
* @param createDate 创建日期
*/
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
/**
* 获取创建人用户id
*
* @return create_user_id - 创建人用户id
*/
public Integer getCreateUserId() {
return createUserId;
}
/**
* 设置创建人用户id
*
* @param createUserId 创建人用户id
*/
public void setCreateUserId(Integer createUserId) {
this.createUserId = createUserId;
}
/**
* 获取创建人姓名
*
* @return create_user_name - 创建人姓名
*/
public String getCreateUserName() {
return createUserName;
}
/**
* 设置创建人姓名
*
* @param createUserName 创建人姓名
*/
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName == null ? null : createUserName.trim();
}
/**
* 获取会员状态(-1:停用,0:未审核,1:正常)
*
* @return state - 会员状态(-1:停用,0:未审核,1:正常)
*/
public Byte getState() {
return state;
}
/**
* 设置会员状态(-1:停用,0:未审核,1:正常)
*
* @param state 会员状态(-1:停用,0:未审核,1:正常)
*/
public void setState(Byte state) {
this.state = state;
}
}
\ No newline at end of file
xx-member/src/main/java/com/xxfc/member/mapper/MemberFamilyInfoMapper.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.mapper;
import com.github.wxiaoqi.security.common.mapper.MysqlMapper;
import com.xxfc.member.entity.MemberFamilyInfo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import tk.mybatis.mapper.common.Mapper;
import tk.mybatis.mapper.common.special.InsertListMapper;
import java.util.List;
public interface MemberFamilyInfoMapper
extends MysqlMapper<MemberFamilyInfo> {
@Delete("delete from member_family_info where member_id = #{id}")
int deleteByMemberId(Integer id);
@Select("select * from member_family_info where member_id = #{id}")
List<MemberFamilyInfo> selectByMemberId(Integer id);
int deleteByMemberIdNotInIds(@Param("memberId") Integer memberId, @Param("ids") List<Integer> ids);
}
\ No newline at end of file
xx-member/src/main/java/com/xxfc/member/mapper/MemberInfoMapper.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.mapper;
import com.xxfc.member.entity.MemberInfo;
import com.xxfc.member.vo.MemberInfoVo;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
public interface MemberInfoMapper extends Mapper<MemberInfo> {
List<MemberInfoVo> selectVoAll();
List<MemberInfoVo> selectVoByName(@Param("name") String name);
}
\ No newline at end of file
xx-member/src/main/java/com/xxfc/member/service/MemberInfoService.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.context.BaseContextHandler;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.xxfc.member.entity.MemberFamilyInfo;
import com.xxfc.member.entity.MemberInfo;
import com.xxfc.member.mapper.MemberFamilyInfoMapper;
import com.xxfc.member.mapper.MemberInfoMapper;
import com.xxfc.member.vo.MemberFamilyInfoVo;
import com.xxfc.member.vo.MemberInfoVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Service
@Transactional
public class MemberInfoService extends BaseBiz<MemberInfoMapper, MemberInfo> {
//@Autowired
MemberFamilyInfoMapper memberFamilyInfoMapper;
public void insert(MemberInfoVo memberInfoVo) {
MemberInfo memberInfo = new MemberInfo();
BeanUtils.copyProperties(memberInfoVo, memberInfo);
if (null == memberInfo.getCreateDate()) {
memberInfo.setCreateDate(new Date());
}
memberInfo.setState((byte) 0);
memberInfo.setCreateUserId(Integer.valueOf(BaseContextHandler.getUserID()));
memberInfo.setCreateUserName(BaseContextHandler.getName());
super.insert(memberInfo);
List<MemberFamilyInfoVo> family = memberInfoVo.getFamily();
if (null != family && family.size() > 0) {
List<MemberFamilyInfo> familyInfos = new ArrayList<>();
for (MemberFamilyInfoVo info : family) {
MemberFamilyInfo familyInfo = new MemberFamilyInfo();
BeanUtils.copyProperties(info, familyInfo);
familyInfo.setMemberId(memberInfo.getId());
familyInfos.add(familyInfo);
}
memberFamilyInfoMapper.insertList(familyInfos);
}
}
public void deleteById(Integer id) {
super.deleteById(id);
memberFamilyInfoMapper.deleteByMemberId(id);
}
public MemberInfoVo selectById(Integer id) {
MemberInfo info = super.selectById(id);
if (null == info) {
throw new BaseException("用户不存在");
}
MemberInfoVo result = new MemberInfoVo();
BeanUtils.copyProperties(info, result);
List<MemberFamilyInfo> family = memberFamilyInfoMapper.selectByMemberId(id);
List<MemberFamilyInfoVo> familyInfoVos = new ArrayList<>();
for (MemberFamilyInfo familyInfo : family) {
MemberFamilyInfoVo familyInfoVo = new MemberFamilyInfoVo();
BeanUtils.copyProperties(familyInfo, familyInfoVo);
familyInfoVos.add(familyInfoVo);
}
result.setFamily(familyInfoVos);
return result;
}
public PageInfo<MemberInfoVo> selectAll(String name, Integer pageNum, Integer pageSize) {
PageHelper.startPage(pageNum, pageSize);
if (name != null) {
name = name.trim();
if (name.length() > 0) {
return new PageInfo<>(mapper.selectVoByName(name.trim()));
}
}
return new PageInfo<>(mapper.selectVoAll());
}
public void updateSelectiveById(MemberInfoVo memberInfoVo) {
MemberInfo memberInfo = new MemberInfo();
BeanUtils.copyProperties(memberInfoVo, memberInfo);
super.updateSelectiveById(memberInfo);
List<MemberFamilyInfoVo> family = memberInfoVo.getFamily();
if (null != family && family.size() > 0) {
List<Integer> ids = new ArrayList<>();
for (MemberFamilyInfoVo memberFamilyInfoVo : family) {
MemberFamilyInfo info = new MemberFamilyInfo();
BeanUtils.copyProperties(memberFamilyInfoVo, info);
info.setMemberId(memberInfoVo.getId());
if (null == info.getId()) {
memberFamilyInfoMapper.insert(info);
} else {
memberFamilyInfoMapper.updateByPrimaryKeySelective(info);
}
ids.add(info.getId());
}
memberFamilyInfoMapper.deleteByMemberIdNotInIds(memberInfoVo.getId(), ids);
} else {
memberFamilyInfoMapper.deleteByMemberId(memberInfoVo.getId());
}
}
}
xx-member/src/main/resources/application.yml deleted 100644 → 0
View file @ 2c0e0fab
server:
port: 8001
logging:
level:
com.xxfc.member: DEBUG
spring:
application:
name: xx-member
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
default-property-inclusion: non_null
datasource:
name: test
url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/ag_admin_v1?useUnicode=true&characterEncoding=UTF8
username: root
password: 123456
# 使用druid数据源
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
filters: stat
maxActive: 20
initialSize: 1
maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
validationQuery: select 'x'
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
rabbitmq:
host: ${RABBIT_MQ_HOST:localhost}
port: ${RABBIT_MQ_PORT:5672}
username: guest
password: guest
sleuth:
enabled: true
http:
legacy:
enabled: true
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
sentinel:
transport:
dashboard: localhost:8080
sample:
zipkin:
# When enabled=false, traces log to the console. Comment to send to zipkin
enabled: false
mybatis:
# basepackage: com.github.wxiaoqi.security.admin.mapper
# xmlLocation: classpath:mapper/**/*.xml
mapper-locations: "classpath*:mapper/**/*.xml"
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
mapper:
mappers: com.github.wxiaoqi.security.common.mapper.MysqlMapper
# 必须配置
feign:
httpclient:
enabled: false
okhttp:
enabled: true
ribbon:
eureka:
enabled: true
ReadTimeout: 100000
ConnectTimeout: 100000
MaxAutoRetries: 0
MaxAutoRetriesNextServer: 1
OkToRetryOnAllOperations: false
hystrix:
threadpool:
default:
coreSize: 1000 ##并发执行的最大线程数，默认10
maxQueueSize: 1000 ##BlockingQueue的最大队列数
queueSizeRejectionThreshold: 500 ##即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
command:
default:
execution:
isolation:
thread:
timeoutInMilliseconds: 110000
# 配置swagger
swagger:
enabled: true
base-package: com.github.wxiaoqi.security.admin
title: ace-admin
version: 1.0.0.SNAPSHOT
description: 管理后端服务
contact:
name: admin
auth:
serviceId: xx-member
user:
token-header: Authorization
client:
id: xx-member
secret: 123456
token-header: x-client-token
#redis-cache 相关
redis:
pool:
maxActive: 300
maxIdle: 100
maxWait: 1000
host: ${REDIS_HOST:localhost}
port: ${REDIS_PORT:6379}
password:
timeout: 2000
# 服务或应用名
sysName: xx-member
enable: true
database: 0
management:
endpoints:
web:
exposure:
include: '*'
security:
enabled: false
xx-member/src/main/resources/bootstrap.yml deleted 100644 → 0
View file @ 2c0e0fab
spring:
application:
name: xx-member
cloud:
nacos:
config:
server-addr: 127.0.0.1:8848
# server-addr: 10.5.52.3:8848
file-extension: yaml
profiles:
active: dev
\ No newline at end of file
xx-member/src/main/resources/builder/mybatis-generator.xml deleted 100644 → 0
View file @ 2c0e0fab
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE generatorConfiguration
PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
<context id="Mysql" targetRuntime="MyBatis3">
<property name="beginningDelimiter" value="`"/>
<property name="endingDelimiter" value="`"/>
<property name="mergeable" value="false" />
<plugin type="tk.mybatis.mapper.generator.MapperPlugin">
<property name="mappers" value="tk.mybatis.mapper.common.Mapper"/>
<!-- caseSensitive默认false，当数据库表名区分大小写时，可以将该属性设置为true -->
<property name="caseSensitive" value="false"/>
</plugin>
<!--去除注释 -->
<commentGenerator>
<property name="suppressAllComments" value="true"/>
<property name="suppressDate" value="true"/>
</commentGenerator>
<jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
connectionURL="jdbc:mysql://localhost:3306/ag_admin_v1?useUnicode=true&amp;characterEncoding=UTF8&amp;nullCatalogMeansCurrent=true"
userId="root"
password="123456">
</jdbcConnection>
<!-- Model -->
<javaModelGenerator targetPackage="com.xxfc.member.entity"
targetProject="src/main/java">
<property name="enableSubPackages" value="true"/>
<property name="trimStrings" value="true"/>
</javaModelGenerator>
<!-- XML -->
<sqlMapGenerator targetPackage="com.xxfc.member.mapper"
targetProject="src/main/resources/mapper">
<property name="enableSubPackages" value="true"/>
</sqlMapGenerator>
<!-- Mapper -->
<javaClientGenerator targetPackage="com.xxfc.member.mapper"
targetProject="src/main/java"
type="XMLMAPPER">
<property name="enableSubPackages" value="true"/>
</javaClientGenerator>
<!-- <table tableName="member_info" domainObjectName="MemberInfo" enableCountByExample="false"-->
<!-- enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"-->
<!-- selectByExampleQueryId="false"/>-->
<!-- <table tableName="member_family_info" domainObjectName="MemberFamilyInfo" enableCountByExample="false"-->
<!-- enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"-->
<!-- selectByExampleQueryId="false"/>-->
</context>
</generatorConfiguration>
\ No newline at end of file
xx-member/src/main/resources/mapper/com/xxfc/member/mapper/MemberFamilyInfoMapper.xml deleted 100644 → 0
View file @ 2c0e0fab
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxfc.member.mapper.MemberFamilyInfoMapper">
<resultMap id="BaseResultMap" type="com.xxfc.member.entity.MemberFamilyInfo">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="member_id" jdbcType="INTEGER" property="memberId" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="relationship" jdbcType="VARCHAR" property="relationship" />
</resultMap>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
-->
id, member_id, name, relationship
</sql>
<delete id="deleteByMemberIdNotInIds">
delete from member_family_info
where member_id = #{memberId}
<foreach collection="ids" item="id">
and id != #{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
xx-member/src/main/resources/mapper/com/xxfc/member/mapper/MemberInfoMapper.xml deleted 100644 → 0
View file @ 2c0e0fab
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxfc.member.mapper.MemberInfoMapper">
<resultMap id="BaseResultMap" type="com.xxfc.member.entity.MemberInfo">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="sex" jdbcType="BIT" property="sex" />
<result column="card_number" jdbcType="VARCHAR" property="cardNumber" />
<result column="birthday" jdbcType="TIMESTAMP" property="birthday" />
<result column="id_number" jdbcType="VARCHAR" property="idNumber" />
<result column="certificate_address" jdbcType="VARCHAR" property="certificateAddress" />
<result column="email" jdbcType="VARCHAR" property="email" />
<result column="wx" jdbcType="VARCHAR" property="wx" />
<result column="member_type" jdbcType="TINYINT" property="memberType" />
<result column="telephone" jdbcType="VARCHAR" property="telephone" />
<result column="mobile_phone" jdbcType="VARCHAR" property="mobilePhone" />
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="workplace" jdbcType="VARCHAR" property="workplace" />
<result column="job" jdbcType="VARCHAR" property="job" />
<result column="inviter" jdbcType="VARCHAR" property="inviter" />
<result column="profession" jdbcType="VARCHAR" property="profession" />
<result column="pay_type" jdbcType="TINYINT" property="payType" />
<result column="member_signature_date" jdbcType="TIMESTAMP" property="memberSignatureDate" />
<result column="manager" jdbcType="VARCHAR" property="manager" />
<result column="manager_signature_date" jdbcType="TIMESTAMP" property="managerSignatureDate" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="create_user_id" jdbcType="INTEGER" property="createUserId" />
<result column="create_user_name" jdbcType="VARCHAR" property="createUserName" />
<result column="state" jdbcType="TINYINT" property="state" />
</resultMap>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
-->
id, name, sex, card_number, birthday, id_number, certificate_address, email, wx,
member_type, telephone, mobile_phone, address, workplace, job, inviter, profession,
pay_type, member_signature_date, manager, manager_signature_date, create_date, create_user_id,
create_user_name, state
</sql>
<resultMap id="MemberInfoVoResultMap" type="com.xxfc.member.vo.MemberInfoVo">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="sex" jdbcType="BIT" property="sex" />
<result column="card_number" jdbcType="VARCHAR" property="cardNumber" />
<result column="birthday" jdbcType="VARCHAR" property="birthday" />
<result column="id_number" jdbcType="VARCHAR" property="idNumber" />
<result column="certificate_address" jdbcType="VARCHAR" property="certificateAddress" />
<result column="email" jdbcType="VARCHAR" property="email" />
<result column="wx" jdbcType="VARCHAR" property="wx" />
<result column="member_type" jdbcType="TINYINT" property="memberType" />
<result column="telephone" jdbcType="VARCHAR" property="telephone" />
<result column="mobile_phone" jdbcType="VARCHAR" property="mobilePhone" />
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="workplace" jdbcType="VARCHAR" property="workplace" />
<result column="job" jdbcType="VARCHAR" property="job" />
<result column="inviter" jdbcType="VARCHAR" property="inviter" />
<result column="profession" jdbcType="VARCHAR" property="profession" />
<result column="pay_type" jdbcType="TINYINT" property="payType" />
<result column="member_signature_date" jdbcType="TIMESTAMP" property="memberSignatureDate" />
<result column="manager" jdbcType="VARCHAR" property="manager" />
<result column="manager_signature_date" jdbcType="TIMESTAMP" property="managerSignatureDate" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="create_user_id" jdbcType="INTEGER" property="createUserId" />
<result column="create_user_name" jdbcType="VARCHAR" property="createUserName" />
<result column="state" jdbcType="TINYINT" property="state" />
<collection column="memberId=id" javaType="ArrayList" ofType="com.xxfc.member.entity.MemberFamilyInfo" property="family" select="selectFamilyInfoByMemberId" />
</resultMap>
<select id="selectVoAll" resultMap="MemberInfoVoResultMap">
select * from member_info
</select>
<select id="selectFamilyInfoByMemberId" resultType="com.xxfc.member.entity.MemberFamilyInfo">
select * from member_family_info where member_id = #{memberId}
</select>
<select id="selectVoByName" resultMap="MemberInfoVoResultMap">
select * from member_info
where name = #{name}
</select>
</mapper>
\ No newline at end of file
xx-member/src/sql/member_info.sql deleted 100644 → 0
View file @ 2c0e0fab
DROP TABLE IF EXISTS `member_info`;
CREATE TABLE `member_info` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(10) NOT NULL COMMENT '姓名',
`sex` tinyint(1) NOT NULL COMMENT '性别(0:男,1:女)',
`card_number` varchar(50) DEFAULT NULL COMMENT '卡号',
`birthday` datetime DEFAULT NULL COMMENT '生日',
`id_number` varchar(20) DEFAULT NULL COMMENT '身份证号',
`certificate_address` varchar(100) DEFAULT NULL COMMENT '证件地址',
`email` varchar(100) DEFAULT NULL COMMENT '电子邮件',
`wx` varchar(100) DEFAULT NULL COMMENT '微信',
`member_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '会员类型(0:会员,1:VIP会员,2:砖石会员)',
`telephone` varchar(20) DEFAULT NULL COMMENT '联系电话',
`mobile_phone` varchar(20) DEFAULT NULL COMMENT '手机',
`address` varchar(255) DEFAULT NULL COMMENT '常住地址',
`workplace` varchar(255) DEFAULT NULL COMMENT '工作单位',
`job` varchar(100) DEFAULT NULL COMMENT '职务',
`inviter` varchar(100) DEFAULT NULL COMMENT '邀约人',
`profession` varchar(20) DEFAULT NULL COMMENT '职业',
`pay_type` tinyint(4) DEFAULT NULL COMMENT '支付方式(0:现金,1:刷卡,2:微信支付,3:支付宝支付,4:银行转账)',
`member_signature_date` datetime DEFAULT NULL COMMENT '会员签名日期',
`manager` varchar(20) DEFAULT NULL COMMENT '经理',
`manager_signature_date` datetime DEFAULT NULL COMMENT '经理签名日期',
`create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建日期',
`create_user_id` int NOT NULL COMMENT '创建人用户id',
`create_user_name` varchar(50) NOT NULL COMMENT '创建人姓名',
`state` tinyint(4) NOT NULL DEFAULT 0 COMMENT '会员状态(-1:停用,0:未审核,1:正常)',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
DROP TABLE IF EXISTS `member_family_info`;
CREATE TABLE `member_family_info` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`member_id` int(11) NOT NULL,
`name` varchar(10) NOT NULL COMMENT '姓名',
`relationship` varchar(10) NOT NULL COMMENT '关系',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
\ No newline at end of file
xx-member/src/test/java/com/xxfc/member/MemberApplicationTests.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class MemberApplicationTests {
}
xx-member/src/test/java/com/xxfc/member/controller/MemberInfoControllerTest.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.member.controller;
import com.github.wxiaoqi.security.common.msg.BaseResponse;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.msg.TableResultResponse;
import com.xxfc.member.MemberApplicationTests;
import com.xxfc.member.vo.MemberFamilyInfoVo;
import com.xxfc.member.vo.MemberInfoVo;
import org.junit.Assert;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.springframework.beans.factory.annotation.Autowired;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import static com.xxfc.member.entity.MemberInfo.SEX_MAN;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class MemberInfoControllerTest extends MemberApplicationTests {
private MemberInfoVo memberInfoVo;
@Autowired
private MemberInfoController controller;
@Before
public void setUp() throws Exception {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
memberInfoVo = new MemberInfoVo();
memberInfoVo.setId(1);
memberInfoVo.setName("张三");
memberInfoVo.setSex(SEX_MAN);
memberInfoVo.setCardNumber("123456789");
memberInfoVo.setBirthday(sdf.parse("1988-01-01"));
memberInfoVo.setIdNumber("421000000000000000");
memberInfoVo.setCertificateAddress("皇后大道");
memberInfoVo.setEmail("xxxxx@xxx.com");
memberInfoVo.setWx("13312341234");
memberInfoVo.setMemberType((byte) 0);
memberInfoVo.setTelephone("0769-22223333");
memberInfoVo.setMobilePhone("13312341234");
memberInfoVo.setAddress("皇后大道东");
memberInfoVo.setWorkplace("皇后大道西");
memberInfoVo.setJob("test");
memberInfoVo.setInviter("nothing");
memberInfoVo.setProfession("test");
memberInfoVo.setPayType((byte) 0);
memberInfoVo.setMemberSignatureDate(new Date());
memberInfoVo.setManager("XXX");
memberInfoVo.setManagerSignatureDate(new Date());
// memberInfoVo.setCreateDate(new Date());
memberInfoVo.setCreateUserId(1);
memberInfoVo.setCreateUserName("admin");
memberInfoVo.setState((byte) 1);
List<MemberFamilyInfoVo> family = new ArrayList<>();
MemberFamilyInfoVo father = new MemberFamilyInfoVo();
father.setName("张二");
father.setRelationship("父子");
family.add(father);
MemberFamilyInfoVo mother = new MemberFamilyInfoVo();
mother.setName("李二");
mother.setRelationship("母子");
family.add(mother);
memberInfoVo.setFamily(family);
}
@Test
public void t_001_insert() {
BaseResponse response = controller.insert(memberInfoVo);
Assert.assertEquals(200, response.getStatus());
}
@Test
public void t_002_get() {
ObjectRestResponse<MemberInfoVo> response = controller.get(memberInfoVo.getId());
Assert.assertEquals(200, response.getStatus());
Assert.assertNotNull(response.getData());
Assert.assertEquals("张三", response.getData().getName());
}
@Test
public void t_003_update() {
String eMail = "test@qq.com";
MemberInfoVo member = controller.get(memberInfoVo.getId()).getData();
List<MemberFamilyInfoVo> family = member.getFamily();
MemberFamilyInfoVo family1 = family.get(0);
family1.setId(null);
family1.setName("大熊");
family1.setRelationship("兄弟");
MemberFamilyInfoVo family2 = family.get(1);
family2.setName("熊二");
family2.setRelationship("兄弟");
member.setEmail(eMail);
BaseResponse response = controller.update(member);
Assert.assertEquals(200, response.getStatus());
ObjectRestResponse<MemberInfoVo> resp = controller.get(memberInfoVo.getId());
Assert.assertEquals(eMail, resp.getData().getEmail());
List<MemberFamilyInfoVo> familyInfos = resp.getData().getFamily();
for (MemberFamilyInfoVo info : familyInfos) {
Assert.assertTrue(family1.getName().equals(info.getName())
|| family2.getName().equals(info.getName()));
}
}
@Test
public void t_004_getAll() {
TableResultResponse<MemberInfoVo> response = controller.getAll(null,1, 10);
Assert.assertEquals(200, response.getStatus());
Assert.assertTrue(response.getData().getRows().size() > 0);
}
@Test
public void t_005_delete() {
BaseResponse response = controller.delete(memberInfoVo.getId());
Assert.assertEquals(200, response.getStatus());
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/bootstrap.yml
View file @ 015f6679
...@@ -14,6 +14,8 @@ spring: ...@@ -14,6 +14,8 @@ spring:
nacos: nacos:
config: config:
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
#共用配置，暂定一个
shared-dataids: commonaaa-dev.yaml
#--- #---
#spring: #spring:
......
xx-third-party-api/pom.xml deleted 100644 → 0
View file @ 2c0e0fab
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xx-third-party-api</artifactId>
<dependencies>
<!-- ace -->
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<!-- 持久层 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
xx-third-party-api/src/main/java/com/xxfc/thirdparty/api/ITrafficViolationsService.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.api;
import com.xxfc.thirdparty.model.JuheResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@FeignClient("xx-third-party")
@RequestMapping("3p/tv")
public interface ITrafficViolationsService {
/**
* 获取支持的城市
* @param province
* @return
*/
@RequestMapping(value = "city", method = RequestMethod.GET)
JuheResult getCityInfo(String province);
/**
* 查违章
* @param city 城市代码
* @param hphm 车牌号码
* @param hpzl 车辆类型 01：大车，02：小车
* @param engineno 发动机号
* @param classno 车架号
* @return
*/
@RequestMapping(value = "trafficViolations", method = RequestMethod.GET)
JuheResult queryTrafficViolations(String city, String hphm, String hpzl, String engineno, String classno);
/**
* 获取剩余查询次数
* @return
*/
@RequestMapping(value = "balance", method = RequestMethod.GET)
JuheResult getBalance();
/**
* 根据车牌查归属地
* @param hphm 车牌号码
* @return
*/
@RequestMapping(value = "carPre", method = RequestMethod.GET)
JuheResult carPre(String hphm);
}
xx-third-party-api/src/main/java/com/xxfc/thirdparty/model/JuheCarPreInfo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.model;
import lombok.Data;
/**
* 根据车牌前缀查地区的返回结果
*/
@Data
public class JuheCarPreInfo {
String city_name;
String city_code;
String abbr;
String engine;
String engineno;
String classa;
String classno;
String province;
}
xx-third-party-api/src/main/java/com/xxfc/thirdparty/model/JuheResult.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.model;
import lombok.Data;
@Data
public class JuheResult<T> {
String resultcode;
String reason;
T result;
Integer error_code;
}
xx-third-party-api/src/main/java/com/xxfc/thirdparty/model/JuheTrafficViolationsBalanceInfo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.model;
import lombok.Data;
/**
* 车辆违章查询剩余次数
*/
@Data
public class JuheTrafficViolationsBalanceInfo {
String surplus;
}
xx-third-party-api/src/main/java/com/xxfc/thirdparty/model/JuheTrafficViolationsCityInfo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.model;
import lombok.Data;
@Data
public class JuheTrafficViolationsCityInfo {
String city_name;
String city_code;
String abbr;
String engine;
String engineno;
String classa;
String classno;
String regist;
String registno;
}
xx-third-party-api/src/main/java/com/xxfc/thirdparty/model/JuheTrafficViolationsInfo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.model;
import lombok.Data;
import java.util.List;
/**
* 违章信息
*/
@Data
public class JuheTrafficViolationsInfo {
/**
* 省份代码
*/
String province;
/**
* 城市代码
*/
String city;
/**
* 车牌号码
*/
String hphm;
/**
* 牌类型，默认02:小型车，01:大型车
*/
String hpzl;
/**
* 违章信息列表
*/
List<JuheTrafficViolationsInfoItem> lists;
}
xx-third-party-api/src/main/java/com/xxfc/thirdparty/model/JuheTrafficViolationsInfoItem.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.model;
import lombok.Data;
/**
* 违章信息项
*/
@Data
public class JuheTrafficViolationsInfoItem {
String data;
String area;
String act;
String code;
String fen;
String wzcity;
String money;
String handled;
String archiveno;
}
xx-third-party-api/src/main/java/com/xxfc/thirdparty/model/JuheTrafficViolationsProvinceInfo.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.model;
import lombok.Data;
import java.util.List;
@Data
public class JuheTrafficViolationsProvinceInfo {
String province;
String province_code;
List<JuheTrafficViolationsCityInfo> citys;
}
xx-third-party/pom.xml deleted 100644 → 0
View file @ 2c0e0fab
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xx-third-party</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- service -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!-- ace -->
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>xx-third-party-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-auth-client</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-cache</artifactId>
<version>0.0.2</version>
</dependency>
<!-- 持久层 -->
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper-spring-boot-starter</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot2-starter</artifactId>
<version>1.1.10</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- utils -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.33</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<!-- mybatis generator自动生成代码 -->
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.2</version>
<configuration>
<configurationFile>
${basedir}/src/main/resources/builder/generatorConfig.xml
</configurationFile>
<overwrite>true</overwrite>
<verbose>true</verbose>
</configuration>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.30</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper</artifactId>
<version>${mapper.version}</version>
</dependency>
</dependencies>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.mybatis.generator</groupId>-->
<!-- <artifactId>mybatis-generator-maven-plugin</artifactId>-->
<!-- <version>1.3.7</version>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId> mysql</groupId>-->
<!-- <artifactId> mysql-connector-java</artifactId>-->
<!-- <version>8.0.15</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.mybatis.generator</groupId>-->
<!-- <artifactId>mybatis-generator-core</artifactId>-->
<!-- <version>1.3.7</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>tk.mybatis</groupId>-->
<!-- <artifactId>mapper</artifactId>-->
<!-- <version>4.0.4</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>Generate MyBatis Artifacts</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>generate</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- <configuration>-->
<!-- &lt;!&ndash;允许移动生成的文件 &ndash;&gt;-->
<!-- <verbose>true</verbose>-->
<!-- &lt;!&ndash; 是否覆盖 &ndash;&gt;-->
<!-- <overwrite>true</overwrite>-->
<!-- &lt;!&ndash; 自动生成的配置 &ndash;&gt;-->
<!-- <configurationFile>-->
<!-- src/main/resources/builder/mybatis-generator.xml</configurationFile>-->
<!-- </configuration>-->
<!-- </plugin>-->
</plugins>
</build>
</project>
\ No newline at end of file
xx-third-party/src/main/java/com/xxfc/thirdparty/ThirdPartyApplication.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty;
import com.ace.cache.EnableAceCache;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication
@EnableDiscoveryClient
//@EnableAceAuthClient
@EnableAceCache
@EnableTransactionManagement
@MapperScan("com.xxfc.thirdparty.mapper")
@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign"})
public class ThirdPartyApplication {
public static void main(String[] args) {
SpringApplication.run(ThirdPartyApplication.class, args);
}
}
xx-third-party/src/main/java/com/xxfc/thirdparty/config/RestConfiguration.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
@Configuration
public class RestConfiguration {
@Bean
public RestTemplate restTemplate() {
return new RestTemplate();
}
}
xx-third-party/src/main/java/com/xxfc/thirdparty/config/WebConfiguration.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.config;
import com.github.wxiaoqi.security.auth.client.interceptor.ServiceAuthRestInterceptor;
import com.github.wxiaoqi.security.auth.client.interceptor.UserAuthRestInterceptor;
import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.util.ArrayList;
import java.util.Collections;
@Configuration("thirdpartyWebConfig")
@Primary
public class WebConfiguration implements WebMvcConfigurer {
@Bean
GlobalExceptionHandler getGlobalExceptionHandler() {
return new GlobalExceptionHandler();
}
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(getServiceAuthRestInterceptor()).
addPathPatterns(getIncludePathPatterns()).addPathPatterns("/3p/**");
registry.addInterceptor(getUserAuthRestInterceptor()).
addPathPatterns(getIncludePathPatterns());
}
@Bean
ServiceAuthRestInterceptor getServiceAuthRestInterceptor() {
return new ServiceAuthRestInterceptor();
}
@Bean
UserAuthRestInterceptor getUserAuthRestInterceptor() {
return new UserAuthRestInterceptor();
}
/**
* 需要用户和服务认证判断的路径
* @return
*/
private ArrayList<String> getIncludePathPatterns() {
ArrayList<String> list = new ArrayList<>();
String[] urls = {
"/3p/**"
};
Collections.addAll(list, urls);
return list;
}
}
xx-third-party/src/main/java/com/xxfc/thirdparty/controller/TrafficViolationsController.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.controller;
import com.xxfc.thirdparty.api.ITrafficViolationsService;
import com.xxfc.thirdparty.model.JuheResult;
import com.xxfc.thirdparty.service.TrafficViolationsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("3p/tv")
public class TrafficViolationsController implements ITrafficViolationsService {
@Autowired
TrafficViolationsService tvService;
@Override
@GetMapping("city")
public JuheResult getCityInfo(String province) {
return tvService.getCity(province);
}
@Override
@GetMapping("trafficViolations")
public JuheResult queryTrafficViolations(String city, String hphm, String hpzl, String engineno, String classno) {
return tvService.queryViolations(city, hphm, hpzl, engineno, classno);
}
@Override
@GetMapping("balance")
public JuheResult getBalance() {
return tvService.queryBalance();
}
@Override
@GetMapping("carPre")
public JuheResult carPre(String hphm) {
return tvService.queryCityByHphm(hphm);
}
}
xx-third-party/src/main/java/com/xxfc/thirdparty/service/TrafficViolationsService.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.service;
import com.alibaba.fastjson.JSON;
import com.xxfc.thirdparty.model.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
import java.util.Map;
/**
* 违章查询
*/
@Service
public class TrafficViolationsService {
@Value("${juhe.key}")
private String KEY;
//支持的城市
private static final String URL_GET_CITY = "http://v.juhe.cn/wz/citys?" +
"province={province}&dtype={dtype}&format={format}&callback={callback}&key={key}";
//查违章
private static final String URL_QUERY_WZ = "http://v.juhe.cn/wz/query?" +
"dtype={dtype}&city={city}&hphm={hphm}&hpzl={hpzl}&engineno={engineno}&classno={classno}&key={key}";
//剩余次数
private static final String URL_BALANCE = "http://v.juhe.cn/wz/status?" +
"dtype={dtype}&key={key}";
//根据车牌查城市
private static final String URL_CAR_PRE = "http://v.juhe.cn/wz/carPre?" +
"hphm={hphm}&key={key}";
@Autowired
RestTemplate restTemplate;
/**
* 获取支持城市
* province string N 默认全部，省份简写，如：ZJ、JS
* dtype string N 返回数据格式：json或xml或jsonp,默认json
* format int N 格式选择1或2，默认1
* callback String N 返回格式选择jsonp时，必须传递
* {"resultcode":"101","reason":"error key","result":null,"error_code":10001}
*/
public JuheResult<Map<String, JuheTrafficViolationsProvinceInfo>> getCity(String province) {
Map<String, String> paramsMap = new HashMap<>();
paramsMap.put("key", KEY);
paramsMap.put("province", province == null ? "" : province);
paramsMap.put("dtype", "json");
paramsMap.put("format", "");
paramsMap.put("callback", "");
return query(URL_GET_CITY, paramsMap);
}
/**
* 查违章
* dtype string 否 返回数据格式：默认:json
* city String 是 城市代码 *
* hphm String 是 号牌号码 完整7位 ,需要utf8 urlencode*
* hpzl String 是 号牌类型，默认02:小型车，01:大型车
* engineno String 否 发动机号 (具体是否需要根据城市接口中的参数填写)
* classno String 否 车架号 (具体是否需要根据城市接口中的参数填写)
*/
public JuheResult<JuheTrafficViolationsInfo> queryViolations(String city, String hphm, String hpzl,
String engineno, String classno) {
Map<String, String> paramsMap = new HashMap<>();
paramsMap.put("key", KEY);
paramsMap.put("dtype", "json");
paramsMap.put("city", city);
paramsMap.put("hphm", hphm);
paramsMap.put("hpzl", hpzl);
paramsMap.put("engineno", engineno);
paramsMap.put("classno", classno);
return query(URL_QUERY_WZ, paramsMap);
}
/**
* 查询剩余次数
*/
public JuheResult<JuheTrafficViolationsBalanceInfo> queryBalance() {
Map<String, String> paramsMap = new HashMap<>();
paramsMap.put("key", KEY);
paramsMap.put("dtype", "json");
return query(URL_BALANCE, paramsMap);
}
/**
* 根据车牌前缀查城市参数
*/
public JuheResult<JuheCarPreInfo> queryCityByHphm(String hphm) {
Map<String, String> paramsMap = new HashMap<>();
paramsMap.put("key", KEY);
paramsMap.put("hphm", hphm);
return query(URL_CAR_PRE, paramsMap);
}
private JuheResult query(String url, Map<String, String> paramsMap) {
try {
String responseStr = restTemplate.getForObject(url, String.class, paramsMap);
return JSON.parseObject(responseStr, JuheResult.class);
} catch (RestClientException ex) {
JuheResult result = new JuheResult();
result.setReason("请求错误");
result.setResultcode("500");
return result;
}
}
}
xx-third-party/src/main/resources/application.yml deleted 100644 → 0
View file @ 2c0e0fab
server:
port: 8002
logging:
level:
com.xxfc.member: DEBUG
spring:
application:
name: xx-third-party
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
default-property-inclusion: non_null
datasource:
name: test
url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/ag_admin_v1?useUnicode=true&characterEncoding=UTF8
username: root
password: 123456
# 使用druid数据源
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
filters: stat
maxActive: 20
initialSize: 1
maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
validationQuery: select 'x'
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
rabbitmq:
host: ${RABBIT_MQ_HOST:localhost}
port: ${RABBIT_MQ_PORT:5672}
username: guest
password: guest
sleuth:
enabled: true
http:
legacy:
enabled: true
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
sentinel:
transport:
dashboard: localhost:8080
sample:
zipkin:
# When enabled=false, traces log to the console. Comment to send to zipkin
enabled: false
mybatis:
# basepackage: com.github.wxiaoqi.security.admin.mapper
# xmlLocation: classpath:mapper/**/*.xml
mapper-locations: "classpath*:mapper/**/*.xml"
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
mapper:
mappers: com.github.wxiaoqi.security.common.mapper.MysqlMapper
# 必须配置
feign:
httpclient:
enabled: false
okhttp:
enabled: true
ribbon:
eureka:
enabled: true
ReadTimeout: 100000
ConnectTimeout: 100000
MaxAutoRetries: 0
MaxAutoRetriesNextServer: 1
OkToRetryOnAllOperations: false
hystrix:
threadpool:
default:
coreSize: 1000 ##并发执行的最大线程数，默认10
maxQueueSize: 1000 ##BlockingQueue的最大队列数
queueSizeRejectionThreshold: 500 ##即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
command:
default:
execution:
isolation:
thread:
timeoutInMilliseconds: 110000
# 配置swagger
swagger:
enabled: true
base-package: com.github.wxiaoqi.security.admin
title: ace-admin
version: 1.0.0.SNAPSHOT
description: 管理后端服务
contact:
name: admin
auth:
serviceId: xx-third-party
user:
token-header: Authorization
client:
id: xx-member
secret: 123456
token-header: x-client-token
#redis-cache 相关
redis:
pool:
maxActive: 300
maxIdle: 100
maxWait: 1000
host: ${REDIS_HOST:localhost}
port: ${REDIS_PORT:6379}
password:
timeout: 2000
# 服务或应用名
sysName: xx-member
enable: true
database: 0
management:
endpoints:
web:
exposure:
include: '*'
security:
enabled: false
juhe:
key: 714ac24873c6a8b76114dca575a3748b
\ No newline at end of file
xx-third-party/src/main/resources/bootstrap.yml deleted 100644 → 0
View file @ 2c0e0fab
spring:
application:
name: xx-third-party
cloud:
nacos:
config:
server-addr: 127.0.0.1:8848
# server-addr: 10.5.52.2:8848
file-extension: yaml
profiles:
active: dev
\ No newline at end of file
xx-third-party/src/main/resources/builder/mybatis-generator.xml deleted 100644 → 0
View file @ 2c0e0fab
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE generatorConfiguration
PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
<context id="Mysql" targetRuntime="MyBatis3">
<property name="beginningDelimiter" value="`"/>
<property name="endingDelimiter" value="`"/>
<property name="mergeable" value="false" />
<plugin type="tk.mybatis.mapper.generator.MapperPlugin">
<property name="mappers" value="tk.mybatis.mapper.common.Mapper"/>
<!-- caseSensitive默认false，当数据库表名区分大小写时，可以将该属性设置为true -->
<property name="caseSensitive" value="false"/>
</plugin>
<!--去除注释 -->
<commentGenerator>
<property name="suppressAllComments" value="true"/>
<property name="suppressDate" value="true"/>
</commentGenerator>
<jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
connectionURL="jdbc:mysql://localhost:3306/ag_admin_v1?useUnicode=true&amp;characterEncoding=UTF8&amp;nullCatalogMeansCurrent=true"
userId="root"
password="123456">
</jdbcConnection>
<!-- Model -->
<javaModelGenerator targetPackage="com.xxfc.member.entity"
targetProject="src/main/java">
<property name="enableSubPackages" value="true"/>
<property name="trimStrings" value="true"/>
</javaModelGenerator>
<!-- XML -->
<sqlMapGenerator targetPackage="com.xxfc.member.mapper"
targetProject="src/main/resources/mapper">
<property name="enableSubPackages" value="true"/>
</sqlMapGenerator>
<!-- Mapper -->
<javaClientGenerator targetPackage="com.xxfc.member.mapper"
targetProject="src/main/java"
type="XMLMAPPER">
<property name="enableSubPackages" value="true"/>
</javaClientGenerator>
<!-- <table tableName="member_info" domainObjectName="MemberInfo" enableCountByExample="false"-->
<!-- enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"-->
<!-- selectByExampleQueryId="false"/>-->
<!-- <table tableName="member_family_info" domainObjectName="MemberFamilyInfo" enableCountByExample="false"-->
<!-- enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"-->
<!-- selectByExampleQueryId="false"/>-->
</context>
</generatorConfiguration>
\ No newline at end of file
xx-third-party/src/test/java/com/xxfc/thirdparty/ThirdPartyApplicationTests.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class ThirdPartyApplicationTests {
}
xx-third-party/src/test/java/com/xxfc/thirdparty/service/TrafficViolationsServiceTest.java deleted 100644 → 0
View file @ 2c0e0fab
package com.xxfc.thirdparty.service;
import com.xxfc.thirdparty.ThirdPartyApplicationTests;
import com.xxfc.thirdparty.model.JuheResult;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class TrafficViolationsServiceTest extends ThirdPartyApplicationTests {
@Autowired
TrafficViolationsService service;
@Before
public void setUp() throws Exception {
}
@Test
public void getCity() {
JuheResult result = service.getCity(null);
System.out.println(result);
}
@Test
public void queryViolations() {
JuheResult result = service.queryViolations("GD_DG","粤S0634C","02",
"1615000569","LGWEF6A5XGH002066");
System.out.println(result);
}
@Test
public void queryBalance() {
JuheResult result = service.queryBalance();
System.out.println(result);
}
@Test
public void queryCityByHphm() {
JuheResult result = service.queryCityByHphm("粤S0634C");
System.out.println(result);
}
}
\ No newline at end of file
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UploadController.java
View file @ 015f6679
...@@ -45,7 +45,7 @@ public class UploadController{ ...@@ -45,7 +45,7 @@ public class UploadController{
return JsonResultUtil.createSuccessResultWithObj(uploadService.uploadFile(file,prefix)); return JsonResultUtil.createSuccessResultWithObj(uploadService.uploadFile(file,prefix));
} }
@RequestMapping(value = "/admin/upload", method = RequestMethod.POST) @RequestMapping(value = "/app/unauth/admin/upload", method = RequestMethod.POST)
public JSONObject uploads( public JSONObject uploads(
@RequestParam("file") MultipartFile file, @RequestParam("file") MultipartFile file,
@RequestParam(value = "prefix",defaultValue = "admin")String prefix @RequestParam(value = "prefix",defaultValue = "admin")String prefix
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ 015f6679
...@@ -842,11 +842,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> { ...@@ -842,11 +842,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
if(StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) { if(StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
initBookSearchParam(dto, params); initBookSearchParam(dto, params);
} }
PageHelper.startPage(dto.getPage(), dto.getLimit()); // PageHelper.startPage(dto.getPage(), dto.getLimit());
List<UsableVehicleModelVO> lists = mapper.searchUsableModel(params); // List<UsableVehicleModelVO> lists = mapper.searchUsableModel(params);
PageInfo<UsableVehicleModelVO> usableVehicleModel = new PageInfo<>(lists); // PageInfo<UsableVehicleModelVO> usableVehicleModel = new PageInfo<>(lists);
return PageDataVO.pageInfo(usableVehicleModel); // return PageDataVO.pageInfo(usableVehicleModel);
//return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params)); return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
} }
public PageDataVO<UsableVehicleModelVO> hotModel(HotVeicleDTO dto){ public PageDataVO<UsableVehicleModelVO> hotModel(HotVeicleDTO dto){
......
xx-vehicle/xx-vehicle-server/src/main/resources/bootstrap.yml
View file @ 015f6679
...@@ -24,6 +24,8 @@ spring: ...@@ -24,6 +24,8 @@ spring:
nacos: nacos:
config: config:
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
#共用配置，暂定一个
shared-dataids: common-dev.yaml
--- ---
spring: spring:
......
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