From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/feign/IUserClient.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/feign/IUserClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/feign/IUserClient.java
index c00458d..8f90767 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/feign/IUserClient.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/feign/IUserClient.java
@@ -48,10 +48,15 @@
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";
/**
* 获取用户信息
*
@@ -96,6 +101,16 @@
* 获取用户信息
*
* @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
@@ -121,6 +136,9 @@
@PostMapping(SAVE_USER)
R<Boolean> saveUser(@RequestBody User user);
+ @PostMapping(UPDATE_USER)
+ R<Boolean> upateUser(@RequestBody User user);
+
/**
* 删除用户
*
@@ -130,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();
}
--
Gitblit v1.9.3