20211117修改不用验证码绑定手机号的接口

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/HolidaysDto.java

@@ -0,0 +1,15 @@
+package com.ccsens.cloudutil.bean.tall.dto;
+
+import lombok.Data;
+
+/**
+ * @author 逗
+ */
+@Data
+public class HolidaysDto {
+    @Data
+    public static class GetHolidays{
+        private Long startTime;
+        private Long endTime;
+    }
+}

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/HolidaysVo.java

@@ -0,0 +1,18 @@
+package com.ccsens.cloudutil.bean.tall.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Data
+public class HolidaysVo {
+
+    @Data
+    public static class Holidays{
+        private List<String> workday;
+        private List<String> nonWorkday;
+    }
+}

cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java

@@ -1,7 +1,9 @@
 package com.ccsens.cloudutil.feign;
 
+import com.ccsens.cloudutil.bean.tall.dto.HolidaysDto;
 import com.ccsens.cloudutil.bean.tall.dto.LogDto;
 import com.ccsens.cloudutil.bean.tall.dto.ProjectDto;
+import com.ccsens.cloudutil.bean.tall.vo.HolidaysVo;
 import com.ccsens.cloudutil.config.FeignTokenConfig;
 import com.ccsens.util.JsonResponse;
 import feign.hystrix.FallbackFactory;
@@ -46,6 +48,12 @@ public interface Tall3FeignClient {
      */
     @RequestMapping("project/saveUserProject")
     JsonResponse saveUserProject(ProjectDto.SaveUserProject projectDto);
+
+    /**
+     * tall3内保存用户项目列表
+     */
+    @RequestMapping("holidays")
+    JsonResponse<HolidaysVo.Holidays> getHolidays(HolidaysDto.GetHolidays getHolidays);
 }
 
 @Slf4j
@@ -75,6 +83,10 @@ class Tall3FeignClientFallBack implements FallbackFactory<Tall3FeignClient> {
                 return null;
             }
 
+            @Override
+            public JsonResponse<HolidaysVo.Holidays> getHolidays(HolidaysDto.GetHolidays getHolidays) {
+                    return JsonResponse.newInstance().fail();
+            }
 
         };
     }

signin/src/main/java/com/ccsens/signin/service/RelevanceUserService.java

@@ -42,6 +42,7 @@ public class RelevanceUserService implements IRelevanceUserService {
                 UserDto.PhoneAndUserId phoneAndUserId = new UserDto.PhoneAndUserId(phone, userId);
                 log.info("调用业务系统的接口关联成员：{}--{}",url,phoneAndUserId);
                 RestTemplateUtil.postBody(url, phoneAndUserId);
+                //TODO 异常处理
             }catch (Exception e){
                 log.error("接口调用异常",e);
             }
@@ -63,6 +64,7 @@ public class RelevanceUserService implements IRelevanceUserService {
                 UserDto.MergeUser mergeUser = new UserDto.MergeUser(oldUserId, newUserId);
                 log.info("调用业务系统的接口合并用户：{}--{}",url,mergeUser);
                 RestTemplateUtil.postBody(url, mergeUser);
+                //TODO 异常处理
             }catch (Exception e){
                 log.error("接口调用异常",e);
             }

signin/src/main/java/com/ccsens/signin/service/UserService.java

@@ -859,7 +859,7 @@ public class UserService implements IUserService {
                 authDao.insertSelective(auth);
 
                 //TODO 给所有手机号一样的角色添加userId
-//                relevanceUserService.relevancePhone(phone, currentUserId);
+                relevanceUserService.relevancePhone(phone, currentUserId);
                 //返回值
                 userSignVo = new UserVo.UserSign();
                 userSignVo.setAuthId(auth.getId());

util/src/test/java/com/ccsens/util/OtherTest.java

@@ -236,21 +236,29 @@ public class OtherTest {
 
     @Test
     public void test11() {
-        System.out.println(DateUtil.today());
-        DateUtil.today();
-        System.out.println(DateUtil.parse(DateUtil.today()).getTime());
-
-        List<String> s = new ArrayList<>();
-        s.add("11");
-        s.add("22");
-
-        List<String> x = new ArrayList<>();
-        x.add("33");
-        x.add("44");
+//        System.out.println(DateUtil.today());
+//        DateUtil.today();
+//        System.out.println(DateUtil.parse(DateUtil.today()).getTime());
+//
+//        List<String> s = new ArrayList<>();
+//        s.add("11");
+//        s.add("22");
+//
+//        List<String> x = new ArrayList<>();
+//        x.add("33");
+//        x.add("44");
+//
+//        s.addAll(x);
+//
 
-        s.addAll(x);
+//        Random random = new Random();
+//        for (int i = 0; i < 10; i++) {
+//            System.out.println(random.nextInt(40) + 40);
+//        }
 
-        System.out.println(s);
+        int max=100,min=1;
+        double ran2 = (Math.random()*(max-min));
+        System.out.println(ran2);
     }
 
     @Test