Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/feign/IUserClient.java

@@ -27,6 +27,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * User Feign接口类
 *
@@ -45,10 +47,16 @@
   String USER_INFO_BY_TYPE = API_PREFIX + "/user-info-by-type";
   String USER_INFO_BY_ID = API_PREFIX + "/user-info-by-id";
   String USER_INFO_BY_ACCOUNT = API_PREFIX + "/user-info-by-account";
   String USER_INFO_BY_PHONE = API_PREFIX + "/user-info-by-phone";
   String USER_INFO_BY_PHONE_OR_ACCOUNT = API_PREFIX + "/user-info-by-phone-or-account";
   String USER_AUTH_INFO = API_PREFIX + "/user-auth-info";
   String SAVE_USER = API_PREFIX + "/save-user";
   String REMOVE_USER = API_PREFIX + "/remove-user";

   String UPDATE_USER = API_PREFIX + "/upate-user";
   String REMOVE_USER = API_PREFIX + "/remove-user";
   String GET_ALL_USER_LIST = API_PREFIX+ "/get-all-user-list";

   String ENCRYPT_USER = API_PREFIX + "/encrypt-user";
   /**
    * 获取用户信息
    *
@@ -83,6 +91,26 @@
    * 获取用户信息
    *
    * @param tenantId 租户ID
    * @param phone  手机号
    * @return
    */
   @GetMapping(USER_INFO_BY_PHONE)
   R<List<User>> userInfoByPhone(@RequestParam("tenantId") String tenantId, @RequestParam("phone") String phone);

   /**
    * 获取用户信息
    *
    * @param tenantId 租户ID
    * @param phone  手机号或者账户
    * @return
    */
   @GetMapping(USER_INFO_BY_PHONE_OR_ACCOUNT)
   R<List<User>> userInfoByPhoneOrAccount(@RequestParam("tenantId") String tenantId, @RequestParam("phone") String phone);

   /**
    * 获取用户信息
    *
    * @param tenantId 租户ID
    * @param account  账号
    * @param userType 用户平台
    * @return
@@ -108,6 +136,9 @@
   @PostMapping(SAVE_USER)
   R<Boolean> saveUser(@RequestBody User user);

   @PostMapping(UPDATE_USER)
   R<Boolean> upateUser(@RequestBody User user);

   /**
    * 删除用户
    *
@@ -117,4 +148,13 @@
   @PostMapping(REMOVE_USER)
   R<Boolean> removeUser(@RequestParam("tenantIds") String tenantIds);

   @GetMapping(GET_ALL_USER_LIST)
   R<List<User>> getAllUserList();

   /**
    * 更新用户信息并加密
    * @return
    */
   @GetMapping(ENCRYPT_USER)
    String encryptUser();
}