From 7d10b530281f8bd7314db535dff71534caceeae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E6=98=BE=E4=BC=98?= <237809796@qq.com>
Date: Thu, 3 Nov 2022 12:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/tccn/base/BaseServlet.java  |  4 +-
 src/main/java/net/tccn/base/MetaKit.java      | 51 +++++++++++--------
 .../net/tccn/base/dbq/jdbc/api/DbAccount.java |  2 +-
 src/main/java/net/tccn/dict/Dict.java         |  2 +-
 src/main/java/net/tccn/file/_FileService.java |  6 +--
 src/main/java/net/tccn/meta/MetaLink.java     |  2 +-
 src/main/java/net/tccn/meta/MetaService.java  |  2 +-
 src/main/java/net/tccn/meta/MetaTable.java    |  2 +-
 .../java/net/tccn/meta/MetadataService.java   |  4 +-
 .../tccn/plat/{DbPlat.java => MetaDb.java}    |  6 +--
 .../tccn/plat/{SysPlat.java => MetaPlat.java} | 10 ++--
 src/main/java/net/tccn/plat/PlatService.java  | 10 ++--
 src/main/java/net/tccn/qtask/TaskEntity.java  |  2 +-
 .../tccn/user/{User.java => MetaUser.java}    | 10 ++--
 src/main/java/net/tccn/user/UserService.java  | 12 ++---
 src/test/java/RunTest.java                    |  6 +--
 16 files changed, 70 insertions(+), 61 deletions(-)
 rename src/main/java/net/tccn/plat/{DbPlat.java => MetaDb.java} (80%)
 rename src/main/java/net/tccn/plat/{SysPlat.java => MetaPlat.java} (56%)
 rename src/main/java/net/tccn/user/{User.java => MetaUser.java} (85%)

diff --git a/src/main/java/net/tccn/base/BaseServlet.java b/src/main/java/net/tccn/base/BaseServlet.java
index b8abd8f..dbaedb1 100644
--- a/src/main/java/net/tccn/base/BaseServlet.java
+++ b/src/main/java/net/tccn/base/BaseServlet.java
@@ -1,6 +1,6 @@
 package net.tccn.base;
 
-import net.tccn.user.User;
+import net.tccn.user.MetaUser;
 import net.tccn.user.UserService;
 import org.redkale.net.http.HttpRequest;
 import org.redkale.net.http.HttpResponse;
