diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/core/NewTreeSelect.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/core/NewTreeSelect.java
index 70960aa..8a89e77 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/core/NewTreeSelect.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/core/NewTreeSelect.java
@@ -27,6 +27,8 @@ public class NewTreeSelect{
/** 栏目模板 */
private String temp;
+ /** 图标 */
+ private String iconUrl;
/** 子节点 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -43,6 +45,7 @@ public class NewTreeSelect{
this.label = category.getCategoryName();
this.jumpUrl = category.getCategoryUrl();
this.temp = category.getTemp();
+ this.iconUrl = category.getIconUrl();
this.children = category.getChildren().stream().map(NewTreeSelect::new).collect(Collectors.toList());
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java
index e8a2227..da3a998 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/CmsCategory.java
@@ -14,7 +14,7 @@ import java.util.List;
/**
* 栏目对象 cms_category
- *
+ *
* @author 点亮信息
* @date 2024-07-18
*/
@@ -49,6 +49,9 @@ public class CmsCategory extends BaseEntity
/** 是否显示(0:显示,1:不显示,默认0) */
@Excel(name = "是否显示(0:显示,1:不显示,默认0)")
private String isDisable;
+ /** 栏目名称 */
+ @Excel(name = "图标")
+ private String iconUrl;
/** 逻辑删除0未删除1真删除 */
private Integer delFlag;
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ad9caf2..8d678ce 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
- port: 8080
+ port: 8089
servlet:
# 应用的访问路径
context-path: /
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/CmsCategoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/CmsCategoryMapper.xml
index 30c0c27..6a59ccb 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/CmsCategoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/CmsCategoryMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -18,15 +18,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select id, category_name, category_sort, category_url, parent_id, temp, is_disable, remark, del_flag, create_time, create_by, update_time, update_by from cms_category
+ select id, category_name, category_sort, category_url, parent_id, temp, is_disable, remark, del_flag, create_time, create_by, update_time, update_by, icon_url from cms_category
-
+
\ No newline at end of file
+
diff --git a/ruoyi-admin/target/classes/application.yml b/ruoyi-admin/target/classes/application.yml
index 7416da8..8d678ce 100644
--- a/ruoyi-admin/target/classes/application.yml
+++ b/ruoyi-admin/target/classes/application.yml
@@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
- port: 8080
+ port: 8089
servlet:
# 应用的访问路径
context-path: /
@@ -95,7 +95,9 @@ token:
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期(默认30分钟)
- expireTime: 30
+ expireTime: 999999999
+
+
## MyBatis配置
#mybatis:
diff --git a/ruoyi-admin/target/classes/mapper/cms/CmsCategoryMapper.xml b/ruoyi-admin/target/classes/mapper/cms/CmsCategoryMapper.xml
index 30c0c27..6a59ccb 100644
--- a/ruoyi-admin/target/classes/mapper/cms/CmsCategoryMapper.xml
+++ b/ruoyi-admin/target/classes/mapper/cms/CmsCategoryMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -18,15 +18,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select id, category_name, category_sort, category_url, parent_id, temp, is_disable, remark, del_flag, create_time, create_by, update_time, update_by from cms_category
+ select id, category_name, category_sort, category_url, parent_id, temp, is_disable, remark, del_flag, create_time, create_by, update_time, update_by, icon_url from cms_category
-
+
and category_name like concat('%', #{categoryName}, '%')
and category_sort = #{categorySort}
and category_url = #{categoryUrl}
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by parent_id, category_sort
-
+
where id = #{id}
@@ -59,6 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_by,
update_time,
update_by,
+ icon_url,
+
#{id},
@@ -74,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{createBy},
#{updateTime},
#{updateBy},
+ #{iconUrl},
@@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_by = #{createBy},
update_time = #{updateTime},
update_by = #{updateBy},
+ icon_url = #{iconUrl},
+
where id = #{id}
@@ -108,4 +114,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) from cms_category where parent_id = #{id}
-
\ No newline at end of file
+
diff --git a/ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml b/ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml
index 928600b..0f8cef6 100644
--- a/ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml
+++ b/ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml
@@ -17,6 +17,7 @@
+
@@ -53,6 +54,7 @@
author,
editor,
summary,
+ tag_name,
status,
publish_date,
offline_date,
@@ -111,6 +113,7 @@
content_img,
source,
source_url,
+ tag_name,
original,
author,
editor,
@@ -170,6 +173,7 @@
original,
author,
editor,
+ tag_name,
summary,
status,
publish_date,
@@ -199,6 +203,7 @@
#{original},
#{author},
#{editor},
+ #{tagName},
#{summary},
#{status},
#{publishDate},
@@ -236,6 +241,7 @@
source_url = #{sourceUrl},
original = #{original},
author = #{author},
+ tag_name = #{tagName},
editor = #{editor},
summary = #{summary},
status = #{status},
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index c92100f..b5c427a 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -4,6 +4,6 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心
# 开发环境配置
ENV = 'development'
# 若依管理系统/开发环境
-VUE_APP_BASE_API = 'https://f382b38516.zicp.fun'
+VUE_APP_BASE_API = 'http://192.168.31.72:8089'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true