This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new d4ef378ec [Improve] project build args improvements
d4ef378ec is described below
commit d4ef378ec1c6625abd4ab7ed0a4229836c2d27c5
Author: benjobs <[email protected]>
AuthorDate: Sat Mar 16 08:26:09 2024 +0800
[Improve] project build args improvements
---
.../streampark/console/core/entity/Project.java | 2 +-
.../main/resources/mapper/system/UserMapper.xml | 36 ++++++++++++++++------
.../src/api/base/system.ts | 4 ---
3 files changed, 27 insertions(+), 15 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
index 03e8c561b..e292b058b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
@@ -256,7 +256,7 @@ public class Project implements Serializable {
return matcher.group(1) == null ? matcher.group(2) : matcher.group(1);
}
- Iterator<String> iterator = Arrays.asList(";", "|", "&", ">").iterator();
+ Iterator<String> iterator = Arrays.asList(";", "|", "&", ">",
"<").iterator();
String[] argsList = param.split("\\s+");
while (iterator.hasNext()) {
String chr = iterator.next();
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
index e819aa114..8f86ab2b2 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
@@ -23,7 +23,6 @@
<result column="nick_name" jdbcType="VARCHAR" property="nickName"/>
<result column="password" jdbcType="VARCHAR" property="password"/>
<result column="email" jdbcType="VARCHAR" property="email"/>
- <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
<result column="status" jdbcType="CHAR" property="status"/>
<result column="create_time" jdbcType="TIMESTAMP"
property="createTime"/>
<result column="modify_time" jdbcType="TIMESTAMP"
property="modifyTime"/>
@@ -34,40 +33,57 @@
<result column="login_type" jdbcType="INTEGER" property="loginType"/>
</resultMap>
+ <sql id="userColumn">
+ u.user_id,
+ u.username,
+ u.nick_name,
+ u.user_type,
+ u.login_type,
+ u.status,
+ u.email,
+ u.create_time,
+ u.modify_time,
+ u.sex,
+ u.description
+ </sql>
+
<select id="findUserDetail"
resultType="org.apache.streampark.console.system.entity.User"
parameterType="org.apache.streampark.console.system.entity.User">
- select * from t_user
+ select <include refid="userColumn"></include>
+ from t_user u
<where>
<if test="user.username != null and user.username != ''">
<if test="_databaseId == 'mysql'">
- and username like concat('%', #{user.username},'%')
+ and u.username like concat('%', #{user.username},'%')
</if>
<if test="_databaseId == 'pgsql'">
- and username like '%' || #{user.username} || '%'
+ and u.username like '%' || #{user.username} || '%'
</if>
</if>
<if test="user.createTimeFrom != null and user.createTimeFrom
!=''">
- and create_time > #{user.createTimeFrom}
+ and u.create_time > #{user.createTimeFrom}
</if>
<if test="user.createTimeTo!= null and user.createTimeTo !=''">
- and create_time < #{user.createTimeTo}
+ and u.create_time < #{user.createTimeTo}
</if>
<if test="user.sex != null and user.sex != ''">
- and sex = #{user.sex}
+ and u.sex = #{user.sex}
</if>
<if test="user.status != null and user.status != ''">
- and status = #{user.status}
+ and u.status = #{user.status}
</if>
</where>
</select>
<select id="getNoTokenUser"
resultType="org.apache.streampark.console.system.entity.User"
parameterType="org.apache.streampark.console.system.entity.User">
- select u.* from t_user u left join t_access_token t
+ select <include refid="userColumn"></include>
+ from t_user u left join t_access_token t
on u.user_id = t.user_id
where t.user_id is null
</select>
<select id="findByAppOwner"
resultType="org.apache.streampark.console.system.entity.User"
parameterType="org.apache.streampark.console.system.entity.User">
- select u.* from t_user u inner join (
+ select <include refid="userColumn"></include>
+ from t_user u inner join (
select distinct(user_id) as user_id
from t_flink_app
where team_id = #{teamId}
diff --git
a/streampark-console/streampark-console-webapp/src/api/base/system.ts
b/streampark-console/streampark-console-webapp/src/api/base/system.ts
index 29ce5fecc..d117f7b57 100644
--- a/streampark-console/streampark-console-webapp/src/api/base/system.ts
+++ b/streampark-console/streampark-console-webapp/src/api/base/system.ts
@@ -28,7 +28,6 @@ enum Api {
MenuList = '/menu/list',
RoleMenu = '/role/menu',
RolePageList = '/role/list',
- UserList = '/user/list',
}
export const getMenuList = (params?: MenuParams): Promise<MenuListModel> => {
@@ -47,6 +46,3 @@ export const getRoleMenu = (params?: MenuParams) =>
*/
export const getRoleListByPage = (params?: RolePageParams) =>
defHttp.post<RolePageListGetResultModel>({ url: Api.RolePageList, params });
-
-export const getUserListByPage = (params?: BasicPageParams) =>
- defHttp.post<UserListGetResultModel>({ url: Api.UserList, params });
