diff --git a/conf/application.xml b/conf/application.xml index c17c399..3057127 100644 --- a/conf/application.xml +++ b/conf/application.xml @@ -16,7 +16,7 @@ - + diff --git a/src/main/java/net/tccn/plat/PlatService.java b/src/main/java/net/tccn/service/PlatService.java similarity index 95% rename from src/main/java/net/tccn/plat/PlatService.java rename to src/main/java/net/tccn/service/PlatService.java index 31b8c13..99502d6 100644 --- a/src/main/java/net/tccn/plat/PlatService.java +++ b/src/main/java/net/tccn/service/PlatService.java @@ -1,10 +1,11 @@ -package net.tccn.plat; +package net.tccn.service; import net.tccn.base.JBean; import net.tccn.base.MetaKit; import net.tccn.base.PageBean; import net.tccn.dbq.jdbc.api.DbAccount; -import net.tccn.service.BaseService; +import net.tccn.plat.DbPlat; +import net.tccn.plat.SysPlat; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestService; import org.redkale.source.Flipper; diff --git a/src/main/java/net/tccn/user/UserService.java b/src/main/java/net/tccn/service/UserService.java similarity index 96% rename from src/main/java/net/tccn/user/UserService.java rename to src/main/java/net/tccn/service/UserService.java index d90ce9d..3113059 100644 --- a/src/main/java/net/tccn/user/UserService.java +++ b/src/main/java/net/tccn/service/UserService.java @@ -1,7 +1,7 @@ -package net.tccn.user; +package net.tccn.service; import net.tccn.base.JBean; -import net.tccn.service.BaseService; +import net.tccn.user.User; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestService; import org.redkale.net.http.RestSessionid; diff --git a/src/main/java/net/tccn/meta/_DbService.java b/src/main/java/net/tccn/service/_DbService.java similarity index 98% rename from src/main/java/net/tccn/meta/_DbService.java rename to src/main/java/net/tccn/service/_DbService.java index 9b9c515..3eeb1fb 100644 --- a/src/main/java/net/tccn/meta/_DbService.java +++ b/src/main/java/net/tccn/service/_DbService.java @@ -1,4 +1,4 @@ -package net.tccn.meta; +package net.tccn.service; import net.tccn.base.JBean; import net.tccn.base.MetaKit; @@ -6,6 +6,7 @@ import net.tccn.dbq.jdbc.api.DbAccount; import net.tccn.dbq.jdbc.api.DbKit; import net.tccn.dbq.table.Column; import net.tccn.dbq.table.Table; +import net.tccn.meta.MetaTable; import net.tccn.service.BaseService; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestService; diff --git a/src/main/java/net/tccn/meta/_TableService.java b/src/main/java/net/tccn/service/_TableService.java similarity index 97% rename from src/main/java/net/tccn/meta/_TableService.java rename to src/main/java/net/tccn/service/_TableService.java index 8a2e15c..7dd74a9 100644 --- a/src/main/java/net/tccn/meta/_TableService.java +++ b/src/main/java/net/tccn/service/_TableService.java @@ -1,12 +1,10 @@ -package net.tccn.meta; +package net.tccn.service; import net.tccn.base.JBean; import net.tccn.base.Kv; import net.tccn.base.MetaKit; -import net.tccn.dbq.jdbc.api.DbAccount; import net.tccn.dbq.table.Table; -import net.tccn.service.BaseService; -import net.tccn.service._FileService; +import net.tccn.meta.MetaTable; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; diff --git a/src/main/java/net/tccn/service/BaseServlet.java b/src/main/java/net/tccn/servlet/BaseServlet.java similarity index 97% rename from src/main/java/net/tccn/service/BaseServlet.java rename to src/main/java/net/tccn/servlet/BaseServlet.java index cc0770e..8a9eadd 100644 --- a/src/main/java/net/tccn/service/BaseServlet.java +++ b/src/main/java/net/tccn/servlet/BaseServlet.java @@ -1,12 +1,12 @@ -package net.tccn.service; +package net.tccn.servlet; import com.arangodb.ArangoDBException; import com.google.gson.Gson; import net.tccn.base.JBean; import net.tccn.base.Kv; import net.tccn.base.arango.ArangoSource; +import net.tccn.service.UserService; import net.tccn.user.User; -import net.tccn.user.UserService; import org.redkale.net.http.HttpRequest; import org.redkale.net.http.HttpResponse; import org.redkale.net.http.HttpScope;