This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch ddl in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 7b4142dbe6ea52e28b4ea08eaea46e341d840c77 Author: benjobs <[email protected]> AuthorDate: Thu Apr 4 17:50:15 2024 +0800 [Improve] project add new failed improve --- .../console/core/entity/Application.java | 9 ++++++++ .../streampark/console/core/entity/Project.java | 6 +++--- .../service/impl/AccessTokenServiceImpl.java | 6 ++---- .../system/service/impl/MenuServiceImpl.java | 3 --- .../system/service/impl/RoleServiceImpl.java | 24 +++++++++++----------- .../system/service/impl/TeamServiceImpl.java | 2 +- .../src/main/resources/db/data-h2.sql | 2 +- .../src/main/resources/db/schema-h2.sql | 1 + 8 files changed, 29 insertions(+), 24 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java index 198cfe1dc..255fa1afa 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java @@ -151,7 +151,10 @@ public class Application implements Serializable { private Integer resolveOrder; private Integer executionMode; + + @TableField(updateStrategy = FieldStrategy.IGNORED) private String dynamicProperties; + private Integer appType; /** determine if tracking status */ @@ -172,15 +175,19 @@ public class Application implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) private Date endTime; + @TableField(updateStrategy = FieldStrategy.IGNORED) private Long duration; /** checkpoint max failure interval */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer cpMaxFailureInterval; /** checkpoint failure rate interval */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer cpFailureRateInterval; /** Actions triggered after X minutes failed Y times: 1: send alert 2: restart */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer cpFailureAction; /** overview */ @@ -200,6 +207,7 @@ public class Application implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) private Long flinkClusterId; + @TableField(updateStrategy = FieldStrategy.IGNORED) private String description; private Date createTime; @@ -211,6 +219,7 @@ public class Application implements Serializable { /** 1: cicd (build from csv) 2: upload (upload local jar job) */ private Integer resourceFrom; + @TableField(updateStrategy = FieldStrategy.IGNORED) private String tags; private Boolean probing = false; 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 40439be42..addaf8af5 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 @@ -223,7 +223,7 @@ public class Project implements Serializable { } String mvn = getMvn(); - return mvn.concat(" ").concat(cmd); + return mvn.concat(" clean package -DskipTests ").concat(cmd); } private String getMvn() { @@ -278,10 +278,10 @@ public class Project implements Serializable { } private String getIllegalArgs(String param) { - Pattern pattern = Pattern.compile("(`.*?`)|(\\$\\((.*?)\\))"); + Pattern pattern = Pattern.compile("(`(.?|\\s)*`)|(\\$\\((.?|\\s)*\\))"); Matcher matcher = pattern.matcher(param); if (matcher.find()) { - return matcher.group(1) == null ? matcher.group(2) : matcher.group(1); + return matcher.group(1) == null ? matcher.group(3) : matcher.group(1); } Iterator<String> iterator = Arrays.asList(";", "|", "&", ">", "<").iterator(); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java index 3b982281e..676c8dab3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java @@ -116,10 +116,8 @@ public class AccessTokenServiceImpl extends ServiceImpl<AccessTokenMapper, Acces ? AccessToken.STATUS_DISABLE : AccessToken.STATUS_ENABLE; - AccessToken updateObj = new AccessToken(); - updateObj.setStatus(status); - updateObj.setId(tokenId); - return RestResponse.success(this.updateById(updateObj)); + tokenInfo.setStatus(status); + return RestResponse.success(this.updateById(tokenInfo)); } @Override diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java index 56d20b892..0ae4f0c0c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java @@ -26,7 +26,6 @@ import org.apache.streampark.console.system.entity.Menu; import org.apache.streampark.console.system.entity.User; import org.apache.streampark.console.system.mapper.MenuMapper; import org.apache.streampark.console.system.service.MenuService; -import org.apache.streampark.console.system.service.RoleMenuService; import org.apache.streampark.console.system.service.UserService; import org.apache.commons.lang3.StringUtils; @@ -57,8 +56,6 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me @Autowired private UserService userService; - @Autowired private RoleMenuService roleMenuService; - @Override public List<String> listPermissions(Long userId, Long teamId) { User user = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java index ed272fbc3..66c437d15 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java @@ -43,7 +43,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Optional; @@ -78,7 +78,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro this.save(role); String[] menuIds = role.getMenuId().split(StringPool.COMMA); - setRoleMenus(role, menuIds); + updateRoleMenus(role, menuIds); } @Override @@ -113,17 +113,17 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro menuId = menuId + StringPool.COMMA + Constant.APP_MENU_ID; } String[] menuIds = menuId.split(StringPool.COMMA); - setRoleMenus(role, menuIds); + updateRoleMenus(role, menuIds); } - private void setRoleMenus(Role role, String[] menuIds) { - Arrays.stream(menuIds) - .forEach( - menuId -> { - RoleMenu rm = new RoleMenu(); - rm.setMenuId(Long.valueOf(menuId)); - rm.setRoleId(role.getRoleId()); - this.roleMenuMapper.insert(rm); - }); + private void updateRoleMenus(Role role, String[] menuIds) { + List<RoleMenu> roleMenus = new ArrayList<>(); + for (String menuId : menuIds) { + RoleMenu rm = new RoleMenu(); + rm.setMenuId(Long.valueOf(menuId)); + rm.setRoleId(role.getRoleId()); + roleMenus.add(rm); + } + roleMenuService.saveBatch(roleMenus); } } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java index fea8bb8af..ac7142380 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java @@ -121,7 +121,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements Te @Override public void updateTeam(Team team) { Team oldTeam = - Optional.ofNullable(this.getById(team)) + Optional.ofNullable(this.getById(team.getId())) .orElseThrow( () -> new IllegalArgumentException( diff --git a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql index 3434335ff..32d36d41c 100644 --- a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql +++ b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql @@ -34,7 +34,7 @@ insert into `t_flink_effective` values (100000, 100000, 2, 100000, now()); -- ---------------------------- -- Records of t_flink_project -- ---------------------------- -insert into `t_flink_project` values (100000, 100000, 'streampark-quickstart', 'https://github.com/apache/incubator-streampark-quickstart', 'dev', null, null, null, null, null, 1, 1, null, 'streampark-quickstart', -1, now(), now()); +insert into `t_flink_project` values (100000, 100000, 'streampark-quickstart', 'https://github.com/apache/incubator-streampark-quickstart', 'dev', null, null, null, null, null, null, 1, 1, null, 'streampark-quickstart', -1, now(), now()); -- ---------------------------- -- Records of t_flink_sql diff --git a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql index 30296483a..3354234b6 100644 --- a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql +++ b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql @@ -173,6 +173,7 @@ create table if not exists `t_flink_project` ( `branches` varchar(64) default null, `user_name` varchar(64) default null, `password` varchar(64) default null, + `salt` varchar(26) default null, `prvkey_path` varchar(128) default null, `pom` varchar(255) default null, `build_args` varchar(255) default null,
