汽车之家分支修改

README.md

@@ -1 +1,9 @@
-v1.0.0
+V4个人中心服务
+1：jar包下载：https://4dkk.4dage.com/customer-projects/qichezhijia/个人中心/4dkankan-center-ucenter-2.0.0-SNAPSHOT.jar
+2：启动jar包命令：nohup java -jar 4dkankan-center-ucenter-2.0.0-SNAPSHOT.jar >/dev/null 2>&1 &
+3：启动参数说明：
+
+spring.cloud.nacos.config.server-addr：指定nacos 服务地址，默认 120.24.144.164:8848
+spring.cloud.nacos.config.namespace ：指定 配置中心命名空间，默认4dkankan-qczj
+spring.cloud.nacos.discovery.namespace ：指定 注册中心命名空间，默认4dkankan-qczj
+4:指定参数启动命令，例：nohup java -jar 4dkankan-center-ucenter-2.0.0-SNAPSHOT.jar --spring.cloud.nacos.config.server-addr=120.24.144.164:8848  >/dev/null 2>&1 &

pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.fdkankan.ucenter</groupId>
-    <artifactId>4dkankan-center-ucenter</artifactId>
-    <version>1.0.0</version>
+    <artifactId>4dkankan-ucenter</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 

src/main/java/com/fdkankan/ucenter/common/AgentConstant.java

@@ -0,0 +1,22 @@
+package com.fdkankan.ucenter.common;
+
+public class AgentConstant {
+
+    public static final String CHILD_PASSWORD_VALUE = "4dkankan@4dage";
+
+    public static final String WIFI_PASSWORD_VALUE = "12345678";
+
+    public static final String DEFAULT_BODY = "系统赠送";
+
+    public static final int INIT_POINTS = 3399;
+
+    public static final float EXTRACT = 0.3f;
+
+    public static final String DEFAULT_AGENT = "4dage";
+
+    public static final int FAILURE_CODE_9001 = 9001;
+    public static final String FAILURE_MSG_9001 = "经销商已存在";
+
+    public static final int FAILURE_CODE_9002 = 9002;
+    public static final String FAILURE_MSG_9002 = "请先删除经销商下的用户";
+}

src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -27,8 +27,8 @@ public class WebAppConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(ucenterInterceptor).addPathPatterns("/**")
-				.excludePathPatterns("/**/api/sso/**","/**/api/app/**","/test/**");
-		registry.addInterceptor(appInterceptor).addPathPatterns("/**/api/app/**");
+				.excludePathPatterns("/**/sso/**","/**/app/**","/test/**");
+		registry.addInterceptor(appInterceptor).addPathPatterns("/**/app/**");
 		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 

