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 @@
mybatis-pagehelper-solon-plugin
2.2.1
+
+ org.noear
+ activerecord-solon-plugin
+ 2.2.1
+
ma.glasnost.orika
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 {
private static List 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 {
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 {
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 {
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