diff --git a/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java b/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java index 63556e2..3d2e4a6 100644 --- a/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java +++ b/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java @@ -3,13 +3,11 @@ package com.bwie.auth.controller; import com.alibaba.fastjson.JSON; import com.bwie.auth.service.AuthService; import com.bwie.common.pojo.DTO.UserDto; -import com.bwie.common.pojo.User; import com.bwie.common.pojo.vo.UserVo; import com.bwie.common.result.Result; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; diff --git a/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java b/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java index 19fdb3d..e1174ec 100644 --- a/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java +++ b/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java @@ -41,7 +41,7 @@ public class AuthServiceImpl implements AuthService { Result userResult = userFeignService.sendCode(userPhone); User user = userResult.getData(); if (user==null){ - return Result.success("手机号不能为空"); + return Result.success("手机号为空"); } String code=""; for (int i = 0; i < 4; i++) { @@ -55,8 +55,8 @@ public class AuthServiceImpl implements AuthService { public Result users(UserVo userVo) { //feign调用查出sql数据 - Result userName = userFeignService.sendCode(userVo.getUserPhone()); - User user = userName.getData(); + Result userResult = userFeignService.sendCode(userVo.getUserPhone()); + User user = userResult.getData(); if (user==null){ return Result.error("该用户不存在，请先注册"); } diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Fang.java b/bwie-common/src/main/java/com/bwie/common/pojo/Fang.java deleted file mode 100644 index 4bdedfc..0000000 --- a/bwie-common/src/main/java/com/bwie/common/pojo/Fang.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bwie.common.pojo; - -public class Fang { - public void Fang(){ - System.out.println("方十八是大帅比"); - } -} diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/LogMake.java b/bwie-common/src/main/java/com/bwie/common/pojo/LogMake.java index 20998d9..900138b 100644 --- a/bwie-common/src/main/java/com/bwie/common/pojo/LogMake.java +++ b/bwie-common/src/main/java/com/bwie/common/pojo/LogMake.java @@ -13,20 +13,25 @@ import java.util.Date; * @author FangShiBa * @date 2023/12/10 * @apiNote + * 预约表 */ @Data @AllArgsConstructor @NoArgsConstructor @ToString public class LogMake { - /* + /** 预约编号 */ private Integer makeId; - /* + /** 车辆编号 */ private Integer carId; + /** + * 车牌号 + */ + private String carNum; /* 车位状态(空: 1, 已预约: 2, 无: 3) */ diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Stop.java b/bwie-common/src/main/java/com/bwie/common/pojo/Stop.java index 64ed551..8538c08 100644 --- a/bwie-common/src/main/java/com/bwie/common/pojo/Stop.java +++ b/bwie-common/src/main/java/com/bwie/common/pojo/Stop.java @@ -27,15 +27,12 @@ public class Stop { 车辆编号 */ private Integer carId; + private String carNum; /* 用户编号 */ private Integer userId; - /* - 停车场编号 - */ - private Integer parkingId; - /* + /** 开始停车时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/bwie-models/bwie-user/src/main/java/com/bwie/user/controller/UserController.java b/bwie-models/bwie-user/src/main/java/com/bwie/user/controller/UserController.java index 72b7946..828864c 100644 --- a/bwie-models/bwie-user/src/main/java/com/bwie/user/controller/UserController.java +++ b/bwie-models/bwie-user/src/main/java/com/bwie/user/controller/UserController.java @@ -31,7 +31,6 @@ public class UserController { public Result sendCode(@PathVariable String userPhone){ log.info("功能描述：查询后台是否存在这个手机号,请求URI:{},请求方式:{},请求参数:{}",request.getServletPath(),request.getMethod(),userPhone); - User user=userService.sendCode(userPhone); Result result =Result.success(user); log.info("功能描述：查询后台是否存在这个手机号,请求URI:{},请求方式:{},响应结果:{}",request.getServletPath(),request.getMethod(), JSON.toJSONString(result)); @@ -58,6 +57,7 @@ public class UserController { log.info("功能描述：当用户不存在时，请注册,请求URI:{},请求方式:{},请求参数:{}",request.getServletPath(),request.getMethod(),userVo); Result result=userService.register(userVo); + System.out.println(userVo); log.info("功能描述：当用户不存在时，请注册,请求URI:{},请求方式:{},响应结果:{}",request.getServletPath(),request.getMethod(), JSON.toJSONString(result)); return result; } diff --git a/bwie-models/bwie-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java b/bwie-models/bwie-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java index 02a841f..e61afb7 100644 --- a/bwie-models/bwie-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java +++ b/bwie-models/bwie-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java @@ -55,6 +55,6 @@ public class UserServiceImpl implements UserService { throw new RuntimeException(e); } - return Result.success("http://111.229.234.119:8848/"+url,"上传成功"); + return Result.success("http://111.229.234.119:8888/"+url,"上传成功"); } } diff --git a/bwie-models/bwie-user/src/main/resources/bootstrap.yml b/bwie-models/bwie-user/src/main/resources/bootstrap.yml index eb558c6..f795006 100644 --- a/bwie-models/bwie-user/src/main/resources/bootstrap.yml +++ b/bwie-models/bwie-user/src/main/resources/bootstrap.yml @@ -28,3 +28,15 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +fdfs: + so-timeout: 1500 # socket 连接时长 + connect-timeout: 600 # 连接 tracker 服务器超时时长 + # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流 + tracker-list: 111.229.234.119:22122 + web-server-url: 111.229.234.119:8888 + pool: + jmx-enabled: false + # 生成缩略图 + thumb-image: + height: 500 + width: 500 \ No newline at end of file