diff --git a/doc/5.2-patch.sql b/doc/5.2-patch.sql index 4c00240e..60046e86 100644 --- a/doc/5.2-patch.sql +++ b/doc/5.2-patch.sql @@ -203,3 +203,28 @@ ALTER TABLE `log` MODIFY COLUMN `log_error_msg` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '错误消息' AFTER `id`, MODIFY COLUMN `log_result` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '返回参数' AFTER `log_error_msg`, MODIFY COLUMN `log_param` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '请求参数' AFTER `log_result`; + +alter table log rename to logger; + + +ALTER TABLE `role` +ADD COLUMN `create_by` int(10) NULL COMMENT '创建人', +ADD COLUMN `create_date` datetime(0) NULL COMMENT '创建时间', +ADD COLUMN `update_by` int(10) NULL COMMENT '更新人', +ADD COLUMN `update_date` datetime(0) NULL COMMENT '更新时间', +ADD COLUMN `del` int(1) NULL COMMENT '删除标识'; + +ALTER TABLE `model` +ADD COLUMN `create_by` int(10) NULL COMMENT '创建人', +ADD COLUMN `create_date` datetime(0) NULL COMMENT '创建时间', +ADD COLUMN `update_by` int(10) NULL COMMENT '更新人', +ADD COLUMN `update_date` datetime(0) NULL COMMENT '更新时间', +ADD COLUMN `del` int(1) NULL COMMENT '删除标识'; + +ALTER TABLE `people` +ADD COLUMN `create_by` int(10) NULL COMMENT '创建人', +ADD COLUMN `create_date` datetime(0) NULL COMMENT '创建时间', +ADD COLUMN `update_by` int(10) NULL COMMENT '更新人', +ADD COLUMN `update_date` datetime(0) NULL COMMENT '更新时间', +ADD COLUMN `del` int(1) NULL COMMENT '删除标识'; + diff --git a/pom.xml b/pom.xml index a4827fc5..4c82b5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 net.mingsoft ms-mcms - 5.2.0-SNAPSHOT + 5.2.1-SNAPSHOT ms-mcms jar diff --git a/src/main/java/net/mingsoft/cms/biz/ICacheBiz.java b/src/main/java/net/mingsoft/cms/biz/ICacheBiz.java deleted file mode 100644 index a1fa0e57..00000000 --- a/src/main/java/net/mingsoft/cms/biz/ICacheBiz.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.mingsoft.cms.biz; - -public interface ICacheBiz { - - void set(String cacheName, String key, Object value); - - T get(String cacheName, String key, Class cls); - - void del(String cacheName, String key); - -} \ No newline at end of file diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java index 0aed2786..ff82eeed 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -22,37 +22,23 @@ package net.mingsoft.cms.biz.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.FileUtil; -import net.mingsoft.basic.constant.Const; -import net.mingsoft.basic.holder.DataHolder; -import net.mingsoft.basic.util.BasicUtil; +import net.mingsoft.base.biz.impl.BaseBizImpl; +import net.mingsoft.base.dao.IBaseDao; import net.mingsoft.cms.bean.CategoryBean; import net.mingsoft.cms.bean.ContentBean; -import net.mingsoft.cms.constant.e.CategoryTypeEnum; +import net.mingsoft.cms.biz.IContentBiz; import net.mingsoft.cms.dao.ICategoryDao; -import net.mingsoft.cms.entity.CategoryEntity; +import net.mingsoft.cms.dao.IContentDao; import net.mingsoft.cms.entity.ContentEntity; -import net.mingsoft.cms.util.CmsParserUtil; -import net.mingsoft.mdiy.bean.PageBean; import net.mingsoft.mdiy.entity.ModelEntity; -import net.mingsoft.mdiy.util.ParserUtil; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import net.mingsoft.base.biz.impl.BaseBizImpl; -import net.mingsoft.base.dao.IBaseDao; -import java.io.IOException; -import java.util.*; - -import net.mingsoft.cms.biz.IContentBiz; -import net.mingsoft.cms.dao.IContentDao; +import java.util.List; +import java.util.Map; /** * 文章管理持久化层 diff --git a/src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java deleted file mode 100644 index 6f5d8c65..00000000 --- a/src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.mingsoft.cms.biz.impl; - -import com.alibaba.fastjson.JSONObject; -import net.mingsoft.cms.biz.ICacheBiz; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.CacheManager; -import org.springframework.stereotype.Service; - -@Service("abc") -public class EhcacheBizImpl implements ICacheBiz { - - @Autowired - private CacheManager cacheManager; - - @Override - public void set(String cacheName, String key, Object value) { - this.cacheManager.getCache(cacheName).put(key, JSONObject.toJSONString(value)); - } - - @Override - public T get(String cacheName, String key, Class cls) { - String str = this.cacheManager.getCache(cacheName).get(key, String.class); - if (StringUtils.isBlank(str)) { - return null; - } - - return JSONObject.parseObject(str, cls); - } - - @Override - public void del(String cacheName, String key) { - this.cacheManager.getCache(cacheName).evictIfPresent(key); - } -} \ No newline at end of file diff --git a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java index 4203611d..93aa5c62 100755 --- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java +++ b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java @@ -20,7 +20,6 @@ */ package net.mingsoft.cms.dao; -import com.baomidou.mybatisplus.annotation.SqlParser; import net.mingsoft.base.dao.IBaseDao; import net.mingsoft.cms.entity.CategoryEntity; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml index 5124fedf..8266d56c 100755 --- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml @@ -307,13 +307,13 @@ and FIND_IN_SET(a.category_id,#{ids})>0 - and a.content_title like CONCAT(CONCAT("%",#{map.content_title}),"%") + and a.content_title like CONCAT(CONCAT('%',#{map.content_title}),'%') - and a.content_author like CONCAT(CONCAT("%",#{map.content_author}),"%") + and a.content_author like CONCAT(CONCAT('%',#{map.content_author}),'%') - and a.content_source like CONCAT(CONCAT("%",#{map.content_source}),"%") + and a.content_source like CONCAT(CONCAT('%',#{map.content_source}),'%') and @@ -321,13 +321,13 @@ - and a.content_description like CONCAT(CONCAT("%",#{map.content_description}),"%") + and a.content_description like CONCAT(CONCAT('%',#{map.content_description}),'%') - and a.content_keyword like CONCAT(CONCAT("%",#{map.content_keyword}),"%") + and a.content_keyword like CONCAT(CONCAT('%',#{map.content_keyword}),'%') - and a.content_details like CONCAT(CONCAT("%",#{map.content_details}),"%") + and a.content_details like CONCAT(CONCAT('%',#{map.content_details}),'%') @@ -341,7 +341,7 @@ - and d.${field.key} like CONCAT(CONCAT("%",#{item.value}),"%") + and d.${field.key} like CONCAT(CONCAT('%',#{item.value}),'%') diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index 5d734051..a1298566 100755 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -27,7 +27,6 @@ import freemarker.core.ParseException; import freemarker.template.MalformedTemplateNameException; import freemarker.template.TemplateNotFoundException; import net.mingsoft.base.constant.Const; -import net.mingsoft.basic.holder.DataHolder; import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.basic.util.SpringUtil; import net.mingsoft.cms.bean.CategoryBean; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8e08f571..42b78104 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,17 +1,17 @@ -#spring: -# datasource: -# url: jdbc:mysql://192.168.0.8:3316/mcms-dev-5.2-8?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true -# username: mcms -# password: mcms -# filters: wall,mergeStat -# type: com.alibaba.druid.pool.DruidDataSource - spring: datasource: - driver-class-name: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@192.168.0.7:1521:helowin + url: jdbc:mysql://192.168.0.8:3316/mcms-dev-5.2-8?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true username: mcms password: mcms filters: wall,mergeStat type: com.alibaba.druid.pool.DruidDataSource +#spring: +# datasource: +# driver-class-name: oracle.jdbc.driver.OracleDriver +# url: jdbc:oracle:thin:@192.168.0.7:1521:helowin +# username: mcms +# password: mcms +# filters: wall,mergeStat +# type: com.alibaba.druid.pool.DruidDataSource + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4488d8b6..523b0d58 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -96,6 +96,6 @@ mybatis-plus: db-config: id-type: auto configuration: - database-id: oracle + database-id: mysql cache-enabled: true jdbc-type-for-null: 'null' #注意：单引号 diff --git a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl index 53551b9b..fd4a357f 100644 --- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl @@ -11,7 +11,7 @@ <@shiro.hasPermission name="cms:content:save"> - 新增 + 新增 <@shiro.hasPermission name="cms:content:del"> 删除 @@ -368,13 +368,18 @@ }, //新增 save: function (id) { + //id有值时编辑 if (id) { location.href = this.manager + "/cms/content/form.do?id=" + id; - } else if (id == 0){ - //在全部栏目下新增文章 - location.href = this.manager + "/cms/content/form.do"; - } else { - location.href = this.manager + "/cms/content/form.do?categoryId=" + this.form.categoryId; + }else { + //根据当前栏目新增时自动选中栏目 + var categoryId = this.form.categoryId; + if (categoryId) { + location.href = this.manager + "/cms/content/form.do?categoryId=" + this.form.categoryId; + }else { + //如果栏目id没有值就单纯的新增，不自动选定栏目 + location.href = this.manager + "/cms/content/form.do"; + } } }, //表格数据转换