manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模块管理增加生成模块的基础路径和模板存储字段，生成模块代码时给于确认提示；微服务下isLoader为true;

Browse Source
This commit is contained in:
thinkgem
2024-03-22 09:16:43 +08:00
parent c222ab29ff
commit 03a031360c
9 changed files with 116 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
modules/core/db/core.erm
View File

@@ -11,8 +11,8 @@
</page_setting>
<category_index>0</category_index>
<zoom>0.5</zoom>
<x>0</x>
<y>907</y>
<x>950</x>
<y>0</y>
<default_color>
<r>255</r>
<g>255</g>
@@ -7643,8 +7643,8 @@
</color>
<connections>
<relation>
<id>18cbb4e282687e3426340739152ce4dee33add59</id>
<source>29512414da8b1f7b0128b98f654788a1f2ab78a8</source>
<id>74561557dced8974f973e4f1f3c8233464123df0</id>
<source>77882d315a3a12c8239afc4172d122f36b944e07</source>
<target>3e5ba7b4b137ff0e53c3177fa69d25f7c92092ab</target>
<source_xp>-1</source_xp>
<source_yp>-1</source_yp>
@@ -7708,7 +7708,7 @@
<normal_column>
<id>fc44d466dd6009e48b5222d1d71e38d025194ff0</id>
<referenced_column>54b86f255d95078898534902087fb704b4265b60</referenced_column>
<relation>18cbb4e282687e3426340739152ce4dee33add59</relation>
<relation>74561557dced8974f973e4f1f3c8233464123df0</relation>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
@@ -8230,13 +8230,13 @@
</table_properties>
</table>
<table>
<id>29512414da8b1f7b0128b98f654788a1f2ab78a8</id>
<id>77882d315a3a12c8239afc4172d122f36b944e07</id>
<height>256</height>
<width>397</width>
<font_name>Arial</font_name>
<font_size>14</font_size>
<x>684</x>
<y>3252</y>
<x>708</x>
<y>3240</y>
<color>
<r>128</r>
<g>128</g>
@@ -9730,13 +9730,13 @@
</table_properties>
</table>
<table>
<id>5fc55290d31b22b17bfbd477a6000451879cb4bc</id>
<height>289</height>
<id>b5b96f0433e1d66dc673d0fea412adfdb1c0722d</id>
<height>412</height>
<width>454</width>
<font_name>Arial</font_name>
<font_size>14</font_size>
<x>3744</x>
<y>552</y>
<y>528</y>
<color>
<r>128</r>
<g>128</g>
@@ -9949,6 +9949,72 @@
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>893d64272ea667d194b7302cffca1b3f52fa0a7b</word_id>
<id>e7eaf31498ae6187c1581c139231f45bf40ed94a</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>nvarchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>false</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>e165345266c290425093cc0ba26c4644cc73b285</word_id>
<id>67c5d1f49d1ffb3943a65d6b561b0f4611fc2a45</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>false</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
</columns>
<indexes>

2
modules/core/db/db2/core.sql
View File

@@ -476,6 +476,8 @@ CREATE TABLE js_sys_module
main_class_name varchar(500),
current_version varchar(50),
upgrade_info varchar(300),
gen_base_dir vargraphic(1000),
tpl_category varchar(200),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date timestamp NOT NULL,

2
modules/core/db/h2/core.sql
View File

@@ -476,6 +476,8 @@ CREATE TABLE js_sys_module
main_class_name varchar(500),
current_version varchar(50),
upgrade_info varchar(300),
gen_base_dir varchar(1000),
tpl_category varchar(200),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date datetime NOT NULL,

2
modules/core/db/mssql/core.sql
View File

@@ -476,6 +476,8 @@ CREATE TABLE [js_sys_module]
[main_class_name] varchar(500),
[current_version] varchar(50),
[upgrade_info] varchar(300),
[gen_base_dir] nvarchar(1000),
[tpl_category] varchar(200),
[status] char(1) DEFAULT '0' NOT NULL,
[create_by] varchar(64) NOT NULL,
[create_date] datetime NOT NULL,

2
modules/core/db/mysql/core.sql
View File

@@ -477,6 +477,8 @@ CREATE TABLE js_sys_module
main_class_name varchar(500) COMMENT '主类全名',
current_version varchar(50) COMMENT '当前版本',
upgrade_info varchar(300) COMMENT '升级信息',
gen_base_dir varchar(1000) COMMENT '生成基础路径',
tpl_category varchar(200) COMMENT '使用的模板',
status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
create_by varchar(64) NOT NULL COMMENT '创建者',
create_date datetime NOT NULL COMMENT '创建时间',

