Skip to content

Commit 7c43295

Browse files
Zzzz-zmyZzm0809actions-user
authored
[Bug] Fix pg bug (#4009)
Co-authored-by: Zzm0809 <Zzm0809@users.noreply.github.com> Co-authored-by: GH Action - Upstream Sync <action@github.com>
1 parent 52d3bc7 commit 7c43295

File tree

5 files changed

+339
-7
lines changed

5 files changed

+339
-7
lines changed

‎dinky-admin/src/main/java/org/dinky/configure/MybatisPlusConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class MybatisPlusConfig {
8080
"dinky_task_version");
8181

8282
@Bean
83-
@Profile("pgsql")
83+
@Profile("postgresql")
8484
public PostgreSQLQueryInterceptor postgreSQLQueryInterceptor() {
8585
return new PostgreSQLQueryInterceptor();
8686
}
@@ -91,7 +91,7 @@ public PostgreSQLQueryInterceptor postgreSQLQueryInterceptor() {
9191
* @return {@linkplain PostgreSQLPrepareInterceptor}
9292
*/
9393
@Bean
94-
@Profile("pgsql")
94+
@Profile("postgresql")
9595
public PostgreSQLPrepareInterceptor postgreSQLPrepareInterceptor() {
9696
return new PostgreSQLPrepareInterceptor();
9797
}

‎dinky-admin/src/main/resources/db/migration/postgresql/V20241205.1.2.0__release.sql‎

Lines changed: 329 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,329 @@
1+
2+
CREATE OR REPLACE TRIGGER set_update_time_dinky_user
3+
BEFORE UPDATE
4+
ON public.dinky_user
5+
FOR EACH ROW
6+
EXECUTE FUNCTION trigger_set_timestamp();
7+
8+
9+
10+
11+
-- Table structure for public.dinky_resources
12+
CREATE TABLE IF NOT EXISTS public.dinky_resources_backup
13+
(
14+
id SERIAL PRIMARY KEY NOT NULL,
15+
file_name VARCHAR(64),
16+
description VARCHAR(255),
17+
user_id INT,
18+
type SMALLINT,
19+
size BIGINT,
20+
pid INT,
21+
full_name VARCHAR(255),
22+
is_directory boolean,
23+
create_time TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
24+
update_time TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
25+
creator INT,
26+
updater INT
27+
);
28+
29+
CREATE UNIQUE INDEX IF NOT EXISTS dinky_resources_un1 ON public.dinky_resources_backup (full_name, type);
30+
31+
COMMENT ON TABLE public.dinky_resources_backup IS 'resources';
32+
33+
COMMENT ON COLUMN public.dinky_resources_backup.id IS 'key';
34+
COMMENT ON COLUMN public.dinky_resources_backup.file_name IS 'file name';
35+
COMMENT ON COLUMN public.dinky_resources_backup.user_id IS 'user id';
36+
COMMENT ON COLUMN public.dinky_resources_backup.type IS 'resource type,0:FILE，1:UDF';
37+
COMMENT ON COLUMN public.dinky_resources_backup.size IS 'resource size';
38+
39+
-- public.dinky_git_project
40+
CREATE OR REPLACE TRIGGER update_dinky_dinky_resources
41+
BEFORE UPDATE
42+
ON public.dinky_resources_backup
43+
FOR EACH ROW
44+
EXECUTE FUNCTION trigger_set_timestamp();
45+
46+
insert into public.dinky_resources_backup(id, file_name, description, user_id, type, size, pid, full_name, is_directory, create_time, update_time, creator, updater)
47+
select id, file_name, description, user_id, type, size, pid, full_name,
48+
case when is_directory = 0 then false else true end as is_directory
49+
, create_time, update_time, creator, updater
50+
from public.dinky_resources;
51+
52+
drop table if exists public.dinky_resources;
53+
alter table public.dinky_resources_backup rename to dinky_resources;
54+
55+
56+
57+
58+
59+
60+
61+
-- ----------------------------
62+
-- Table structure for public.dinky_alert_instance
63+
-- ----------------------------
64+
65+
66+
CREATE TABLE IF NOT EXISTS public.dinky_alert_instance_backup
67+
(
68+
id SERIAL PRIMARY KEY NOT NULL,
69+
name VARCHAR(50) NOT NULL,
70+
tenant_id INT NOT NULL DEFAULT 1,
71+
type VARCHAR(50),
72+
params TEXT,
73+
enabled boolean DEFAULT false,
74+
create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
75+
update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
76+
creator INT DEFAULT NULL,
77+
updater INT DEFAULT NULL,
78+
UNIQUE (name, tenant_id)
79+
);
80+
81+
COMMENT
82+
ON COLUMN public.dinky_alert_instance_backup.id IS 'id';
83+
COMMENT
84+
ON COLUMN public.dinky_alert_instance_backup.name IS 'alert instance name';
85+
COMMENT
86+
ON COLUMN public.dinky_alert_instance_backup.tenant_id IS 'tenant id';
87+
COMMENT
88+
ON COLUMN public.dinky_alert_instance_backup.type IS 'alert instance type such as: DingTalk,Wechat(Webhook,app) Feishu ,email';
89+
COMMENT
90+
ON COLUMN public.dinky_alert_instance_backup.params IS 'configuration';
91+
COMMENT
92+
ON COLUMN public.dinky_alert_instance_backup.enabled IS 'is enable';
93+
COMMENT
94+
ON COLUMN public.dinky_alert_instance_backup.create_time IS 'create time';
95+
COMMENT
96+
ON COLUMN public.dinky_alert_instance_backup.update_time IS 'update time';
97+
COMMENT
98+
ON COLUMN public.dinky_alert_instance_backup.creator IS 'creator user id';
99+
COMMENT
100+
ON COLUMN public.dinky_alert_instance_backup.updater IS 'updater user id';
101+
COMMENT
102+
ON TABLE public.dinky_alert_instance_backup IS 'Alert instance';
103+
104+
105+
CREATE OR REPLACE TRIGGER set_update_time_dinky_alert_instance
106+
BEFORE UPDATE
107+
ON public.dinky_alert_instance_backup
108+
FOR EACH ROW
109+
EXECUTE FUNCTION trigger_set_timestamp();
110+
111+
112+
insert into public.dinky_alert_instance_backup(id, name, tenant_id, type, params, enabled, create_time, update_time, creator, updater)
113+
select id, name, tenant_id, type, params,
114+
case when enabled = 0 then false else true end as enabled
115+
, create_time, update_time, creator, updater
116+
from public.dinky_alert_instance;
117+
118+
drop table if exists public.dinky_alert_instance;
119+
alter table public.dinky_alert_instance_backup rename to dinky_alert_instance;
120+
121+
122+
123+
124+
125+
126+
127+
128+
129+
-- ----------------------------
130+
-- Table structure for public.dinky_alert_group
131+
-- ----------------------------
132+
133+
CREATE TABLE IF NOT EXISTS public.dinky_alert_group_backup
134+
(
135+
id SERIAL PRIMARY KEY NOT NULL,
136+
name VARCHAR(50) NOT NULL,
137+
tenant_id INT NOT NULL DEFAULT 1,
138+
alert_instance_ids TEXT,
139+
note VARCHAR(255) DEFAULT NULL,
140+
enabled boolean DEFAULT false,
141+
create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
142+
update_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
143+
creator INT DEFAULT NULL,
144+
updater INT DEFAULT NULL,
145+
CONSTRAINT alert_group_un_idx UNIQUE (name, tenant_id)
146+
);
147+
148+
COMMENT
149+
ON COLUMN public.dinky_alert_group_backup.id IS 'id';
150+
COMMENT
151+
ON COLUMN public.dinky_alert_group_backup.name IS 'alert group name';
152+
COMMENT
153+
ON COLUMN public.dinky_alert_group_backup.tenant_id IS 'tenant id';
154+
COMMENT
155+
ON COLUMN public.dinky_alert_group_backup.alert_instance_ids IS 'Alert instance IDS';
156+
COMMENT
157+
ON COLUMN public.dinky_alert_group_backup.note IS 'note';
158+
COMMENT
159+
ON COLUMN public.dinky_alert_group_backup.enabled IS 'is enable';
160+
COMMENT
161+
ON COLUMN public.dinky_alert_group_backup.create_time IS 'create time';
162+
COMMENT
163+
ON COLUMN public.dinky_alert_group_backup.update_time IS 'update time';
164+
COMMENT
165+
ON COLUMN public.dinky_alert_group_backup.creator IS 'creator user id';
166+
COMMENT
167+
ON COLUMN public.dinky_alert_group_backup.updater IS 'updater user id';
168+
COMMENT
169+
ON TABLE public.dinky_alert_group_backup IS 'Alert group';
170+
171+
CREATE OR REPLACE TRIGGER set_update_time_dinky_alert_group
172+
BEFORE UPDATE
173+
ON public.dinky_alert_group_backup
174+
FOR EACH ROW
175+
EXECUTE FUNCTION trigger_set_timestamp();
176+
177+
insert into public.dinky_alert_group_backup(id, name, tenant_id, alert_instance_ids, note, enabled, create_time, update_time, creator, updater)
178+
select id, name, tenant_id, alert_instance_ids, note,
179+
case when enabled = 0 then false else true end as enabled
180+
, create_time, update_time, creator, updater
181+
from public.dinky_alert_group;
182+
drop table if exists public.dinky_alert_group;
183+
alter table public.dinky_alert_group_backup rename to dinky_alert_group;
184+
185+
186+
187+
188+
-- ----------------------------
189+
-- Table structure for public.dinky_alert_template
190+
-- ----------------------------
191+
CREATE TABLE IF NOT EXISTS public.dinky_alert_template_backup
192+
(
193+
id SERIAL PRIMARY KEY NOT NULL,
194+
name VARCHAR(20),
195+
template_content TEXT,
196+
enabled boolean DEFAULT false,
197+
create_time TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
198+
update_time TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
199+
creator INT,
200+
updater INT,
201+
CONSTRAINT dinky_alert_template_unx_idx UNIQUE (name)
202+
);
203+
204+
COMMENT ON COLUMN public.dinky_alert_template_backup.id IS 'id';
205+
COMMENT ON COLUMN public.dinky_alert_template_backup.name IS 'emplate name';
206+
COMMENT ON COLUMN public.dinky_alert_template_backup.template_content IS 'template content';
207+
COMMENT ON COLUMN public.dinky_alert_template_backup.enabled IS 'is enable';
208+
-- public.dinky_git_project
209+
CREATE OR REPLACE TRIGGER update_dinky_alert_template
210+
BEFORE UPDATE
211+
ON public.dinky_alert_template_backup
212+
FOR EACH ROW
213+
EXECUTE FUNCTION trigger_set_timestamp();
214+
215+
insert into public.dinky_alert_template_backup(id, name, template_content, enabled, create_time, update_time, creator, updater)
216+
select id, name, template_content,
217+
case when enabled = 0 then false else true end as enabled
218+
, create_time, update_time, creator, updater
219+
from public.dinky_alert_template;
220+
drop table if exists public.dinky_alert_template;
221+
alter table public.dinky_alert_template_backup rename to dinky_alert_template;
222+
223+
224+
225+
226+
-- ----------------------------
227+
-- Table structure for public.dinky_alert_rules
228+
-- ----------------------------
229+
CREATE TABLE IF NOT EXISTS public.dinky_alert_rules_backup
230+
(
231+
id SERIAL PRIMARY KEY,
232+
name VARCHAR(40) NOT NULL,
233+
rule TEXT,
234+
template_id INT,
235+
rule_type VARCHAR(10),
236+
trigger_conditions VARCHAR(20),
237+
description TEXT,
238+
enabled boolean DEFAULT false,
239+
create_time TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
240+
update_time TIMESTAMP WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
241+
creator INT,
242+
updater INT
243+
);
244+
CREATE UNIQUE INDEX IF NOT EXISTS dinky_alert_rules_name_unx ON public.dinky_alert_rules (name);
245+
246+
COMMENT ON COLUMN public.dinky_alert_rules_backup.id IS 'id';
247+
COMMENT ON COLUMN public.dinky_alert_rules_backup.name IS 'rule name';
248+
COMMENT ON COLUMN public.dinky_alert_rules_backup.rule IS 'specify rule';
249+
COMMENT ON COLUMN public.dinky_alert_rules_backup.template_id IS 'template id';
250+
COMMENT ON COLUMN public.dinky_alert_rules_backup.rule_type IS 'alert rule type';
251+
COMMENT ON COLUMN public.dinky_alert_rules_backup.trigger_conditions IS 'trigger conditions';
252+
COMMENT ON COLUMN public.dinky_alert_rules_backup.description IS 'description';
253+
254+
-- public.dinky_git_project
255+
CREATE OR REPLACE TRIGGER update_dinky_alert_rules
256+
BEFORE UPDATE
257+
ON public.dinky_alert_rules_backup
258+
FOR EACH ROW
259+
EXECUTE FUNCTION trigger_set_timestamp();
260+
261+
262+
insert into public.dinky_alert_rules_backup(id, name, rule, template_id, rule_type, trigger_conditions, description, enabled, create_time, update_time, creator, updater)
263+
select id, name, rule, template_id, rule_type, trigger_conditions, description,
264+
case when enabled = 0 then false else true end as enabled
265+
, create_time, update_time, creator, updater
266+
from public.dinky_alert_rules;
267+
drop table if exists public.dinky_alert_rules;
268+
alter table public.dinky_alert_rules_backup rename to dinky_alert_rules;
269+
270+
271+
272+
273+
274+
-- ----------------------------
275+
-- Table structure for public.dinky_fragment
276+
-- ----------------------------
277+
278+
CREATE TABLE IF NOT EXISTS public.dinky_fragment_backup
279+
(
280+
id serial PRIMARY KEY NOT NULL,
281+
name varchar(50) NOT NULL,
282+
tenant_id int NOT NULL DEFAULT 1,
283+
fragment_value text NOT NULL,
284+
note text,
285+
enabled boolean DEFAULT false,
286+
create_time timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
287+
update_time timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
288+
creator int,
289+
updater int,
290+
UNIQUE (name, tenant_id)
291+
);
292+
293+
COMMENT ON TABLE public.dinky_fragment_backup is 'fragment management';
294+
COMMENT ON COLUMN public.dinky_fragment_backup.id is 'id';
295+
COMMENT ON COLUMN public.dinky_fragment_backup.name is 'fragment name';
296+
COMMENT ON COLUMN public.dinky_fragment_backup.tenant_id is 'tenant id';
297+
COMMENT ON COLUMN public.dinky_fragment_backup.fragment_value is 'fragment value';
298+
COMMENT ON COLUMN public.dinky_fragment_backup.note is 'note';
299+
COMMENT ON COLUMN public.dinky_fragment_backup.enabled is 'enabled';
300+
COMMENT ON COLUMN public.dinky_fragment_backup.create_time is 'create time';
301+
COMMENT ON COLUMN public.dinky_fragment_backup.update_time is 'update time';
302+
COMMENT ON COLUMN public.dinky_fragment_backup.creator is 'creator';
303+
COMMENT ON COLUMN public.dinky_fragment_backup.updater is 'updater';
304+
305+
CREATE OR REPLACE TRIGGER update_dinky_fragment_modtime
306+
BEFORE UPDATE
307+
ON public.dinky_fragment_backup
308+
FOR EACH ROW
309+
EXECUTE FUNCTION trigger_set_timestamp();
310+
311+
insert into public.dinky_fragment_backup(id, name, tenant_id, fragment_value, note, enabled, create_time, update_time, creator, updater)
312+
select id, name, tenant_id, fragment_value, note,
313+
case when enabled = 0 then false else true end as enabled
314+
, create_time, update_time, creator, updater
315+
from public.dinky_fragment;
316+
drop table if exists public.dinky_fragment;
317+
alter table public.dinky_fragment_backup rename to dinky_fragment;
318+
319+
320+
321+
322+
323+
324+
325+
326+
327+
328+
329+

‎dinky-web/src/pages/Home/components/MyWorker/MyWorker.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ const MyWorker = () => {
5151
return (
5252
<Card
5353
style={{
54-
marginBottom: 24
54+
marginBottom: 18,
55+
height: 'calc(100vh - 32%)'
5556
}}
5657
title={l('home.mywork')}
5758
bordered={false}

‎dinky-web/src/pages/Home/index.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const Workplace: FC = () => {
7474
};
7575

7676
return (
77-
<PageContainer style={{ padding: 10 }}>
77+
<PageContainer style={{ padding: 10 }} title={false}>
7878
<Row gutter={24}>
7979
<Col xl={16} lg={24} md={24} sm={24} xs={24}>
8080
<WorkHeader />
@@ -96,8 +96,10 @@ const Workplace: FC = () => {
9696
// size={"small"}
9797
title={l('home.fast.link')}
9898
bordered={false}
99-
bodyStyle={{
100-
padding: 0
99+
styles={{
100+
body: {
101+
padding: 0
102+
}
101103
}}
102104
>
103105
<FastLink />

‎dinky-web/src/pages/RegCenter/Alert/AlertRule/AlertRuleList/RuleEditForm/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const RuleEditForm = (props: AlertRuleFormProps) => {
111111
<DrawerForm
112112
layout={'vertical'}
113113
form={form}
114-
width={'40%'}
114+
width={'60%'}
115115
open={modalVisible}
116116
submitter={{ render: () => [...renderFooter()] }}
117117
drawerProps={{

0 commit comments

Comments
 (0)