@@ -35,7 +35,7 @@ public class BaseServlet extends HttpServlet {
         }
 
         if (sessionid != null) {
-            User user = userService.current(sessionid);
+            MetaUser user = userService.current(sessionid);
             /*request.setCurrentUserSupplier(() -> {
                 return user;
             });*/
diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java
index 6e7dfc9..89cb900 100644
--- a/src/main/java/net/tccn/base/MetaKit.java
+++ b/src/main/java/net/tccn/base/MetaKit.java
@@ -7,11 +7,11 @@ import net.tccn.base.dbq.jdbc.api.DbKit;
 import net.tccn.base.dbq.table.Field;
 import net.tccn.dict.Dict;
 import net.tccn.meta.*;
-import net.tccn.plat.DbPlat;
-import net.tccn.plat.SysPlat;
+import net.tccn.plat.MetaDb;
+import net.tccn.plat.MetaPlat;
 import net.tccn.qtask.TaskEntity;
 import net.tccn.qtask.TaskKit;
-import net.tccn.user.User;
+import net.tccn.user.MetaUser;
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.util.Comment;
 import org.redkale.util.TypeToken;
@@ -40,9 +40,9 @@ public final class MetaKit {
     @Getter
     private static List<DbAccount> dbPlats;
     @Getter
-    private static List<SysPlat> sysPlats;
+    private static List<MetaPlat> sysPlats;
     @Getter
-    private static List<User> users;
+    private static List<MetaUser> users;
     @Getter
     private static List<TaskEntity> taskEntities;
     @Getter
@@ -58,11 +58,20 @@ public final class MetaKit {
         reload(MetaLink.class);
         reload(MetaService.class);
         reload(DbAccount.class);
-        reload(SysPlat.class);
-        reload(User.class);
+        reload(MetaPlat.class);
+        reload(MetaUser.class);
         reload(TaskEntity.class);
         reload(Dict.class);
 
+        /*
+        同步 本地文件配置数据到 数据库
+        List<List<? extends Doc>> list = asList(metaTables, metaLinks, metaServices, dbPlats, sysPlats, users, taskEntities, dicts);
+        for (List<? extends Doc> docs : list) {
+            for (Doc doc : docs) {
+                doc.save();
+            }
+        }*/
+
     }
 
     public static <T extends Doc> void reload(Class<T> clazz) {
@@ -101,16 +110,16 @@ public final class MetaKit {
                     Type type = new TypeToken<List<DbAccount>>() {
                     }.getType();
                     dbPlats = FileKit.readAs(file, type);
-                } else if (DbPlat.class == clazz) {
+                } else if (MetaDb.class == clazz) {
                     Type type = new TypeToken<List<DbAccount>>() {
                     }.getType();
                     dbPlats = FileKit.readAs(file, type);;
-                } else if (SysPlat.class == clazz) {
-                    Type type = new TypeToken<List<SysPlat>>() {
+                } else if (MetaPlat.class == clazz) {
+                    Type type = new TypeToken<List<MetaPlat>>() {
                     }.getType();
                     sysPlats = FileKit.readAs(file, type);;
-                } else if (User.class == clazz) {
-                    Type type = new TypeToken<List<User>>() {
+                } else if (MetaUser.class == clazz) {
+                    Type type = new TypeToken<List<MetaUser>>() {
                     }.getType();
                     users = FileKit.readAs(file, type);;
                 } else if (TaskEntity.class == clazz) {
@@ -127,9 +136,9 @@ public final class MetaKit {
                 else if (MetaLink.class == clazz) metaLinks = MetaLink.dao.find();
                 else if (MetaService.class == clazz) metaServices = MetaService.dao.find();
                 else if (DbAccount.class == clazz) dbPlats = DbAccount.dao.find();
-                else if (DbPlat.class == clazz) dbPlats = DbAccount.dao.find();
-                else if (SysPlat.class == clazz) sysPlats = SysPlat.dao.find();
-                else if (User.class == clazz) users = User.dao.find();
+                else if (MetaDb.class == clazz) dbPlats = DbAccount.dao.find();
+                else if (MetaPlat.class == clazz) sysPlats = MetaPlat.dao.find();
+                else if (MetaUser.class == clazz) users = MetaUser.dao.find();
                 else if (TaskEntity.class == clazz) {
                     taskEntities = TaskEntity.dao.find();
                     TaskKit.init();
@@ -148,8 +157,8 @@ public final class MetaKit {
         cacheSave(MetaLink.class);
         cacheSave(MetaService.class);
         cacheSave(DbAccount.class);
-        cacheSave(SysPlat.class);
-        cacheSave(User.class);
+        cacheSave(MetaPlat.class);
+        cacheSave(MetaUser.class);
         cacheSave(TaskEntity.class);
         cacheSave(Dict.class);
     }
@@ -160,8 +169,8 @@ public final class MetaKit {
         else if (MetaLink.class == clazz) list = metaLinks;
         else if (MetaService.class == clazz) list = metaServices;
         else if (DbAccount.class == clazz) list = dbPlats;
-        else if (SysPlat.class == clazz) list = sysPlats;
-        else if (User.class == clazz) list = users;
+        else if (MetaPlat.class == clazz) list = sysPlats;
+        else if (MetaUser.class == clazz) list = users;
         else if (TaskEntity.class == clazz) list = taskEntities;
         else if (Dict.class == clazz) list = dicts;
 
@@ -534,7 +543,7 @@ public final class MetaKit {
 
     @Comment("通过平台token  得到平台id")
     public static String getPlatId(String platToken) { //
-        Optional<SysPlat> plat = sysPlats.stream().filter(x -> x.getToken().equals(platToken)).findAny();
+        Optional<MetaPlat> plat = sysPlats.stream().filter(x -> x.getToken().equals(platToken)).findAny();
         return plat.get().getKey();
     }
 
@@ -609,7 +618,7 @@ public final class MetaKit {
 
         List<T> list = asList();
         Map doc = t.toDoc();
-        if (t instanceof User) {
+        if (t instanceof MetaUser) {
             list = (List<T>) users;
         }
 
diff --git a/src/main/java/net/tccn/base/dbq/jdbc/api/DbAccount.java b/src/main/java/net/tccn/base/dbq/jdbc/api/DbAccount.java
index f84e994..6424e50 100644
--- a/src/main/java/net/tccn/base/dbq/jdbc/api/DbAccount.java
+++ b/src/main/java/net/tccn/base/dbq/jdbc/api/DbAccount.java
@@ -12,7 +12,7 @@ import javax.persistence.Table;
  * @author: liangxianyou at 2018/11/14 12:58.
  */
 @Data
-@Table(name = "db_plat", catalog = "db_dev")
+@Table(name = "db_plat", catalog = "db_meta")
 public class DbAccount extends Doc<DbAccount> {
     public static DbAccount dao = dao(DbAccount.class);
 
diff --git a/src/main/java/net/tccn/dict/Dict.java b/src/main/java/net/tccn/dict/Dict.java
index 8d543a0..dab3522 100644
--- a/src/main/java/net/tccn/dict/Dict.java
+++ b/src/main/java/net/tccn/dict/Dict.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @author: liangxianyou
  */
 @Data
-@Table(name = "Dict", catalog = "db_demo")
+@Table(name = "Dict", catalog = "db_meta")
 public class Dict extends Doc<Dict> implements Serializable {
     public static Dict dao = Doc.dao(Dict.class);
 
diff --git a/src/main/java/net/tccn/file/_FileService.java b/src/main/java/net/tccn/file/_FileService.java
index 6e48bb7..ae28e80 100644
--- a/src/main/java/net/tccn/file/_FileService.java
+++ b/src/main/java/net/tccn/file/_FileService.java
@@ -3,7 +3,7 @@ package net.tccn.file;
 import net.tccn.base.*;
 import net.tccn.base.dbq.table.Field;
 import net.tccn.meta.MetaTable;
-import net.tccn.plat.SysPlat;
+import net.tccn.plat.MetaPlat;
 import org.redkale.net.http.RestMapping;
 import org.redkale.net.http.RestParam;
 import org.redkale.net.http.RestService;
@@ -41,8 +41,8 @@ public class _FileService extends BaseService {
         }).collect(Collectors.toList());
     }
 
-    public SysPlat getSysPlat(String token) {
-        return getT(token, SysPlat.class, () -> SysPlat.dao.findFirst(new SysPlat(token)));
+    public MetaPlat getSysPlat(String token) {
+        return getT(token, MetaPlat.class, () -> MetaPlat.dao.findFirst(new MetaPlat(token)));
     }
 
     @RestMapping(name = "data", comment = "得到文件数据")
diff --git a/src/main/java/net/tccn/meta/MetaLink.java b/src/main/java/net/tccn/meta/MetaLink.java
index b47c42d..5b769f8 100644
--- a/src/main/java/net/tccn/meta/MetaLink.java
+++ b/src/main/java/net/tccn/meta/MetaLink.java
@@ -10,7 +10,7 @@ import java.util.Map;
  * Created by liangxianyou at 2018/12/25 16:22.
  */
 @Data
-@Table(name = "MetaLink", catalog = "db_demo")
+@Table(name = "MetaLink", catalog = "db_meta")
 public class MetaLink extends Doc<MetaLink> {
     public static MetaLink dao = Doc.dao(MetaLink.class);
 
diff --git a/src/main/java/net/tccn/meta/MetaService.java b/src/main/java/net/tccn/meta/MetaService.java
index a12b84b..1fff715 100644
--- a/src/main/java/net/tccn/meta/MetaService.java
+++ b/src/main/java/net/tccn/meta/MetaService.java
@@ -13,7 +13,7 @@ import java.util.Map;
  * Created by liangxianyou at 2018/12/24 16:15.
  */
 @Data
-@Table(name = "MetaService", catalog = "db_demo")
+@Table(name = "MetaService", catalog = "db_meta")
 public class MetaService extends Doc<MetaService> {
     public static MetaService dao = Doc.dao(MetaService.class);
 
diff --git a/src/main/java/net/tccn/meta/MetaTable.java b/src/main/java/net/tccn/meta/MetaTable.java
index 071db42..c6bde9f 100644
--- a/src/main/java/net/tccn/meta/MetaTable.java
+++ b/src/main/java/net/tccn/meta/MetaTable.java
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
  * @author: liangxianyou at 2018/10/17 12:58.
  */
 @Data
-@Table(name = "MetaTable", catalog = "db_demo")
+@Table(name = "MetaTable", catalog = "db_meta")
 public class MetaTable extends Doc<MetaTable> implements Serializable {
     public static final MetaTable dao = MetaTable.dao(MetaTable.class);
 
diff --git a/src/main/java/net/tccn/meta/MetadataService.java b/src/main/java/net/tccn/meta/MetadataService.java
index 41fed3d..dfaf72a 100644
--- a/src/main/java/net/tccn/meta/MetadataService.java
+++ b/src/main/java/net/tccn/meta/MetadataService.java
@@ -5,7 +5,7 @@ import net.tccn.base.JBean;
 import net.tccn.base.Kv;
 import net.tccn.base.MetaKit;
 import net.tccn.base.dbq.table.Field;
-import net.tccn.plat.SysPlat;
+import net.tccn.plat.MetaPlat;
 import org.redkale.net.http.RestMapping;
 import org.redkale.net.http.RestParam;
 import org.redkale.net.http.RestService;
@@ -295,7 +295,7 @@ public class MetadataService extends BaseService { //arango
     @RestMapping(name = "plat_list", comment = "平台列表")
     public JBean platList() {
         JBean jBean = new JBean();
-        List<SysPlat> plats = MetaKit.getSysPlats();
+        List<MetaPlat> plats = MetaKit.getSysPlats();
 
         return jBean.setBody(plats);
     }
diff --git a/src/main/java/net/tccn/plat/DbPlat.java b/src/main/java/net/tccn/plat/MetaDb.java
similarity index 80%
rename from src/main/java/net/tccn/plat/DbPlat.java
rename to src/main/java/net/tccn/plat/MetaDb.java
index 476dbd9..4506ea5 100644
--- a/src/main/java/net/tccn/plat/DbPlat.java
+++ b/src/main/java/net/tccn/plat/MetaDb.java
@@ -11,9 +11,9 @@ import java.util.List;
  * @author: liangxianyou at 2018/11/14 12:58.
  */
 @Data
-@Table(name = "db_plat", catalog = "db_dev")
-public class DbPlat extends Doc<DbPlat> {
-    public static DbPlat dao = dao(DbPlat.class);
+@Table(name = "MetaDb", catalog = "db_dev")
+public class MetaDb extends Doc<MetaDb> {
+    public static MetaDb dao = dao(MetaDb.class);
 
     private String name; //名称
     private String cate; //类型 mysql|ArangoDb
diff --git a/src/main/java/net/tccn/plat/SysPlat.java b/src/main/java/net/tccn/plat/MetaPlat.java
similarity index 56%
rename from src/main/java/net/tccn/plat/SysPlat.java
rename to src/main/java/net/tccn/plat/MetaPlat.java
index 5e7b0db..946d6fb 100644
--- a/src/main/java/net/tccn/plat/SysPlat.java
+++ b/src/main/java/net/tccn/plat/MetaPlat.java
@@ -9,17 +9,17 @@ import javax.persistence.Table;
  * @author: liangxianyou at 2018/11/26 17:46.
  */
 @Data
-@Table(name = "sys_plat", catalog = "db_dev")
-public class SysPlat extends Doc<SysPlat> {
-    public static SysPlat dao = dao(SysPlat.class);
+@Table(name = "MetaPlat", catalog = "db_meta")
+public class MetaPlat extends Doc<MetaPlat> {
+    public static MetaPlat dao = dao(MetaPlat.class);
 
     private String name;
     private String token;
 
-    public SysPlat() {
+    public MetaPlat() {
     }
 
-    public SysPlat(String token) {
+    public MetaPlat(String token) {
         this.token = token;
     }
 
diff --git a/src/main/java/net/tccn/plat/PlatService.java b/src/main/java/net/tccn/plat/PlatService.java
index c6f893b..24741aa 100644
--- a/src/main/java/net/tccn/plat/PlatService.java
+++ b/src/main/java/net/tccn/plat/PlatService.java
@@ -16,18 +16,18 @@ import java.util.List;
 public class PlatService extends BaseService {
 
     @RestMapping(name = "list", comment = "平台列表")
-    public JBean list(SysPlat plat, Flipper flipper) {
+    public JBean list(MetaPlat plat, Flipper flipper) {
         JBean jBean = new JBean();
 
         //PageBean<SysPlat> page = SysPlat.dao.findPage(plat, flipper);
-        List<SysPlat> list = MetaKit.getSysPlats();
+        List<MetaPlat> list = MetaKit.getSysPlats();
         PageBean page = PageBean.by(list, list.size());
 
         return jBean.setBody(page);
     }
 
     @Comment("平台信息保存")
-    public JBean save(SysPlat plat) {
+    public JBean save(MetaPlat plat) {
         MetaKit.save(plat);
         return JBean.OK;
     }
@@ -40,7 +40,7 @@ public class PlatService extends BaseService {
     //------------------------
 
     @RestMapping(name = "db_list", comment = "数据源列表")
-    public JBean dbList(DbPlat plat, Flipper flipper) {
+    public JBean dbList(MetaDb plat, Flipper flipper) {
         JBean jBean = new JBean();
 
         List<DbAccount> list = MetaKit.getDbPlats();
@@ -50,7 +50,7 @@ public class PlatService extends BaseService {
     }
 
     @RestMapping(name = "db_save", comment = "数据源信息保存")
-    public JBean dbSave(DbPlat plat) {
+    public JBean dbSave(MetaDb plat) {
         MetaKit.save(plat);
 
         return JBean.OK;
diff --git a/src/main/java/net/tccn/qtask/TaskEntity.java b/src/main/java/net/tccn/qtask/TaskEntity.java
index ad95f2f..cd71426 100644
--- a/src/main/java/net/tccn/qtask/TaskEntity.java
+++ b/src/main/java/net/tccn/qtask/TaskEntity.java
@@ -9,7 +9,7 @@ import javax.persistence.Table;
  * Created by liangxianyou at 2019/4/20 20:04.
  */
 @Data
-@Table(name = "qtask", catalog = "db_demo")
+@Table(name = "qtask", catalog = "db_meta")
 public class TaskEntity extends Doc<TaskEntity> {
     public static TaskEntity dao = dao(TaskEntity.class);
 
diff --git a/src/main/java/net/tccn/user/User.java b/src/main/java/net/tccn/user/MetaUser.java
similarity index 85%
rename from src/main/java/net/tccn/user/User.java
rename to src/main/java/net/tccn/user/MetaUser.java
index 402e164..3b1d292 100644
--- a/src/main/java/net/tccn/user/User.java
+++ b/src/main/java/net/tccn/user/MetaUser.java
@@ -11,9 +11,9 @@ import javax.persistence.Table;
  * @author: liangxianyou at 2018/11/22 17:37.
  */
 @Data
-@Table(name = "sys_user", catalog = "db_dev")
-public class User extends Doc<User> {
-    public static User dao = dao(User.class);
+@Table(name = "MetaUser", catalog = "db_meta")
+public class MetaUser extends Doc<MetaUser> {
+    public static MetaUser dao = dao(MetaUser.class);
 
     private String username;
     //@ConvertColumn(ignore = true,type = ConvertType.JSON)
@@ -23,10 +23,10 @@ public class User extends Doc<User> {
     private Integer status;
     private String sessionid;
 
-    public User() {
+    public MetaUser() {
     }
 
-    public User(String sessionid) {
+    public MetaUser(String sessionid) {
         this.sessionid = sessionid;
     }
     //-------------------------------
diff --git a/src/main/java/net/tccn/user/UserService.java b/src/main/java/net/tccn/user/UserService.java
index a9267bf..cca89c5 100644
--- a/src/main/java/net/tccn/user/UserService.java
+++ b/src/main/java/net/tccn/user/UserService.java
@@ -17,17 +17,17 @@ public class UserService extends BaseService {
     public JBean login(@RestSessionid String sessionid,
                        String username,
                        String pwd) {
-        User bean = new User();
+        MetaUser bean = new MetaUser();
         bean.setUsername(username);
 
-        User user = MetaKit.findFirst(bean);
+        MetaUser user = MetaKit.findFirst(bean);
         if (user == null) {
             return JBean.by(-1, "登陆失败:账号无效");
         }
 
         JBean jBean = user.checkLogin(pwd);
         if (jBean.getCode() == 0) {
-            cacheSource.set(30 * 60 * 2,sessionid, User.class, user);
+            cacheSource.set(30 * 60 * 2,sessionid, MetaUser.class, user);
 
             user.setSessionid(sessionid);
             user.setLoginTime(System.currentTimeMillis());
@@ -38,13 +38,13 @@ public class UserService extends BaseService {
     }
 
     @RestMapping(name = "current")
-    public User current(@RestSessionid String sessionid) {
-        return getT("user_" + sessionid, User.class, () -> MetaKit.findFirst(new User(sessionid)));
+    public MetaUser current(@RestSessionid String sessionid) {
+        return getT("user_" + sessionid, MetaUser.class, () -> MetaKit.findFirst(new MetaUser(sessionid)));
     }
 
     @RestMapping(name = "logout", comment = "退出登陆")
     public JBean logout(@RestSessionid String sessionid) {
-        User user = MetaKit.findFirst(new User(sessionid));
+        MetaUser user = MetaKit.findFirst(new MetaUser(sessionid));
         if (user != null) {
             user.setSessionid("");
             MetaKit.save(user);
diff --git a/src/test/java/RunTest.java b/src/test/java/RunTest.java
index 772e574..1f88a4c 100644
--- a/src/test/java/RunTest.java
+++ b/src/test/java/RunTest.java
@@ -9,7 +9,7 @@ import net.tccn.meta.MetaService;
 import net.tccn.meta.MetaTable;
 import net.tccn.qtask.TaskEntity;
 import net.tccn.qtask.TaskKit;
-import net.tccn.user.User;
+import net.tccn.user.MetaUser;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.junit.Test;
 import org.redkale.convert.json.JsonConvert;
@@ -165,10 +165,10 @@ public class RunTest<T> {
 
     //@Test
     public void userCreate() {
-        User user = new User();
+        MetaUser user = new MetaUser();
         user.setUsername("admin");
         user.setCreateTime(System.currentTimeMillis());
-        user.setPwd(User.md5IfNeed("123456"));
+        user.setPwd(MetaUser.md5IfNeed("123456"));
         user.setStatus(1);
 
         user.save();