4
modules/core/db/oracle/core.sql
View File

@@ -476,6 +476,8 @@ CREATE TABLE js_sys_module
main_class_name varchar2(500),
current_version varchar2(50),
upgrade_info varchar2(300),
gen_base_dir nvarchar2(1000),
tpl_category varchar2(200),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar2(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -1336,6 +1338,8 @@ COMMENT ON COLUMN js_sys_module.description IS '模块描述';
COMMENT ON COLUMN js_sys_module.main_class_name IS '主类全名';
COMMENT ON COLUMN js_sys_module.current_version IS '当前版本';
COMMENT ON COLUMN js_sys_module.upgrade_info IS '升级信息';
COMMENT ON COLUMN js_sys_module.gen_base_dir IS '生成基础路径';
COMMENT ON COLUMN js_sys_module.tpl_category IS '使用的模板';
COMMENT ON COLUMN js_sys_module.status IS '状态（0正常 1删除 2停用）';
COMMENT ON COLUMN js_sys_module.create_by IS '创建者';
COMMENT ON COLUMN js_sys_module.create_date IS '创建时间';

4
modules/core/db/postgresql/core.sql
View File

@@ -476,6 +476,8 @@ CREATE TABLE js_sys_module
main_class_name varchar(500),
current_version varchar(50),
upgrade_info varchar(300),
gen_base_dir varchar(1000),
tpl_category varchar(200),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -1336,6 +1338,8 @@ COMMENT ON COLUMN js_sys_module.description IS '模块描述';
COMMENT ON COLUMN js_sys_module.main_class_name IS '主类全名';
COMMENT ON COLUMN js_sys_module.current_version IS '当前版本';
COMMENT ON COLUMN js_sys_module.upgrade_info IS '升级信息';
COMMENT ON COLUMN js_sys_module.gen_base_dir IS '生成基础路径';
COMMENT ON COLUMN js_sys_module.tpl_category IS '使用的模板';
COMMENT ON COLUMN js_sys_module.status IS '状态（0正常 1删除 2停用）';
COMMENT ON COLUMN js_sys_module.create_by IS '创建者';
COMMENT ON COLUMN js_sys_module.create_date IS '创建时间';

6
modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java
View File

@@ -104,7 +104,11 @@ public class ModuleController extends BaseController {
model.addAttribute("config", config);
List<String> genBaseDirList = GenModuleUtils.getGenBaseDirList();
model.addAttribute("genBaseDirList", genBaseDirList);
model.addAttribute("genBaseDir", genBaseDirList.get(0));
if (StringUtils.isNotBlank(module.getGenBaseDir())) {
model.addAttribute("genBaseDir", module.getGenBaseDir());
} else {
model.addAttribute("genBaseDir", genBaseDirList.get(0));
}
model.addAttribute("module", module);
return "modules/sys/moduleForm";
}

27
modules/core/src/main/resources/views/modules/sys/moduleForm.html
View File

@@ -126,7 +126,7 @@ Class.forName(“com.jeesite.modules.sys.web.LoginController”)；在微服务
<% if (hasPermi('sys:module:edit')){ %>
<#form:hidden path="genFlag"/>
<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"
onclick="$('#genFlag').val('1');"><i class="fa fa-check"></i> ${text('保 存')}</button>&nbsp;
onclick="$('#genFlag').val('0');"><i class="fa fa-check"></i> ${text('保 存')}</button>&nbsp;
<% } %>
<% if (hasPermi('sys:module:edit') && isCustomModule){ %>
<button type="submit" class="btn btn-sm btn-danger" id="btnSubmitAndGen"
@@ -148,14 +148,23 @@ jQuery.validator.addMethod("abc2",function(value, element) {
}, "${text('请输入2个以上字符，字母开头、允许字母数字下划线或减号、字母数字结尾')}");
$('#inputForm').validate({
submitHandler: function(form){
js.ajaxSubmitForm($(form), function(data){
js.showMessage(data.message);
if(data.result == Global.TRUE){
js.closeCurrentTabPage(function(contentWindow){
contentWindow.page();
});
}
}, "json");
var submitFormFn = function() {
js.ajaxSubmitForm($(form), function(data){
js.showMessage(data.message);
if(data.result == Global.TRUE){
js.closeCurrentTabPage(function(contentWindow){
contentWindow.page();
});
}
}, "json");
}
if ($('#genFlag').val() != '0'){
js.confirm('是否要生成模块源码到 ‘' + $('#genBaseDir').val() + '’ 目录下？', function() {
submitFormFn();
});
} else {
submitFormFn();
}
}
});
</script>