src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -12,8 +12,10 @@ import com.fdkankan.ucenter.vo.request.CameraParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
-@RequestMapping("/api/user/camera")
+@RequestMapping("/user/camera")
 public class CameraController {
 
     @Autowired
@@ -67,8 +69,10 @@ public class CameraController {
     @PostMapping("/add")
     public Result add(@RequestBody JSONObject jsonObject,@RequestHeader String token){
         String username = JwtUtil.getUsername(token);
-        cameraService.bind(jsonObject.getInteger("cameraType"),jsonObject.getString("snCode"),username);
-        return Result.success();
+        List<String> errorSnCode = cameraService.bind(jsonObject.getInteger("cameraType"), jsonObject.getString("snCode"), username);
+        JSONObject object = new JSONObject();
+        object.put("errorCode",errorSnCode);
+        return Result.success(object);
     }
 
     /**

src/main/java/com/fdkankan/ucenter/controller/CartController.java

@@ -16,7 +16,7 @@ import java.util.List;
  * 购物车
  */
 @RestController
-@RequestMapping("/api/user/cart")
+@RequestMapping("/user/cart")
 public class CartController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/FolderController.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @since 2022-07-07
  */
 @RestController
-@RequestMapping("/api/user/folder")
+@RequestMapping("/user/folder")
 public class FolderController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/IncrementController.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/user/increment")
+@RequestMapping("/user/increment")
 public class IncrementController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/InterComMessageController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 @RestController
-@RequestMapping("/api/intercomMessage")
+@RequestMapping("/intercomMessage")
 public class InterComMessageController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/LoginController.java

@@ -9,12 +9,14 @@ import com.fdkankan.ucenter.vo.request.RegisterParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * 登录
  */
 @RestController
-@RequestMapping("/api/sso/user")
+@RequestMapping("/sso/user")
 public class LoginController {
 
     @Autowired
@@ -127,5 +129,15 @@ public class LoginController {
     public Result getToken(@RequestBody LoginParam param){
         return Result.success(loginService.login(param));
     }
+
+    /**
+     *  注册
+     *  areaNum  区号
+     *  phoneNum 手机号码
+     */
+    @PostMapping("/registerBatch")
+    public Result registerBatch(@RequestBody List<RegisterParam> paramList) throws Exception {
+        return Result.success(loginService.registerBatch(paramList));
+    }
 }
 

src/main/java/com/fdkankan/ucenter/controller/OrderAlipayController.java

@@ -22,7 +22,7 @@ import java.util.Map;
 @Log4j2
 /**支付中心-支付宝支付模块*/
 @RestController
-@RequestMapping("/api/order/pay")
+@RequestMapping("/order/pay")
 public class OrderAlipayController extends BaseController {
     @Autowired
     private AlipayDefaultConfig alipayDefaultConfig;

src/main/java/com/fdkankan/ucenter/controller/OrderController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
  *
  */
 @RestController
-@RequestMapping("/api/user/order")
+@RequestMapping("/user/order")
 public class OrderController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/OrderPaypalController.java

@@ -30,7 +30,7 @@ import java.util.Enumeration;
 @Log4j2
 /**支付中心-paypal支付模块*/
 @Controller
-@RequestMapping("/api/order/pay")
+@RequestMapping("/order/pay")
 public class OrderPaypalController extends BaseController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/OrderWechatPayController.java

@@ -37,7 +37,7 @@ import java.util.Map;
 @Log4j2
 /**支付中心-微信支付模块"*/
 @Controller
-@RequestMapping("/api/order/pay")
+@RequestMapping("/order/pay")
 public class OrderWechatPayController extends BaseController {
     @Autowired
     private OrderStrategyFactory orderStrategyFactory;

src/main/java/com/fdkankan/ucenter/controller/SceneApplyController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-07-15
  */
 @RestController
-@RequestMapping("/api/demo/scen")
+@RequestMapping("/demo/scen")
 public class SceneApplyController {
     @Autowired
     private ISceneApplyService sceneApplyService;

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -27,7 +27,7 @@ import java.util.List;
  * @since 2022-07-04
  */
 @RestController
-@RequestMapping("/api/user/scene")
+@RequestMapping("/user/scene")
 public class SceneController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/SceneCooperationController.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/user/scene/cooperation")
+@RequestMapping("/user/scene/cooperation")
 public class SceneCooperationController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/UserController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * 个人中心
  */
 @RestController
-@RequestMapping("/api/user")
+@RequestMapping("/user")
 public class UserController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/VirtualOrderController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2022-07-13
  */
 @RestController
-@RequestMapping("/api/user/virtualOrder")
+@RequestMapping("/user/virtualOrder")
 public class VirtualOrderController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/app/camera")
+@RequestMapping("/app/camera")
 public class AppCameraController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/app/AppController.java

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/sso/app")
+@RequestMapping("/sso/app")
 public class AppController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/app/AppSceneController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/app/scene")
+@RequestMapping("/app/scene")
 public class AppSceneController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/app/AppUserController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/app/user")
+@RequestMapping("/app/user")
 public class AppUserController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/app/InvoiceController.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/user/invoice")
+@RequestMapping("/user/invoice")
 public class InvoiceController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/scene")
+@RequestMapping("/scene")
 public class SceneApiController {
 
     @Autowired

src/main/java/com/fdkankan/ucenter/entity/Camera.java

@@ -84,7 +84,7 @@ public class Camera implements Serializable {
     private String recStatus;
 
     @TableField("is_out")
-    private Boolean isOut;
+    private Integer isOut;
 
 
 }

src/main/java/com/fdkankan/ucenter/pay/alipay/AlipayDefaultConfig.java

@@ -24,7 +24,7 @@ public class AlipayDefaultConfig extends AlipayConfig {
     /** 同步地址 */
     private String returnUrl = "mobile.html#/payresult/success";
     /** 异步地址 */
-    private String notifyUrl = "api/order/pay/alipay/async_notify";
+    private String notifyUrl = "order/pay/alipay/async_notify";
 
     /**
      * PostContruct是spring框架的注解，在方法上加该注解会在项目启动的时候执行该方法，也可以理解为在spring容器初始化的时候执行该方法。

src/main/java/com/fdkankan/ucenter/pay/paypal/PayPalDefaultConfig.java

@@ -22,19 +22,19 @@ public class PayPalDefaultConfig extends PayPalConfig {
     }
 
     public String getPaySuccessUrl(){
-        return "api/order/pay/paypal/callback";
+        return "order/pay/paypal/callback";
     }
 
     public String getH5PaySuccessUrl(){
-        return "api/order/pay/paypal/callbackH5";
+        return "order/pay/paypal/callbackH5";
     }
 
     public String getCancelUrl(){
-        return "api/order/pay/paypal/cancel";
+        return "order/pay/paypal/cancel";
     }
 
     public String getH5CancelUrl(){
-        return "api/order/pay/paypal/cancelH5";
+        return "order/pay/paypal/cancelH5";
     }
 
     public String getSuccessUrl(){

src/main/java/com/fdkankan/ucenter/pay/wx/WXPayDefaultConfig.java

@@ -41,7 +41,7 @@ public class WXPayDefaultConfig implements WXPayConfig {
     }
 
     public String getNotifyURL() {
-        return "api/order/pay/wechatPay/notify";
+        return "order/pay/wechatPay/notify";
     }
 
     public String getOrderURL() {

src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -29,7 +29,7 @@ public interface ICameraService extends IService<Camera> {
 
     void unbind(Long cameraId, String ids,String userName);
 
-    void bind(Integer cameraType, String snCode, String username);
+    List<String> bind(Integer cameraType, String snCode, String username);
 
     void saveCooperationUser(String ids, Long cameraId,String resourceIds, String username);
 

src/main/java/com/fdkankan/ucenter/service/IUserService.java

@@ -54,4 +54,6 @@ public interface IUserService extends IService<User> {
     List<Long> getLikeUserName(String userName);
 
     User getByToken(String token);
+
+    int registerBatch(List<RegisterParam> paramList);
 }

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -3,7 +3,6 @@ package com.fdkankan.ucenter.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileSizeUtil;
@@ -57,6 +56,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     IScenePlusService scenePlusService;
     @Autowired
     ISceneCooperationService sceneCooperationService;
+    @Autowired
+    QczjService qczjService;
 
     @Override
     public Camera getBySnCode(String snCode) {
@@ -221,10 +222,13 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
-    public void bind(Integer cameraType, String snCodes, String username) {
+    public List<String> bind(Integer cameraType, String snCodes, String username) {
         User user = userService.getByUserName(username);
         String[] snCodeArr = snCodes.split(",");
         List<String> snCodeList = Arrays.asList(snCodeArr);
+        //汽车之家绑定相机默认入库添加会员权益
+        List<String> errorSnCode = qczjService.inCameraAndIncrement(user.getId(), snCodeList);
+
         LambdaUpdateWrapper<Camera> wrapper = new LambdaUpdateWrapper<>();
         wrapper.in(Camera::getSnCode,snCodeList);
         List<Camera> list = this.list(wrapper);
@@ -233,6 +237,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         sceneService.bindOrUnCamera(cameraIds,user.getId());
         sceneProService.bindOrUnCamera(cameraIds,user.getId());
         scenePlusService.bindOrUnCamera(cameraIds,user.getId());
+        return errorSnCode;
+
     }
 
     @Override

src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -22,14 +22,15 @@ import com.fdkankan.ucenter.vo.request.LoginParam;
 import com.fdkankan.ucenter.vo.request.RegisterParam;
 import com.fdkankan.ucenter.vo.response.LoginVo;
 import com.fdkankan.ucenter.vo.response.UserVo;
-import io.jsonwebtoken.Claims;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Service
 public class LoginService {
@@ -142,6 +143,7 @@ public class LoginService {
         if(user != null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3008, LoginConstant.FAILURE_MSG_3008);
         }
+        param.setNickName(param.getPhoneNum());
         userService.register(param);
 
     }
@@ -269,4 +271,26 @@ public class LoginService {
             redisUtil.del(RedisKeyUtil.PREFIX_MSG_AUTH_CODE + userName);
         }
     }
+
+    public int registerBatch(List<RegisterParam> paramList) {
+        List<String> successPhone = new ArrayList<>();
+        for (RegisterParam param : paramList) {
+            if(param == null){
+                continue;
+            }
+            if(StringUtils.isEmpty(param.getPhoneNum())){
+                continue;
+            }
+            if(StringUtils.isEmpty(param.getPassword())){
+                param.setPassword("QCzj123456");
+            }
+            if(StringUtils.isEmpty(param.getNickName())){
+                param.setNickName(param.getPhoneNum());
+            }
+            if(StringUtils.isEmpty(param.getCountry())){
+                param.setCountry("86");
+            }
+        }
+        return userService.registerBatch(paramList);
+    }
 }

src/main/java/com/fdkankan/ucenter/service/impl/QczjService.java

@@ -0,0 +1,94 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.Constant;
+import com.fdkankan.ucenter.common.AgentConstant;
+import com.fdkankan.ucenter.entity.Camera;
+import com.fdkankan.ucenter.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.UserIncrement;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.ICameraService;
+import com.fdkankan.ucenter.service.IUserIncrementService;
+import com.fdkankan.ucenter.util.DateUserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+public class QczjService {
+
+    @Autowired
+    ICameraService cameraService;
+    @Autowired
+    ICameraDetailService cameraDetailService;
+    @Autowired
+    IUserIncrementService userIncrementService;
+
+    public List<String> inCameraAndIncrement(Long userId, List<String> snCodeList) {
+        if(snCodeList.size() <=0){
+            return snCodeList;
+        }
+        LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(Camera::getSnCode,snCodeList);
+        List<Camera> cameraList =  cameraService.list(wrapper);
+        List<String> inSnCodeList = new ArrayList<>();
+        if(cameraList.size() >0){
+            inSnCodeList = cameraList.parallelStream().map(Camera::getSnCode).collect(Collectors.toList());
+        }
+        List<String> errorCodeList = new ArrayList<>();
+        for (String snCode : snCodeList) {
+            if(inSnCodeList.contains(snCode)){
+                errorCodeList.add(snCode);
+                continue;
+            }
+            Camera camera = new Camera();
+            camera.setWifiName("4DKKPRO_" + snCode);
+            camera.setSnCode(snCode);
+            camera.setChildName(snCode);
+            camera.setWifiPassword(AgentConstant.WIFI_PASSWORD_VALUE);
+            camera.setChildPassword(AgentConstant.CHILD_PASSWORD_VALUE);
+            camera.setActivatedTime(new Date());
+            camera.setIsOut(1);
+            camera.setRecStatus("A");
+            camera.setCreateTime(DateUserUtil.getDate(new Date()));
+            camera.setUpdateTime(DateUserUtil.getDate(new Date()));
+            cameraService.save(camera);
+
+            CameraDetail detailEntity = new CameraDetail();
+            detailEntity.setCameraId(camera.getId());
+            detailEntity.setAgency(AgentConstant.DEFAULT_AGENT);
+            detailEntity.setCountry(0);//默认中国
+            detailEntity.setType(9);
+            //商品类型，type：1为8目，type：2为双目 3:为转台
+            detailEntity.setGoodsId(9L);
+            detailEntity.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
+            detailEntity.setUsedSpace(0L);
+            detailEntity.setRecStatus("A");
+            detailEntity.setCreateTime(DateUserUtil.getDate(new Date()));
+            detailEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
+            detailEntity.setLastRequestTime(new Date());
+            detailEntity.setOrderSn("");
+            detailEntity.setOwn(0);
+            cameraDetailService.save(detailEntity);
+
+            UserIncrement userIncrement = new UserIncrement();
+            userIncrement.setCameraId(camera.getId());
+            userIncrement.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
+            userIncrement.setUserId(userId);
+            userIncrement.setOrderSn("qczj_"+camera.getId());
+            userIncrement.setIncrementStartTime(DateUserUtil.getDate(new Date()));
+            userIncrement.setIncrementEndTime("2100-01-01 00:00:00");
+            userIncrement.setIsExpired(0);
+            userIncrement.setRecStatus("A");
+            userIncrement.setCreateTime(DateUserUtil.getDate(new Date()));
+            userIncrement.setUpdateTime(DateUserUtil.getDate(new Date()));
+            userIncrementService.save(userIncrement);
+        }
+        return errorCodeList;
+    }
+}

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -13,7 +13,6 @@ import com.fdkankan.common.validation.Variable;
 import com.fdkankan.fyun.qiniu.QiniuUpload;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.ReceiverInfo;
 import com.fdkankan.ucenter.entity.User;
@@ -23,15 +22,14 @@ import com.fdkankan.ucenter.service.IReceiverInfoService;
 import com.fdkankan.ucenter.service.IUserIncrementService;
 import com.fdkankan.ucenter.service.IUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.request.RegisterParam;
 import com.fdkankan.ucenter.vo.request.ShipAddressParam;
 import com.fdkankan.ucenter.vo.request.UserParam;
 import com.fdkankan.ucenter.vo.response.UserVo;
 import org.apache.commons.lang3.StringUtils;
-import org.omg.CORBA.portable.ServantObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
@@ -85,15 +83,40 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         userEntity.setPassword(SecurityUtil.MD5(param.getPassword()));
         userEntity.setEmail(param.getEmail());
         userEntity.setUserName(param.getPhoneNum());
-        userEntity.setNickName(param.getPhoneNum());
+        userEntity.setNickName(param.getNickName());
         userEntity.setHead(ConstantUrl.DEFAULT_USER_HEAD);
         userEntity.setCountry(param.getCountry());
         userEntity.setStatus(1);
         userEntity.setIsNotice(1);
+        userEntity.setRecStatus("A");
+        userEntity.setCreateTime(DateUserUtil.getDate(new Date()));
+        userEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
         this.save(userEntity);
     }
 
     @Override
+    public int registerBatch(List<RegisterParam> paramList) {
+        List<User> users = new ArrayList<>();
+        for (RegisterParam param : paramList) {
+            User userEntity = new User();
+            userEntity.setPassword(SecurityUtil.MD5(param.getPassword()));
+            userEntity.setEmail(param.getEmail());
+            userEntity.setUserName(param.getPhoneNum());
+            userEntity.setNickName(param.getNickName());
+            userEntity.setHead(ConstantUrl.DEFAULT_USER_HEAD);
+            userEntity.setCountry(param.getCountry());
+            userEntity.setStatus(1);
+            userEntity.setIsNotice(1);
+            userEntity.setRecStatus("A");
+            userEntity.setCreateTime(DateUserUtil.getDate(new Date()));
+            userEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
+            users.add(userEntity);
+        }
+        this.saveBatch(users);
+        return users.size();
+    }
+
+    @Override
     public void updatePassword(String phoneNum, String password) {
         LambdaUpdateWrapper<User> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(User::getPassword,password)

src/main/java/com/fdkankan/ucenter/vo/request/RegisterParam.java

@@ -10,4 +10,5 @@ public class RegisterParam {
     private String country;
     private String confirmPwd;
     private String email;
+    private String nickName;
 }

src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-test
+        namespace: 4dkankan-qczj
         extension-configs:
           - data-id: 4dkankan-center-ucenter.yaml
             group: DEFAULT_GROUP
@@ -41,7 +41,7 @@ spring:
             refresh: true
       discovery:
         server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-test
+        namespace: 4dkankan-qczj