Merge remote-tracking branch 'origin/master'

4dkankan-center-platform/src/main/java/com/fdkankan/PlatformApplication.java

@@ -1,28 +1,23 @@
 package com.fdkankan;
 
-import com.fdkankan.common.exception.GlobalExceptionHandler;
 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.context.annotation.Bean;
 
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients //扫描包
+@EnableFeignClients
 @MapperScan("com.fdkankan.**.mapper")
-public class PlatformApplication {
+public class PlatformApplication  {
 
 	public static void main(String[] args) {
 		SpringApplication.run(PlatformApplication.class, args);
 	}
 
-	@Bean
-	public GlobalExceptionHandler globalExceptionHandler(){
-		return new GlobalExceptionHandler();
-	}
+
 }
 
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentAuditController.java

@@ -2,6 +2,8 @@ package com.fdkankan.agent.controller;
 
 
 import com.fdkankan.agent.service.IAgentAuditService;
+import com.fdkankan.common.constant.ConstantRegex;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,15 +23,37 @@ public class AgentAuditController {
 
     /**
      * 保存申请信息
+     * @param name  经销商名称
+     * @param address   地址
+     * @param country   国家
+     * @param surName   申请人的姓
+     * @param userName  申请人的名字
+     * @param post  申请人职位
+     * @param areaCode  区号
+     * @param phone  手机号
+     * @param email 邮箱地址
+     * @param region  地区
      * @return
+     * @throws Exception
      */
     @PostMapping("/agentAduit/save")
     public ResultData agentAuditSave(
-            @RequestParam (value = "name",required = true) String name
-
+            @RequestParam(required = true) String name,
+            @RequestParam(required = true) String address,
+            @RequestParam(required = true) String country,
+            @RequestParam(required = true) String surName,
+            @RequestParam(required = true) String userName,
+            @RequestParam(required = true) String post,
+            @RequestParam(required = true) String areaCode,
+            @RequestParam(required = true) String phone,
+            @RequestParam(required = true) String email,
+            @RequestParam(required = true) String region
     ) throws Exception {
 
-        System.out.println(1/0);
+        if(!email.matches(ConstantRegex.EMAIL_REGEX)){
+            return ResultData.error(ErrorCode.FAILURE_CODE_3019);
+        }
+
         return ResultData.ok("");
     }
 

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantRegex.java

@@ -0,0 +1,9 @@
+package com.fdkankan.common.constant;
+
+public class ConstantRegex {
+
+    public static final String PASSWORD_REGEX = "^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[\\da-zA-Z`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]{8,16}$";
+
+    public static final String EMAIL_REGEX = "^[A-Za-z\\d]+([_.-][A-Za-z\\d]+)*@([A-Za-z\\d]+[-.])+[A-Za-z\\d]{2,4}$";
+
+}

4dkankan-common/src/main/java/com/fdkankan/common/constant/ErrorCode.java

@@ -0,0 +1,57 @@
+package com.fdkankan.common.constant;
+
+public enum ErrorCode {
+
+    FAILURE_CODE_3001(3001, "缺少必要参数"),
+    FAILURE_CODE_3002(3002, "访问异常!"),
+    FAILURE_CODE_3003(3003, "非法访问!"),
+    FAILURE_CODE_3004(3004, "用户未登录"),
+    FAILURE_CODE_3005(3005, "验证码已过期"),
+    FAILURE_CODE_3006(3006, "验证码错误"),
+    FAILURE_CODE_3007(3007, "昵称已存在"),
+    FAILURE_CODE_3008(3008, "该手机已被注册"),
+    FAILURE_CODE_3009(3009, "两次输入的密码不一致"),
+    FAILURE_CODE_3010(3010, "昵称长度错误"),
+    FAILURE_CODE_3011(3011, "密码需要包含英文大小写、数字，长度8-16字符"),
+    FAILURE_CODE_3012(3012, "昵称包含敏感词"),
+    FAILURE_CODE_3013(3013, "手机号码格式错误"),
+    FAILURE_CODE_3014(3014, "账号或密码不正确"),
+    FAILURE_CODE_3015(3015, "用户不存在"),
+    FAILURE_CODE_3016(3016, "登录失败，账号无权访问"),
+    FAILURE_CODE_3017(3017, "空文件"),
+    FAILURE_CODE_3018(3018, "需要上传或使用的文件不存在"),
+    FAILURE_CODE_3019(3019, "邮箱格式不正确"),
+    FAILURE_CODE_3020(3020, "邮箱地址已存在"),
+    FAILURE_CODE_3021(3021, "账号不存在，请核对后重新输入。"),
+    FAILURE_CODE_3022(3022, "该场景已添加协作者，请先取消协作后再添加"),
+    FAILURE_CODE_3023(3023, "手机验证码获取验证码次数过多,请明天再试"),
+    FAILURE_CODE_3024(3024, "不能将场景协作给自己"),
+    FAILURE_CODE_3025(3025, "不能将相机分配给自己"),
+    FAILURE_CODE_3026(3026, "有部分场景已存在协作者，请先取消协作后再添加"),
+    FAILURE_CODE_3027(3027, "原密码错误"),
+    FAILURE_CODE_3028(3028, "角色已存在"),
+    FAILURE_CODE_3029(3029, "当前角色存在关联的用户，请先删除用户或修改用户所属角色"),
+    FAILURE_CODE_3030(3030, "当前增值权益不存在"),
+    FAILURE_CODE_3031(3031, "相机已绑定"),
+    FAILURE_CODE_3032(3032, "当前相机已被授权，请选择另外相机绑定"),
+    FAILURE_CODE_3033(3033, "60秒内不能重复获取验证码"),
+    ;
+
+    private Integer code;
+    private String message;
+
+    private ErrorCode(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+
+}

4dkankan-common/src/main/java/com/fdkankan/common/response/ResultData.java

@@ -1,5 +1,6 @@
 package com.fdkankan.common.response;
 
+import com.fdkankan.common.constant.ErrorCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -24,6 +25,10 @@ public class ResultData implements Serializable {
      */
     private Object data;
     /**
+     * 后端返回结果
+     */
+    private Boolean success;
+    /**
      * 响应时间戳
      */
     private long timestamp = Calendar.getInstance().getTimeInMillis();
@@ -35,21 +40,25 @@ public class ResultData implements Serializable {
         return ok("", data);
     }
     public static ResultData ok(String msg, Object data) {
-        return base(200, msg, data);
+        return base(200, msg, data,true);
     }
 
-    public static  ResultData error(int code, String msg) {
-        return error(code, msg, "");
-    }
+    public static ResultData error(int code, String msg) {
+        return error(code, msg, ""); }
     public static ResultData error(int code, String msg, Object data) {
-        return base(code, msg, data);
+        return base(code, msg, data,false);
+    }
+
+    public static ResultData error(ErrorCode errorCode) {
+        return error(errorCode.code(), errorCode.message());
     }
 
-    private static ResultData  base(int code, String msg, Object data) {
+    private static ResultData  base(int code, String msg, Object data,Boolean success) {
         ResultData rd = new ResultData();
         rd.setCode(code);
         rd.setMessage(msg);
         rd.setData(data);
+        rd.setSuccess(success);
         return rd;
     }
 }