Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev

youxiw2000
2 parents a283f636 e8346572
Showing 5 changed files with 7 additions and 4 deletions
trash-admin/src/main/resources/application-dev.yml
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
@@ -9,6 +9,7 @@ trash:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
+#    profile: D:/trash/uploadPath
 #    profile: E:/trash/uploadPath
     profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
@@ -50,8 +50,8 @@ public class GarbageUserController {
     @GetMapping("/send/verify")
     public Result<?> sendVerify(@RequestParam("tel") String tel) {
         try {
-            garUserService.sendVerify(tel);
-            return Result.OK();
+            String code = garUserService.sendVerify(tel);
+            return Result.OK(code);
         } catch (Exception e) {
             e.printStackTrace();
             return Result.ERROR();
@@ -18,6 +18,7 @@ public class OrderDetailVo {
     private Integer garEvaluateFlag;
 	private Boolean garHandleEvaluateFlag;
+	private String garOrderCarType;
     /**
      * 订单地址
      */
@@ -20,7 +20,7 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
     String login(LoginDto user);
-    void sendVerify(String tel) throws ClientException;
+    String sendVerify(String tel) throws ClientException;
     List<GarAddress> queryAddress(String type);
@@ -122,7 +122,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     }
     @Override
-    public void sendVerify(String tel) throws ClientException {
+    public String sendVerify(String tel) throws ClientException {
         //随机生成6位数字验证码
         String validateCode = ValidateCodeUtil.generatorCode(4);
         //给用户发送验证码
@@ -130,6 +130,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         // 保存redis
         System.out.println("code:" + validateCode);
         redisCache.setCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + tel, validateCode, 60, TimeUnit.SECONDS);
+        return validateCode;
     }
     @Override