diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm
index 46ba2715..71b14cb9 100644
--- a/modules/core/db/core.erm
+++ b/modules/core/db/core.erm
@@ -12,7 +12,7 @@
0
1.0
2986
- 76
+ 2631
255
255
@@ -15575,7 +15575,7 @@
- 9edf3c2c370270e0c6347f407e110c3290775e6c
+ a64d0b2affcf44e1b808b1eebb910148e181f6b1
516
387
Arial
@@ -15589,7 +15589,7 @@
- js_sys_biz_category
+ js_biz_category
业务分类
@@ -15598,7 +15598,7 @@
357974589f09f144661fe8f474cc2d5979820493
- 7505196c5a21b3bb056e1df83369ff81ad9c1577
+ 98176cde85757b57e90dddbe852007438218ac8a
@@ -15631,7 +15631,7 @@
53529e210393822d66f5a27a7ca5675ae83c22d0
- 17b0bdc72461220ac0ae5c283d325ebb54a41074
+ 6a16f79e9d08547042dd5afbd37271114e518cf0
@@ -15664,7 +15664,7 @@
d666d8f5ace8607bedbbc0307e66c40ce5bef233
- efa6241a145d05fb1504a804a1ba16bbde058957
+ 37e19231eb073064509e87a5a413c6b0271b901b
diff --git a/modules/core/db/core.png b/modules/core/db/core.png
index 34bd95ad..3957eff0 100644
Binary files a/modules/core/db/core.png and b/modules/core/db/core.png differ
diff --git a/modules/core/db/core.xls b/modules/core/db/core.xls
index a6f2d34b..efd700f3 100644
Binary files a/modules/core/db/core.xls and b/modules/core/db/core.xls differ
diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql
index 6c58a5ba..8f86c5b5 100644
--- a/modules/core/db/db2/core.sql
+++ b/modules/core/db/db2/core.sql
@@ -80,7 +80,7 @@ CREATE TABLE js_sys_area
-- 业务分类
-CREATE TABLE js_sys_biz_category
+CREATE TABLE js_biz_category
(
category_code varchar(64) NOT NULL,
view_code varchar(500),
diff --git a/modules/core/db/h2/core.sql b/modules/core/db/h2/core.sql
index 6a0e51fa..e62270db 100644
--- a/modules/core/db/h2/core.sql
+++ b/modules/core/db/h2/core.sql
@@ -80,7 +80,7 @@ CREATE TABLE js_sys_area
-- 业务分类
-CREATE TABLE js_sys_biz_category
+CREATE TABLE js_biz_category
(
category_code varchar(64) NOT NULL,
view_code varchar(500),
@@ -1058,25 +1058,25 @@ COMMENT ON COLUMN js_sys_area.create_date IS '创建时间';
COMMENT ON COLUMN js_sys_area.update_by IS '更新者';
COMMENT ON COLUMN js_sys_area.update_date IS '更新时间';
COMMENT ON COLUMN js_sys_area.remarks IS '备注信息';
-COMMENT ON TABLE js_sys_biz_category IS '业务分类';
-COMMENT ON COLUMN js_sys_biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN js_sys_biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN js_sys_biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN js_sys_biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN js_sys_biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_biz_category.tree_sort IS '排序号(升序)';
-COMMENT ON COLUMN js_sys_biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN js_sys_biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN js_sys_biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN js_sys_biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN js_sys_biz_category.status IS '状态(0正常 1删除 2停用)';
-COMMENT ON COLUMN js_sys_biz_category.create_by IS '创建者';
-COMMENT ON COLUMN js_sys_biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN js_sys_biz_category.update_by IS '更新者';
-COMMENT ON COLUMN js_sys_biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN js_sys_biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN js_sys_biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN js_sys_biz_category.corp_name IS '租户名称';
+COMMENT ON TABLE js_biz_category IS '业务分类';
+COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN js_biz_category.status IS '状态(0正常 1删除 2停用)';
+COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
+COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
+COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
COMMENT ON TABLE js_sys_company IS '公司表';
COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company.view_code IS '公司代码';
diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql
index 0d023860..b9766e54 100644
--- a/modules/core/db/mssql/core.sql
+++ b/modules/core/db/mssql/core.sql
@@ -80,7 +80,7 @@ CREATE TABLE [js_sys_area]
-- 业务分类
-CREATE TABLE [js_sys_biz_category]
+CREATE TABLE [js_biz_category]
(
[category_code] varchar(64) NOT NULL,
[view_code] varchar(500),
diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql
index 53300c3b..19469f37 100644
--- a/modules/core/db/mysql/core.sql
+++ b/modules/core/db/mysql/core.sql
@@ -81,7 +81,7 @@ CREATE TABLE js_sys_area
-- 业务分类
-CREATE TABLE js_sys_biz_category
+CREATE TABLE js_biz_category
(
category_code varchar(64) NOT NULL COMMENT '流程分类',
view_code varchar(500) COMMENT '分类代码',
diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql
index 257cba1d..f563e369 100644
--- a/modules/core/db/oracle/core.sql
+++ b/modules/core/db/oracle/core.sql
@@ -80,7 +80,7 @@ CREATE TABLE js_sys_area
-- 业务分类
-CREATE TABLE js_sys_biz_category
+CREATE TABLE js_biz_category
(
category_code varchar2(64) NOT NULL,
view_code varchar2(500),
@@ -1058,25 +1058,25 @@ COMMENT ON COLUMN js_sys_area.create_date IS '创建时间';
COMMENT ON COLUMN js_sys_area.update_by IS '更新者';
COMMENT ON COLUMN js_sys_area.update_date IS '更新时间';
COMMENT ON COLUMN js_sys_area.remarks IS '备注信息';
-COMMENT ON TABLE js_sys_biz_category IS '业务分类';
-COMMENT ON COLUMN js_sys_biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN js_sys_biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN js_sys_biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN js_sys_biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN js_sys_biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_biz_category.tree_sort IS '排序号(升序)';
-COMMENT ON COLUMN js_sys_biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN js_sys_biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN js_sys_biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN js_sys_biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN js_sys_biz_category.status IS '状态(0正常 1删除 2停用)';
-COMMENT ON COLUMN js_sys_biz_category.create_by IS '创建者';
-COMMENT ON COLUMN js_sys_biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN js_sys_biz_category.update_by IS '更新者';
-COMMENT ON COLUMN js_sys_biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN js_sys_biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN js_sys_biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN js_sys_biz_category.corp_name IS '租户名称';
+COMMENT ON TABLE js_biz_category IS '业务分类';
+COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN js_biz_category.status IS '状态(0正常 1删除 2停用)';
+COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
+COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
+COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
COMMENT ON TABLE js_sys_company IS '公司表';
COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company.view_code IS '公司代码';
diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql
index b5016aad..71b460ed 100644
--- a/modules/core/db/postgresql/core.sql
+++ b/modules/core/db/postgresql/core.sql
@@ -80,7 +80,7 @@ CREATE TABLE js_sys_area
-- 业务分类
-CREATE TABLE js_sys_biz_category
+CREATE TABLE js_biz_category
(
category_code varchar(64) NOT NULL,
view_code varchar(500),
@@ -1058,25 +1058,25 @@ COMMENT ON COLUMN js_sys_area.create_date IS '创建时间';
COMMENT ON COLUMN js_sys_area.update_by IS '更新者';
COMMENT ON COLUMN js_sys_area.update_date IS '更新时间';
COMMENT ON COLUMN js_sys_area.remarks IS '备注信息';
-COMMENT ON TABLE js_sys_biz_category IS '业务分类';
-COMMENT ON COLUMN js_sys_biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN js_sys_biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN js_sys_biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN js_sys_biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN js_sys_biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_sys_biz_category.tree_sort IS '排序号(升序)';
-COMMENT ON COLUMN js_sys_biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN js_sys_biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN js_sys_biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN js_sys_biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN js_sys_biz_category.status IS '状态(0正常 1删除 2停用)';
-COMMENT ON COLUMN js_sys_biz_category.create_by IS '创建者';
-COMMENT ON COLUMN js_sys_biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN js_sys_biz_category.update_by IS '更新者';
-COMMENT ON COLUMN js_sys_biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN js_sys_biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN js_sys_biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN js_sys_biz_category.corp_name IS '租户名称';
+COMMENT ON TABLE js_biz_category IS '业务分类';
+COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号(升序)';
+COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN js_biz_category.status IS '状态(0正常 1删除 2停用)';
+COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
+COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
+COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
COMMENT ON TABLE js_sys_company IS '公司表';
COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company.view_code IS '公司代码';
diff --git a/modules/core/src/main/java/com/jeesite/autoconfigure/sys/BizAutoConfiguration.java b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/BizAutoConfiguration.java
new file mode 100644
index 00000000..c8833856
--- /dev/null
+++ b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/BizAutoConfiguration.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.autoconfigure.sys;
+
+import com.jeesite.common.mybatis.MyBatisFactoryBean;
+import com.jeesite.modules.biz.service.BizCategoryService;
+import com.jeesite.modules.biz.service.support.BizCategoryServiceSupport;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * 系统核心实现类
+ * @author ThinkGem
+ * @version 2018-10-13
+ */
+@AutoConfiguration
+@ConditionalOnBean(MyBatisFactoryBean.class)
+@ConditionalOnProperty(name="user.enabled", havingValue="true", matchIfMissing=true)
+public class BizAutoConfiguration {
+
+ @Bean
+ @ConditionalOnMissingBean
+ public BizCategoryService bizCategoryService(){
+ return new BizCategoryServiceSupport();
+ }
+
+}
diff --git a/modules/core/src/main/java/com/jeesite/autoconfigure/sys/MsgAutoConfiguration.java b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/MsgAutoConfiguration.java
new file mode 100644
index 00000000..5fc328d2
--- /dev/null
+++ b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/MsgAutoConfiguration.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.autoconfigure.sys;
+
+import com.jeesite.common.mybatis.MyBatisFactoryBean;
+import com.jeesite.modules.msg.service.MsgInnerService;
+import com.jeesite.modules.msg.service.support.MsgInnerServiceSupport;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * 系统核心实现类
+ * @author ThinkGem
+ * @version 2018-10-13
+ */
+@AutoConfiguration
+@ConditionalOnBean(MyBatisFactoryBean.class)
+@ConditionalOnProperty(name="user.enabled", havingValue="true", matchIfMissing=true)
+public class MsgAutoConfiguration {
+
+ @Bean
+ @ConditionalOnMissingBean
+ public MsgInnerService msgInnerService(){
+ return new MsgInnerServiceSupport();
+ }
+
+}
diff --git a/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java
index bb022437..a55220c0 100644
--- a/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java
+++ b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java
@@ -5,7 +5,6 @@
package com.jeesite.autoconfigure.sys;
import com.jeesite.common.mybatis.MyBatisFactoryBean;
-import com.jeesite.modules.msg.service.MsgInnerService;
import com.jeesite.modules.sys.service.*;
import com.jeesite.modules.sys.service.support.*;
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -65,17 +64,5 @@ public class SysAutoConfiguration {
public PostService postService(){
return new PostServiceSupport();
}
-
- @Bean
- @ConditionalOnMissingBean
- public MsgInnerService msgInnerService(){
- return new MsgInnerService();
- }
-
- @Bean
- @ConditionalOnMissingBean
- public BizCategoryService bizCategoryService(){
- return new BizCategoryServiceSupport();
- }
}
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/BizCategoryDao.java b/modules/core/src/main/java/com/jeesite/modules/biz/dao/BizCategoryDao.java
similarity index 81%
rename from modules/core/src/main/java/com/jeesite/modules/sys/dao/BizCategoryDao.java
rename to modules/core/src/main/java/com/jeesite/modules/biz/dao/BizCategoryDao.java
index c0c018e3..7f784057 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/BizCategoryDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/biz/dao/BizCategoryDao.java
@@ -2,11 +2,11 @@
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
*/
-package com.jeesite.modules.sys.dao;
+package com.jeesite.modules.biz.dao;
import com.jeesite.common.dao.TreeDao;
import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import com.jeesite.modules.sys.entity.BizCategory;
+import com.jeesite.modules.biz.entity.BizCategory;
/**
* 业务分类DAO接口
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/BizCategory.java b/modules/core/src/main/java/com/jeesite/modules/biz/entity/BizCategory.java
similarity index 95%
rename from modules/core/src/main/java/com/jeesite/modules/sys/entity/BizCategory.java
rename to modules/core/src/main/java/com/jeesite/modules/biz/entity/BizCategory.java
index ed19b6ed..43ccd6f0 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/BizCategory.java
+++ b/modules/core/src/main/java/com/jeesite/modules/biz/entity/BizCategory.java
@@ -2,7 +2,7 @@
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
*/
-package com.jeesite.modules.sys.entity;
+package com.jeesite.modules.biz.entity;
import com.jeesite.common.entity.BaseEntity;
import com.jeesite.common.entity.DataEntity;
@@ -19,7 +19,7 @@ import jakarta.validation.constraints.Size;
* @author ThinkGem
* @version 2019-08-12
*/
-@Table(name="${_prefix}sys_biz_category", alias="a", columns={
+@Table(name="${_prefix}biz_category", alias="a", columns={
@Column(name="category_code", attrName="categoryCode", label="业务分类", isPK=true),
@Column(name="view_code", attrName="viewCode", label="业务分类"),
@Column(includeEntity=TreeEntity.class),
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/BizCategoryService.java b/modules/core/src/main/java/com/jeesite/modules/biz/service/BizCategoryService.java
similarity index 91%
rename from modules/core/src/main/java/com/jeesite/modules/sys/service/BizCategoryService.java
rename to modules/core/src/main/java/com/jeesite/modules/biz/service/BizCategoryService.java
index b8603f5b..9629167b 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/service/BizCategoryService.java
+++ b/modules/core/src/main/java/com/jeesite/modules/biz/service/BizCategoryService.java
@@ -2,10 +2,10 @@
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
*/
-package com.jeesite.modules.sys.service;
+package com.jeesite.modules.biz.service;
import com.jeesite.common.service.api.TreeServiceApi;
-import com.jeesite.modules.sys.entity.BizCategory;
+import com.jeesite.modules.biz.entity.BizCategory;
import java.util.List;
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/BizCategoryServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/biz/service/support/BizCategoryServiceSupport.java
similarity index 86%
rename from modules/core/src/main/java/com/jeesite/modules/sys/service/support/BizCategoryServiceSupport.java
rename to modules/core/src/main/java/com/jeesite/modules/biz/service/support/BizCategoryServiceSupport.java
index d9310bfb..a521bc73 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/BizCategoryServiceSupport.java
+++ b/modules/core/src/main/java/com/jeesite/modules/biz/service/support/BizCategoryServiceSupport.java
@@ -2,12 +2,12 @@
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
*/
-package com.jeesite.modules.sys.service.support;
+package com.jeesite.modules.biz.service.support;
import com.jeesite.common.service.TreeService;
-import com.jeesite.modules.sys.dao.BizCategoryDao;
-import com.jeesite.modules.sys.entity.BizCategory;
-import com.jeesite.modules.sys.service.BizCategoryService;
+import com.jeesite.modules.biz.dao.BizCategoryDao;
+import com.jeesite.modules.biz.entity.BizCategory;
+import com.jeesite.modules.biz.service.BizCategoryService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -18,7 +18,7 @@ import java.util.List;
* @version 2019-08-12
*/
public class BizCategoryServiceSupport extends TreeService
- implements BizCategoryService{
+ implements BizCategoryService {
/**
* 获取单条数据
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/BizCategoryController.java b/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java
similarity index 89%
rename from modules/core/src/main/java/com/jeesite/modules/sys/web/BizCategoryController.java
rename to modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java
index 7c9140c7..69a836f8 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/BizCategoryController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java
@@ -2,7 +2,7 @@
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
*/
-package com.jeesite.modules.sys.web;
+package com.jeesite.modules.biz.web;
import com.jeesite.common.collect.ListUtils;
import com.jeesite.common.collect.MapUtils;
@@ -10,8 +10,8 @@ import com.jeesite.common.config.Global;
import com.jeesite.common.idgen.IdGen;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.sys.entity.BizCategory;
-import com.jeesite.modules.sys.service.BizCategoryService;
+import com.jeesite.modules.biz.entity.BizCategory;
+import com.jeesite.modules.biz.service.BizCategoryService;
import com.jeesite.modules.sys.utils.UserUtils;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -34,7 +34,7 @@ import java.util.Map;
*/
@Controller
@Tag(name = "BizCategory - 业务分类")
-@RequestMapping(value = "${adminPath}/sys/bizCategory")
+@RequestMapping(value = "${adminPath}/biz/bizCategory")
public class BizCategoryController extends BaseController {
@Autowired
@@ -51,27 +51,27 @@ public class BizCategoryController extends BaseController {
/**
* 管理首页
*/
- @RequiresPermissions("sys:bizCategory:view")
+ @RequiresPermissions("biz:bizCategory:view")
@RequestMapping(value = "index")
public String index(BizCategory bizCategory, Model model) {
model.addAttribute("bizCategory", bizCategory);
- return "modules/sys/bizCategoryIndex";
+ return "modules/biz/bizCategoryIndex";
}
/**
* 查询列表
*/
- @RequiresPermissions("sys:bizCategory:view")
+ @RequiresPermissions("biz:bizCategory:view")
@RequestMapping(value = {"list", ""})
public String list(BizCategory bizCategory, Model model) {
model.addAttribute("bizCategory", bizCategory);
- return "modules/sys/bizCategoryList";
+ return "modules/biz/bizCategoryList";
}
/**
* 查询列表数据
*/
- @RequiresPermissions("sys:bizCategory:view")
+ @RequiresPermissions("biz:bizCategory:view")
@RequestMapping(value = "listData")
@ResponseBody
public List listData(BizCategory bizCategory) {
@@ -94,19 +94,19 @@ public class BizCategoryController extends BaseController {
/**
* 查看编辑表单
*/
- @RequiresPermissions("sys:bizCategory:view")
+ @RequiresPermissions("biz:bizCategory:view")
@RequestMapping(value = "form")
public String form(BizCategory bizCategory, Model model) {
// 创建并初始化下一个节点信息
bizCategory = createNextNode(bizCategory);
model.addAttribute("bizCategory", bizCategory);
- return "modules/sys/bizCategoryForm";
+ return "modules/biz/bizCategoryForm";
}
/**
* 创建并初始化下一个节点信息,如:排序号、默认值
*/
- @RequiresPermissions("sys:bizCategory:edit")
+ @RequiresPermissions("biz:bizCategory:edit")
@RequestMapping(value = "createNextNode")
@ResponseBody
public BizCategory createNextNode(BizCategory bizCategory) {
@@ -135,7 +135,7 @@ public class BizCategoryController extends BaseController {
/**
* 保存业务分类
*/
- @RequiresPermissions("sys:bizCategory:edit")
+ @RequiresPermissions("biz:bizCategory:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated BizCategory bizCategory) {
@@ -146,7 +146,7 @@ public class BizCategoryController extends BaseController {
/**
* 停用业务分类
*/
- @RequiresPermissions("sys:bizCategory:edit")
+ @RequiresPermissions("biz:bizCategory:edit")
@RequestMapping(value = "disable")
@ResponseBody
public String disable(BizCategory bizCategory) {
@@ -165,7 +165,7 @@ public class BizCategoryController extends BaseController {
/**
* 启用业务分类
*/
- @RequiresPermissions("sys:bizCategory:edit")
+ @RequiresPermissions("biz:bizCategory:edit")
@RequestMapping(value = "enable")
@ResponseBody
public String enable(BizCategory bizCategory) {
@@ -177,7 +177,7 @@ public class BizCategoryController extends BaseController {
/**
* 删除业务分类
*/
- @RequiresPermissions("sys:bizCategory:edit")
+ @RequiresPermissions("biz:bizCategory:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(BizCategory bizCategory) {
@@ -192,7 +192,7 @@ public class BizCategoryController extends BaseController {
* @param isShowCode 是否显示编码(true or 1:显示在左侧;2:显示在右侧;false or null:不显示)
* @return
*/
- @RequiresPermissions("sys:bizCategory:view")
+ @RequiresPermissions("biz:bizCategory:view")
@RequestMapping(value = "treeData")
@ResponseBody
public List