修复bug
This commit is contained in:
parent
9756518080
commit
ef542c34cc
9
pom.xml
9
pom.xml
|
@ -52,7 +52,7 @@
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- 如果使用的是mysql8.0需要使用8.0的驱动 -->
|
<!-- 如果使用的是mysql8.0需要使用8.0的驱动 -->
|
||||||
<!-- <dependency>-->
|
<!-- <dependency>-->
|
||||||
<!-- <groupId>mysql</groupId>-->
|
<!-- <groupId>mysql</groupId>-->
|
||||||
<!-- <artifactId>mysql-connector-java</artifactId>-->
|
<!-- <artifactId>mysql-connector-java</artifactId>-->
|
||||||
|
@ -62,6 +62,11 @@
|
||||||
<groupId>net.mingsoft</groupId>
|
<groupId>net.mingsoft</groupId>
|
||||||
<artifactId>ms-mpeople</artifactId>
|
<artifactId>ms-mpeople</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.mingsoft</groupId>
|
||||||
|
<artifactId>ms-basic</artifactId>
|
||||||
|
<version>1.0.23</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.mingsoft</groupId>
|
<groupId>net.mingsoft</groupId>
|
||||||
<artifactId>ms-upgrader</artifactId>
|
<artifactId>ms-upgrader</artifactId>
|
||||||
|
@ -288,4 +293,4 @@
|
||||||
|
|
||||||
<finalName>ms-mcms</finalName>
|
<finalName>ms-mcms</finalName>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -139,6 +139,7 @@ public class CmsParserUtil extends ParserUtil {
|
||||||
if (ParserUtil.hasMobileFile(column.getCategoryListUrl())) {
|
if (ParserUtil.hasMobileFile(column.getCategoryListUrl())) {
|
||||||
writer = new StringWriter();
|
writer = new StringWriter();
|
||||||
mobileTemplate.process(null, writer);
|
mobileTemplate.process(null, writer);
|
||||||
|
parserParams.put(ParserUtil.MOBILE, BasicUtil.getApp().getAppMobileStyle());
|
||||||
tag = new TagParser(writer.toString(), parserParams);
|
tag = new TagParser(writer.toString(), parserParams);
|
||||||
// 将tag.getContent()写入路径
|
// 将tag.getContent()写入路径
|
||||||
FileUtil.writeString(tag.rendering(), mobilePath, Const.UTF8);
|
FileUtil.writeString(tag.rendering(), mobilePath, Const.UTF8);
|
||||||
|
@ -170,6 +171,7 @@ public class CmsParserUtil extends ParserUtil {
|
||||||
if (ParserUtil.hasMobileFile(column.getCategoryListUrl())) {
|
if (ParserUtil.hasMobileFile(column.getCategoryListUrl())) {
|
||||||
writer = new StringWriter();
|
writer = new StringWriter();
|
||||||
mobileTemplate.process(null, writer);
|
mobileTemplate.process(null, writer);
|
||||||
|
parserParams.put(ParserUtil.MOBILE, BasicUtil.getApp().getAppMobileStyle());
|
||||||
tag = new TagParser(writer.toString(),parserParams);
|
tag = new TagParser(writer.toString(),parserParams);
|
||||||
// 将tag.getContent()写入路径
|
// 将tag.getContent()写入路径
|
||||||
FileUtil.writeString(tag.rendering(), mobilePath, Const.UTF8);
|
FileUtil.writeString(tag.rendering(), mobilePath, Const.UTF8);
|
||||||
|
@ -227,7 +229,7 @@ public class CmsParserUtil extends ParserUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 判断文件是否存在,若不存在弹出返回信息
|
// 判断文件是否存在,若不存在弹出返回信息
|
||||||
if (!FileUtil.exist(ParserUtil.buildTempletPath(columnUrl))||StringUtils.isBlank(articleIdList.get(artId).getCategoryId())||articleIdList.get(artId).getCategoryType()==null) {
|
if (!FileUtil.exist(ParserUtil.buildTempletPath(columnUrl))||articleIdList.get(artId).getCategoryId()==null||articleIdList.get(artId).getCategoryType()==null) {
|
||||||
artId++;
|
artId++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,8 +4,10 @@ import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.apache.shiro.mgt.SecurityManager;
|
import org.apache.shiro.mgt.SecurityManager;
|
||||||
|
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
|
||||||
import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
|
import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
|
||||||
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
|
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
|
||||||
|
import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
@ -19,6 +21,21 @@ public class ShiroConfig {
|
||||||
@Value("${ms.manager.path}")
|
@Value("${ms.manager.path}")
|
||||||
private String managerPath;
|
private String managerPath;
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public AuthorizationAttributeSourceAdvisor getAuthorizationAttributeSourceAdvisor(
|
||||||
|
DefaultWebSecurityManager securityManager) {
|
||||||
|
AuthorizationAttributeSourceAdvisor advisor = new AuthorizationAttributeSourceAdvisor();
|
||||||
|
advisor.setSecurityManager(securityManager);
|
||||||
|
return advisor;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public DefaultAdvisorAutoProxyCreator getDefaultAdvisorAutoProxyCreator() {
|
||||||
|
DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator();
|
||||||
|
autoProxyCreator.setProxyTargetClass(true);
|
||||||
|
return autoProxyCreator;
|
||||||
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
|
public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
|
||||||
ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();
|
ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();
|
||||||
|
@ -65,4 +82,4 @@ public class ShiroConfig {
|
||||||
public BaseAuthRealm customRealm() {
|
public BaseAuthRealm customRealm() {
|
||||||
return new BaseAuthRealm();
|
return new BaseAuthRealm();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,6 @@ spring:
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
|
url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
|
||||||
username: root
|
username: root
|
||||||
password: root
|
password: 123456
|
||||||
filters: wall,mergeStat
|
filters: wall,mergeStat
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
|
|
|
@ -445,7 +445,7 @@
|
||||||
var that = this;
|
var that = this;
|
||||||
ms.http.get(ms.manager + "/cms/content/get.do", {"id": id}).then(function (res) {
|
ms.http.get(ms.manager + "/cms/content/get.do", {"id": id}).then(function (res) {
|
||||||
if (res.result && res.data) {
|
if (res.result && res.data) {
|
||||||
if (res.data.contentType) {
|
if (res.data.contentType&&res.data.contentType!='') {
|
||||||
res.data.contentType = res.data.contentType.split(',');
|
res.data.contentType = res.data.contentType.split(',');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -575,4 +575,4 @@
|
||||||
#form {
|
#form {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -0,0 +1,20 @@
|
||||||
|
if (typeof Object.assign != 'function') {
|
||||||
|
Object.assign = function(target) {
|
||||||
|
'use strict';
|
||||||
|
if (target == null) {
|
||||||
|
throw new TypeError('Cannot convert undefined or null to object');
|
||||||
|
}
|
||||||
|
target = Object(target);
|
||||||
|
for (var index = 1; index < arguments.length; index++) {
|
||||||
|
var source = arguments[index];
|
||||||
|
if (source != null) {
|
||||||
|
for (var key in source) {
|
||||||
|
if (Object.prototype.hasOwnProperty.call(source, key)) {
|
||||||
|
target[key] = source[key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return target;
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue