[incubator-streampark] branch dev updated: [Bug] When upgrading from 1.2.3 to 2.0.0, the configuration items of maven setting are incorrect (#2073)

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev by this push:
     new e4b1989f5 [Bug] When upgrading from 1.2.3 to 2.0.0, the configuration 
items of maven setting are incorrect (#2073)
e4b1989f5 is described below

commit e4b1989f57e709078f893dc52826f6848a4eb2cf
Author: macksonmu <mackson...@gmail.com>
AuthorDate: Mon Nov 21 20:08:37 2022 +0800

    [Bug] When upgrading from 1.2.3 to 2.0.0, the configuration items of maven 
setting are incorrect (#2073)
    
    * [Bug] An error is reported when the mysql upgrade sql statement is 
executed #2048
    
    * [Bug] After building the project, the build time is not updated #2055
    
    * [Bug] When upgrading from 1.2.3 to 2.0.0, the configuration items of 
maven setting are not displayed normally #2072
    
    Co-authored-by: mucj7 <mu...@chinaunicom.cn>
---
 .../src/assembly/script/upgrade/mysql/2.0.0.sql                      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/2.0.0.sql
 
b/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/2.0.0.sql
index 35eec716b..888325aee 100644
--- 
a/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/2.0.0.sql
+++ 
b/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/2.0.0.sql
@@ -279,9 +279,12 @@ change column `TITLE` `setting_name` varchar(255) collate 
utf8mb4_general_ci def
 change column `DESCRIPTION` `description` varchar(255) collate 
utf8mb4_general_ci default null,
 change column `TYPE` `type` tinyint not null comment '1: input 2: boolean 3: 
number',
 add primary key (`setting_key`);
+
 insert into `t_setting` values (14, 'docker.register.namespace', null, 'Docker 
Register Image namespace', 'Docker命名空间', 1);
 insert into `t_setting` values (15, 'streampark.maven.settings', null, 'Maven 
Settings File Path', 'Maven Settings.xml 完整路径', 1);
+insert into `t_setting` values (16, 'ingress.mode.default', null, 
'Automatically generate an nginx-based ingress by passing in a domain name', 
'Ingress域名地址', 1);
 
+update t_setting set setting_key = replace(setting_key, 'streamx', 
'streampark') where setting_key like 'streamx%';
 
 -- t_user
 alter table `t_user`
@@ -304,7 +307,5 @@ create table `t_variable` (
   unique key `un_team_vcode_inx` (`team_id`,`variable_code`) using btree
 ) engine=innodb auto_increment=100000 default charset=utf8mb4 
collate=utf8mb4_general_ci;
 
-insert into `t_setting` values (16, 'ingress.mode.default', null, 
'Automatically generate an nginx-based ingress by passing in a domain name', 
'Ingress域名地址', 1);
-
 set foreign_key_checks = 1;