Skip to content

Commit bd5c49d

Browse files
gleiyubasedt
andauthored
feat: Upgrade Node.js to v20.19.6 and pnpm to 10.26.2 (#119)
* feat: optimize the sql script initialization process and docker file * feat: optimize header mega memu * feat: optimize header mega memu * feat: optimize header mega memu * feat: Upgrade Node.js to v20.19.6 and pnpm to 10.26.2 --------- Co-authored-by: basedt <basedt@sina.com>
1 parent 6972617 commit bd5c49d

24 files changed

Lines changed: 357 additions & 226 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ hs_err_pid*
3737

3838
/scripts/docker/thirdparties/doris/docker-compose-doris.yaml
3939
/dms-api/src/main/resources/application-local.yml
40+
/.kilocode/

dms-api/src/main/java/com/basedt/dms/api/init/DatabaseInitRunner.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919

2020
import com.basedt.dms.plugins.datasource.utils.JdbcUtil;
2121
import lombok.extern.slf4j.Slf4j;
22-
import org.apache.ibatis.jdbc.ScriptRunner;
2322
import org.springframework.beans.factory.annotation.Value;
2423
import org.springframework.boot.ApplicationArguments;
2524
import org.springframework.boot.ApplicationRunner;
2625
import org.springframework.core.annotation.Order;
26+
import org.springframework.core.io.Resource;
27+
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
28+
import org.springframework.jdbc.datasource.init.ScriptUtils;
2729
import org.springframework.stereotype.Component;
28-
import org.springframework.util.ClassUtils;
2930

30-
import java.io.InputStream;
31-
import java.io.InputStreamReader;
3231
import java.sql.Connection;
3332
import java.sql.PreparedStatement;
34-
import java.util.ArrayList;
33+
import java.util.Arrays;
34+
import java.util.Comparator;
3535
import java.util.List;
3636

3737
@Order(1)
@@ -55,17 +55,13 @@ public class DatabaseInitRunner implements ApplicationRunner {
5555
public void run(ApplicationArguments args) throws Exception {
5656
if (isNeedInit()) {
5757
log.info("Initialize database script");
58-
List<InputStream> inList = new ArrayList<>();
59-
inList.add(ClassUtils.getDefaultClassLoader().getResourceAsStream("db/init/dms.sql"));
60-
inList.add(ClassUtils.getDefaultClassLoader().getResourceAsStream("db/init/dms_quartz.sql"));
58+
Resource[] resources = new PathMatchingResourcePatternResolver().getResources("classpath:db/init/*.sql");
59+
List<Resource> sortedResources = Arrays.stream(resources).sorted(Comparator.comparing(Resource::getFilename, Comparator.nullsLast(String::compareTo))).toList();
6160
Connection conn = null;
6261
try {
6362
conn = JdbcUtil.getConnection(this.jdbc_url, this.driverClassName, this.userName, this.password, null);
64-
for (InputStream in : inList) {
65-
ScriptRunner scriptRunner = new ScriptRunner(conn);
66-
scriptRunner.setSendFullScript(true);
67-
scriptRunner.setLogWriter(null);
68-
scriptRunner.runScript(new InputStreamReader(in));
63+
for (Resource resource : sortedResources) {
64+
ScriptUtils.executeSqlScript(conn, resource);
6965
}
7066
} catch (Exception e) {
7167
log.info("sql script init error : {}", e.getMessage());

dms-api/src/main/resources/db/init/dms.sql renamed to dms-api/src/main/resources/db/init/01-dms.sql

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -270,49 +270,6 @@ comment on column sys_privilege.editor is 'editor';
270270
comment on column sys_privilege.update_time is 'update time';
271271
create unique index un_sys_privilege on sys_privilege (privilege_code);
272272

273-
/* init data */
274-
truncate table sys_privilege;
275-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dct:0','dms.p.sys.dic.dct.show','sys:dic:dft:0','3','sys','sys');
276-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wss:wpi:2','dms.p.ws.wss.wpi.edit','ws:wss:dft:0','3','sys','sys');
277-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:rol:rli:2','dms.p.sys.rol.rli.edit','sys:rol:dft:0','3','sys','sys');
278-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsh:dft:0','dms.p.ws.wsh.dft.show','ws:dft:dft:0','2','sys','sys');
279-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:dft:dft:0','dms.p.ws.dft.dft.show','root','1','sys','sys');
280-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsd:wdl:0','dms.p.ws.wsd.wdl.show','ws:wsd:dft:0','3','sys','sys');
281-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsd:wdl:3','dms.p.ws.wsd.wdl.delete','ws:wsd:dft:0','3','sys','sys');
282-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wso:dft:0','dms.p.ws.wso.dft.show','ws:dft:dft:0','2','sys','sys');
283-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:rol:rli:0','dms.p.sys.rol.rli.show','sys:rol:dft:0','3','sys','sys');
284-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:rol:rli:4','dms.p.sys.rol.rli.grant','sys:rol:dft:0','3','sys','sys');
285-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsd:wdl:1','dms.p.ws.wsd.wdl.add','ws:wsd:dft:0','3','sys','sys');
286-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dct:2','dms.p.sys.dic.dct.edit','sys:dic:dft:0','3','sys','sys');
287-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wss:wpi:1','dms.p.ws.wss.wpi.add','ws:wss:dft:0','3','sys','sys');
288-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:usr:uli:2','dms.p.sys.usr.uli.edit','sys:usr:dft:0','3','sys','sys');
289-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:usr:uli:3','dms.p.sys.usr.uli.delete','sys:usr:dft:0','3','sys','sys');
290-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dcd:1','dms.p.sys.dic.dcd.add','sys:dic:dft:0','3','sys','sys');
291-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dcd:3','dms.p.sys.dic.dcd.delete','sys:dic:dft:0','3','sys','sys');
292-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:rol:rli:3','dms.p.sys.rol.rli.delete','sys:rol:dft:0','3','sys','sys');
293-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsd:wdl:2','dms.p.ws.wsd.wdl.edit','ws:wsd:dft:0','3','sys','sys');
294-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wse:dft:0','dms.p.ws.wse.dft.show','ws:dft:dft:0','2','sys','sys');
295-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:usr:dft:0','dms.p.sys.usr.dft.show','sys:dft:dft:0','2','sys','sys');
296-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dct:1','dms.p.sys.dic.dct.add','sys:dic:dft:0','3','sys','sys');
297-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsh:whl:0','dms.p.ws.wsh.whl.show','ws:wsh:dft:0','3','sys','sys');
298-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dcd:2','dms.p.sys.dic.dcd.edit','sys:dic:dft:0','3','sys','sys');
299-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsd:dft:0','dms.p.ws.wsd.dft.show','ws:dft:dft:0','2','sys','sys');
300-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:rol:rli:1','dms.p.sys.rol.rli.add','sys:rol:dft:0','3','sys','sys');
301-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsi:whi:0','dms.p.ws.wsi.whi.show','ws:wsi:dft:0','3','sys','sys');
302-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wss:wpi:3','dms.p.ws.wss.wpi.delete','ws:wss:dft:0','3','sys','sys');
303-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:usr:uli:1','dms.p.sys.usr.uli.add','sys:usr:dft:0','3','sys','sys');
304-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:usr:uli:0','dms.p.sys.usr.uli.show','sys:usr:dft:0','3','sys','sys');
305-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dct:3','dms.p.sys.dic.dct.delete','sys:dic:dft:0','3','sys','sys');
306-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:set:dft:0','dms.p.sys.set.dft.show','sys:dft:dft:0','2','sys','sys');
307-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dcd:0','dms.p.sys.dic.dcd.show','sys:dic:dft:0','3','sys','sys');
308-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dft:dft:0','dms.p.sys.dft.dft.show','root','1','sys','sys');
309-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wsi:dft:0','dms.p.ws.wsi.dft.show','ws:dft:dft:0','2','sys','sys');
310-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wss:wpi:0','dms.p.ws.wss.wpi.show','ws:wss:dft:0','3','sys','sys');
311-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wss:dft:0','dms.p.ws.wss.dft.show','ws:dft:dft:0','2','sys','sys');
312-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:rol:dft:0','dms.p.sys.rol.dft.show','sys:dft:dft:0','2','sys','sys');
313-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dft:0','dms.p.sys.dic.dft.show','sys:dft:dft:0','2','sys','sys');
314-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('ws:wse:whe:0','dms.p.ws.wse.whe.show','ws:wse:dft:0','3','sys','sys');
315-
insert into sys_privilege (privilege_code,privilege_name,parent_code,level,creator,editor) values ('sys:dic:dct:7','dms.p.sys.dic.dct.detail','sys:dic:dft:0','3','sys','sys');
316273

317274
drop table if exists sys_role_privilege;
318275
create table sys_role_privilege
@@ -334,30 +291,6 @@ comment on column sys_role_privilege.create_time is 'create time';
334291
comment on column sys_role_privilege.editor is 'editor';
335292
comment on column sys_role_privilege.update_time is 'update time';
336293
create unique index un_sys_role_privilege on sys_role_privilege (role_id, privilege_id);
337-
/* init data */
338-
insert into sys_role_privilege(role_id, privilege_id, creator, editor)
339-
select r.id as role_id, p.id as privilege_id, 'sys' as creator, 'sys' as editor
340-
from sys_role r,
341-
sys_privilege p
342-
where r.role_code = '_super_admin';
343-
344-
insert into sys_role_privilege(role_id, privilege_id, creator, editor)
345-
select r.id as role_id,
346-
p.id as privilege_id,
347-
'sys' as creator,
348-
'sys' as editor
349-
from sys_role r,
350-
sys_privilege p
351-
where r.role_code = '_normal'
352-
and (p.privilege_code in (
353-
'ws:dft:dft:0', 'sys:dic:dcd:0', 'sys:dic:dct:0'
354-
)
355-
or p.privilege_code like 'ws:wsd%'
356-
or p.privilege_code like 'ws:wss%'
357-
or p.privilege_code like 'ws:wsh%'
358-
or p.privilege_code like 'ws:wsi%'
359-
or p.privilege_code like 'ws:wse%'
360-
);
361294

362295
drop table if exists sys_user_role;
363296
create table sys_user_role
File renamed without changes.

0 commit comments

Comments
 (0)