diff --git a/src/main/java/com/rebuild/server/metadata/EntityHelper.java b/src/main/java/com/rebuild/server/metadata/EntityHelper.java
index 3a9a717d5..d07bdddc5 100644
--- a/src/main/java/com/rebuild/server/metadata/EntityHelper.java
+++ b/src/main/java/com/rebuild/server/metadata/EntityHelper.java
@@ -139,6 +139,8 @@ public class EntityHelper {
public static final int ViewAddonsConfig = 15;
public static final int DashboardConfig = 16;
public static final int ChartConfig = 17;
+ public static final int Classification = 18;
+ public static final int ClassificationData = 19;
public static final int ShareAccess = 20;
public static final int SystemConfig = 21;
diff --git a/src/main/java/com/rebuild/server/metadata/entityhub/DisplayType.java b/src/main/java/com/rebuild/server/metadata/entityhub/DisplayType.java
index cc973029f..76d050614 100644
--- a/src/main/java/com/rebuild/server/metadata/entityhub/DisplayType.java
+++ b/src/main/java/com/rebuild/server/metadata/entityhub/DisplayType.java
@@ -42,6 +42,7 @@ public enum DisplayType {
PICKLIST("列表", FieldType.REFERENCE, -1, null),
REFERENCE("引用", FieldType.REFERENCE, -1, null),
AVATAR("头像", FieldType.STRING, 300, null),
+ CLASSIFICATION("分类", FieldType.REFERENCE, -1, null),
// 待启用/内部用
ID("主键", FieldType.PRIMARY, -1, null),
diff --git a/src/main/java/com/rebuild/web/admin/audit/AuditLoggingControll.java b/src/main/java/com/rebuild/web/admin/AuditLoggingControll.java
similarity index 97%
rename from src/main/java/com/rebuild/web/admin/audit/AuditLoggingControll.java
rename to src/main/java/com/rebuild/web/admin/AuditLoggingControll.java
index a04b4cc58..77d875b4c 100644
--- a/src/main/java/com/rebuild/web/admin/audit/AuditLoggingControll.java
+++ b/src/main/java/com/rebuild/web/admin/AuditLoggingControll.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-package com.rebuild.web.admin.audit;
+package com.rebuild.web.admin;
import java.io.IOException;
diff --git a/src/main/java/com/rebuild/web/base/entity/DataImportControll.java b/src/main/java/com/rebuild/web/admin/DataImportControll.java
similarity index 99%
rename from src/main/java/com/rebuild/web/base/entity/DataImportControll.java
rename to src/main/java/com/rebuild/web/admin/DataImportControll.java
index 1e80e5c5b..5519d43b0 100644
--- a/src/main/java/com/rebuild/web/base/entity/DataImportControll.java
+++ b/src/main/java/com/rebuild/web/admin/DataImportControll.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-package com.rebuild.web.base.entity;
+package com.rebuild.web.admin;
import java.io.File;
import java.io.IOException;
diff --git a/src/main/java/com/rebuild/web/admin/entityhub/ClassificationControll.java b/src/main/java/com/rebuild/web/admin/entityhub/ClassificationControll.java
new file mode 100644
index 000000000..dd0061d0d
--- /dev/null
+++ b/src/main/java/com/rebuild/web/admin/entityhub/ClassificationControll.java
@@ -0,0 +1,45 @@
+/*
+rebuild - Building your system freely.
+Copyright (C) 2019 devezhao
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+
+package com.rebuild.web.admin.entityhub;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.rebuild.web.BasePageControll;
+
+/**
+ * TODO
+ *
+ * @author devezhao zhaofang123@gmail.com
+ * @since 2019/03/27
+ */
+@Controller
+@RequestMapping("/admin/")
+public class ClassificationControll extends BasePageControll {
+
+ @RequestMapping("classifications")
+ public ModelAndView pageIndex(HttpServletRequest request) throws IOException {
+ return createModelAndView("/admin/classification/index.jsp");
+ }
+}
diff --git a/src/main/resources/metadata-conf.xml b/src/main/resources/metadata-conf.xml
index f19c174f9..164ea11c4 100644
--- a/src/main/resources/metadata-conf.xml
+++ b/src/main/resources/metadata-conf.xml
@@ -92,7 +92,7 @@
-
+
@@ -141,6 +141,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/_include/NavLeftAdmin.jsp b/src/main/webapp/_include/NavLeftAdmin.jsp
index e0c539ce0..67c2ed993 100644
--- a/src/main/webapp/_include/NavLeftAdmin.jsp
+++ b/src/main/webapp/_include/NavLeftAdmin.jsp
@@ -27,8 +27,9 @@