Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/ReferralCodeUtil.java

@@ -21,7 +21,7 @@ public class ReferralCodeUtil {
 	
 	static {
 		PERMUTATION = permutation(LEN);
-		MAX_COMBINATION = combination(_stuffs.length, LEN);
+		MAX_COMBINATION = combination(36, LEN);
 	}
 
 //	public static void resetStuffs() {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -22,6 +22,7 @@ import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.EmojiFilter;
+import com.github.wxiaoqi.security.common.util.ReferralCodeUtil;
 import com.github.wxiaoqi.security.common.util.UUIDUtils;
 import com.github.wxiaoqi.security.common.util.VerificationUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -306,7 +307,7 @@ public class AppPermissionService {
 
             }
             //生成邀请码 长度改为8 不然重复率太高
-            rsUserDetail.setCode(UUIDUtils.genCodes(8));
+            rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
             appUserDetailBiz.insertSelective(rsUserDetail);
             log.error("注册：新增用户详情： " + userid);
            /* //绑定上下线关系
@@ -933,7 +934,7 @@ public class AppPermissionService {
             rsUserDetail.setUpdatetime(now);
             rsUserDetail.setIsdel(0);
             //生成邀请码 长度改为8 不然重复率太高
-            rsUserDetail.setCode(UUIDUtils.genCodes(8));
+            rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
             //设置来源
             rsUserDetail.setChannel(UserSourceEnum.APPLET.getCode());
             rsUserDetail.setCrtHost(getIp());

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -21,7 +21,7 @@ public interface VehicleFeign {
     @GetMapping(value = "/vehicleModel/{id}")
     public ObjectRestResponse<VehicleModel> get(@PathVariable(value = "id") int id);
 
-    @GetMapping(value = "/vehicleInfo/app/unauth/{id}")
+    @GetMapping(value = "/vehicleInfo/{id}")
     public ObjectRestResponse<Vehicle> get(@PathVariable(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/findById", method = RequestMethod.GET)

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -83,7 +83,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
     public static final DateTimeFormatter DEFAULT_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
 
-    @RequestMapping(value = "/app/unauth/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public RestResponse<Vehicle> get(@PathVariable String id) {
         return RestResponse.data(baseBiz.get(id));
     }