From 64785bb87df8e499f126f7b634d7fad158c6592d Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sat, 11 Mar 2023 23:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AFdb=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8ActiveRecord?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-server/pom.xml                     |  5 +++++
 .../proxy/server/base/db/DBInitialize.java        | 15 +++++++++------
 .../proxy/server/dal/entity/JobInfoDO.java        |  2 ++
 .../proxy/server/dal/entity/LicenseDO.java        |  2 ++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml
index d224271a..336c0041 100644
--- a/neutrino-proxy-server/pom.xml
+++ b/neutrino-proxy-server/pom.xml
@@ -30,6 +30,11 @@
             <artifactId>mybatis-pagehelper-solon-plugin</artifactId>
             <version>2.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>activerecord-solon-plugin</artifactId>
+            <version>2.2.1</version>
+        </dependency>
         <!--orika-->
         <dependency>
             <groupId>ma.glasnost.orika</groupId>
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java
index 7bbf6a95..f52dcf06 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java
@@ -22,7 +22,7 @@
 package fun.asgc.neutrino.proxy.server.base.db;
 
 import com.google.common.collect.Lists;
-import fun.asgc.neutrino.core.db.template.JdbcTemplate;
+import com.jfinal.plugin.activerecord.Db;
 import fun.asgc.neutrino.core.util.Assert;
 import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.core.util.FileUtil;
@@ -48,9 +48,12 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 	private static List<String> initDataTableNameList = Lists.newArrayList("user", "license", "port_pool", "port_mapping", "job_info");
 	@Inject
 	private DbConfig dbConfig;
-	@Inject
-	private JdbcTemplate jdbcTemplate;
 	private DbTypeEnum dbTypeEnum;
+//	@Inject
+//	private JdbcTemplate jdbcTemplate;
+//	@Inject
+//	private DataSource dataSource;
+
 
 	@Init
 	public void init() throws Throwable {
@@ -84,7 +87,7 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 			sql += "\r\n" + line.trim();
 			if (sql.endsWith(";")) {
 				log.debug("初始化数据库表 sql:{}", sql);
-				jdbcTemplate.update(sql);
+				Db.update(sql);
 				sql = "";
 			}
 		}
@@ -101,7 +104,7 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 		for (String tableName : initDataTableNameList) {
 			// 表里没有数据的时候，才进行初始化操作
 
-			int count = jdbcTemplate.queryForInt(String.format("select count(1) from `%s`", tableName));
+			int count = Db.queryInt(String.format("select count(1) from `%s`", tableName));
 			if (count > 0) {
 				continue;
 			}
@@ -117,7 +120,7 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 				sql += "\r\n" + line.trim();
 				if (sql.endsWith(";")) {
 					log.debug("初始化数据[table={}] sql:{}", tableName, sql);
-					jdbcTemplate.update(sql);
+					Db.update(sql);
 					sql = "";
 				}
 			}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java
index 094de4db..0baabbc5 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java
@@ -22,6 +22,7 @@
 package fun.asgc.neutrino.proxy.server.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -43,6 +44,7 @@ public class JobInfoDO {
 	@TableId(type = IdType.AUTO)
 	private Integer id;
 	private String cron;
+	@TableField("`desc`")
 	private String desc;
 	private String alarmEmail;
 	private String alarmDing;
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/LicenseDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/LicenseDO.java
index 390ef334..e2e88531 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/LicenseDO.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/LicenseDO.java
@@ -22,6 +22,7 @@
 package fun.asgc.neutrino.proxy.server.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum;
@@ -50,6 +51,7 @@ public class LicenseDO {
 	/**
 	 * licenseKey
 	 */
+	@TableField("`key`")
 	private String key;
 	/**
 	 * 用户ID