diff --git a/pom.xml b/pom.xml
index 6987ebf..5e568b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,10 +41,11 @@
3.3
+
- com.lxyer
- excel
- 0.1.1
+ org.apache.poi
+ poi-ooxml
+ 4.1.0
@@ -54,12 +55,6 @@
provided
-
-
junit
junit
diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html
index d070c25..1a0493d 100644
--- a/root/metadata/dataList.html
+++ b/root/metadata/dataList.html
@@ -40,7 +40,7 @@
diff --git a/root/metadata/metaLink.html b/root/metadata/metaLink.html
index 8cc670a..4b8cf80 100644
--- a/root/metadata/metaLink.html
+++ b/root/metadata/metaLink.html
@@ -98,7 +98,7 @@
diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java
index 8d168da..f32e39a 100644
--- a/src/main/java/net/tccn/base/MetaKit.java
+++ b/src/main/java/net/tccn/base/MetaKit.java
@@ -482,17 +482,34 @@ public final class MetaKit {
// ---------------------- repository -------------------
public static void save(T ... ts) {
- Set> clazzs = new HashSet<>();
+ if (ts == null || ts.length == 0) return;
+
for (T t : ts) {
+ if ("file".equals(dcate)) {
+ if (t.getKey() == null) { //数据新增异常提示
+ throw new UnsupportedOperationException("数据文件形式启动服务,不支持配置新增!");
+ }
+
+ cacheSave(t.getClass());
+ return;
+ }
+
if (t.getKey() == null) {
t.save();
} else {
+
+ if (t instanceof MetaLink) {
+ //避免删除属性无效
+ if (((MetaLink) t).getLink() != null && ((MetaLink) t).getLink().size() > 0) {
+ t.find(String.format("UPDATE '%s' WITH { link:null } IN MetaLink", t.getKey()), Map.class);
+ }
+ }
+
t.update();
}
-
- clazzs.add((Class) t.getClass());
}
- clazzs.forEach(x -> reload(x));
+
+ reload(ts[0].getClass());
}
public static T findFirst(T t) {
diff --git a/src/main/java/net/tccn/base/MetaRender.java b/src/main/java/net/tccn/base/MetaRender.java
index 1866119..344e5ec 100644
--- a/src/main/java/net/tccn/base/MetaRender.java
+++ b/src/main/java/net/tccn/base/MetaRender.java
@@ -1,6 +1,5 @@
package net.tccn.base;
-import com.lxyer.excel.poi.ExcelKit;
import org.apache.poi.ss.usermodel.Workbook;
import org.redkale.convert.Convert;
import org.redkale.net.http.*;
diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java
index d147ca6..f483cb9 100644
--- a/src/main/java/net/tccn/service/MetadataService.java
+++ b/src/main/java/net/tccn/service/MetadataService.java
@@ -256,11 +256,6 @@ public class MetadataService extends BaseService { //arango
@RestMapping(name = "link_save", comment = "实体关系列表")
public JBean linkSave(MetaLink link, @RestParam(name = "platToken") String token) {
- if (link.getKey() != null) {
- link.find(String.format("UPDATE '%s' WITH { link:null } IN MetaLink", link.getKey()), Map.class); //避免删除属性无效
- // fixme: 将逻辑迁移到 MetaKit中:
- }
-
MetaKit.save(link);
return JBean.OK;
}
diff --git a/src/main/java/net/tccn/service/_FileService.java b/src/main/java/net/tccn/service/_FileService.java
index 8e347e3..9ae2fd0 100644
--- a/src/main/java/net/tccn/service/_FileService.java
+++ b/src/main/java/net/tccn/service/_FileService.java
@@ -1,6 +1,6 @@
package net.tccn.service;
-import com.lxyer.excel.poi.ExcelKit;
+import net.tccn.base.ExcelKit;
import net.tccn.base.JBean;
import net.tccn.base.Kv;
import net.tccn.dbq.Field;
diff --git a/src/main/java/net/tccn/servlet/BaseServlet.java b/src/main/java/net/tccn/servlet/BaseServlet.java
index 001607c..605f13c 100644
--- a/src/main/java/net/tccn/servlet/BaseServlet.java
+++ b/src/main/java/net/tccn/servlet/BaseServlet.java
@@ -67,6 +67,9 @@ public class BaseServlet extends HttpServlet {
} catch (ArangoDBException e) {
logger.log(Level.INFO, "arangodb init!", e);
ArangoSource.init();
+ } catch (UnsupportedOperationException e) {
+ e.printStackTrace();
+ response.finish(JBean.by(-1, e.getMessage()));
}
}
diff --git a/src/test/java/RunTest.java b/src/test/java/RunTest.java
index ded2965..1638064 100644
--- a/src/test/java/RunTest.java
+++ b/src/test/java/RunTest.java
@@ -20,10 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.reflect.Type;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static java.util.Arrays.asList;
@@ -122,7 +119,7 @@ public class RunTest {
}
- @Test
+ //@Test
public void buildeDetailTest() {
Kv kv = MetaKit.buildeDetail(MetaKit.getMetaService("user_service", "3421432"));
@@ -196,7 +193,7 @@ public class RunTest {
}
- @Test
+ //@Test
public void T() {
List metaTables = MetaKit.getMetaTables();
@@ -234,7 +231,7 @@ public class RunTest {
return str.substring(0, 1).toUpperCase() + str.substring(1);
}
- @Test
+ //@Test
public void taskRunTest() {
TaskEntity entity = TaskEntity.dao.findByKey("23074420");