diff --git a/nginx-admin.db3 b/nginx-admin.db3
index c15888f..9490943 100644
Binary files a/nginx-admin.db3 and b/nginx-admin.db3 differ
diff --git a/src/main/java/xyz/wbsite/module/admin/ent/Config.java b/src/main/java/xyz/wbsite/module/admin/ent/Config.java
index c73eb36..f5139be 100644
--- a/src/main/java/xyz/wbsite/module/admin/ent/Config.java
+++ b/src/main/java/xyz/wbsite/module/admin/ent/Config.java
@@ -11,7 +11,7 @@ import xyz.wbsite.frame.base.BaseEntity;
*
* @author wangbing
* @version 0.0.1
- * @since 2021-02-07
+ * @since 2021-02-08
*/
@ExcelSheet("配置预设")
public class Config extends BaseEntity {
@@ -28,6 +28,12 @@ public class Config extends BaseEntity {
@ExcelProperty("配置类型")
@ExcelNote("")
private String confType;
+ /**
+ * CONF_KEY - 配置属名
+ */
+ @ExcelProperty("配置属名")
+ @ExcelNote("")
+ private String confKey;
/**
* CONF_VALUE - 配置属值
*/
@@ -57,6 +63,14 @@ public class Config extends BaseEntity {
this.confType = confType;
}
+ public String getConfKey() {
+ return this.confKey;
+ }
+
+ public void setConfKey(String confKey) {
+ this.confKey = confKey;
+ }
+
public String getConfValue() {
return this.confValue;
}
diff --git a/src/main/java/xyz/wbsite/module/admin/mgr/ConfigManager.java b/src/main/java/xyz/wbsite/module/admin/mgr/ConfigManager.java
index 70533d0..31f9614 100644
--- a/src/main/java/xyz/wbsite/module/admin/mgr/ConfigManager.java
+++ b/src/main/java/xyz/wbsite/module/admin/mgr/ConfigManager.java
@@ -15,7 +15,7 @@ import xyz.wbsite.frame.base.Token;
*
* @author wangbing
* @version 0.0.1
- * @since 2021-02-07
+ * @since 2021-02-08
*/
public interface ConfigManager {
diff --git a/src/main/java/xyz/wbsite/module/admin/mgr/ConfigManagerImpl.java b/src/main/java/xyz/wbsite/module/admin/mgr/ConfigManagerImpl.java
index dc58efd..9de2d55 100644
--- a/src/main/java/xyz/wbsite/module/admin/mgr/ConfigManagerImpl.java
+++ b/src/main/java/xyz/wbsite/module/admin/mgr/ConfigManagerImpl.java
@@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
*
* @author wangbing
* @version 0.0.1
- * @since 2021-02-07
+ * @since 2021-02-08
*/
@Transactional
@Service
diff --git a/src/main/java/xyz/wbsite/module/admin/mpr/ConfigMapper.java b/src/main/java/xyz/wbsite/module/admin/mpr/ConfigMapper.java
index 066cf29..ea30b84 100644
--- a/src/main/java/xyz/wbsite/module/admin/mpr/ConfigMapper.java
+++ b/src/main/java/xyz/wbsite/module/admin/mpr/ConfigMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
* CONFIG - 配置预设
*
* @author wangbing
- * @since 2021-02-07
+ * @since 2021-02-08
*/
@Mapper
public interface ConfigMapper {
diff --git a/src/main/java/xyz/wbsite/module/admin/mpr/ConfigMapper.xml b/src/main/java/xyz/wbsite/module/admin/mpr/ConfigMapper.xml
index fadf5f0..04429c6 100644
--- a/src/main/java/xyz/wbsite/module/admin/mpr/ConfigMapper.xml
+++ b/src/main/java/xyz/wbsite/module/admin/mpr/ConfigMapper.xml
@@ -7,13 +7,14 @@
"NA_CONFIG"
- "ID","CONF_NAME","CONF_TYPE","CONF_VALUE","CONF_NOTE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+ "ID","CONF_NAME","CONF_TYPE","CONF_KEY","CONF_VALUE","CONF_NOTE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+
@@ -35,6 +36,7 @@
#{request.id},
#{request.confName,jdbcType=VARCHAR},
#{request.confType,jdbcType=VARCHAR},
+ #{request.confKey,jdbcType=VARCHAR},
#{request.confValue,jdbcType=VARCHAR},
#{request.confNote,jdbcType=VARCHAR},
0,
@@ -57,6 +59,7 @@
#{item.id},
#{item.confName,jdbcType=VARCHAR},
#{item.confType,jdbcType=VARCHAR},
+ #{item.confKey,jdbcType=VARCHAR},
#{item.confValue,jdbcType=VARCHAR},
#{item.confNote,jdbcType=VARCHAR},
0,
@@ -93,6 +96,7 @@
SET
CONF_NAME = #{request.confName,jdbcType=VARCHAR},
CONF_TYPE = #{request.confType,jdbcType=VARCHAR},
+ CONF_KEY = #{request.confKey,jdbcType=VARCHAR},
CONF_VALUE = #{request.confValue,jdbcType=VARCHAR},
CONF_NOTE = #{request.confNote,jdbcType=VARCHAR},
"ROW_VERSION" = "ROW_VERSION" + 1,
@@ -115,6 +119,12 @@
AND "CONF_TYPE" = #{request.confType}
+
+ AND "CONF_KEY" = #{request.confKey}
+
+
+ AND "CONF_VALUE" = #{request.confValue}
+