Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d8c23a1103
106
bin-xml
106
bin-xml
|
@ -1,106 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
|
||||||
<version>2.2.2.RELEASE</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>ms-mcms</artifactId>
|
|
||||||
<version>5.2.0</version>
|
|
||||||
<name>ms-mcms</name>
|
|
||||||
<properties>
|
|
||||||
<java.version>1.8</java.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>ms-mpeople</artifactId>
|
|
||||||
<version>1.0.28</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- 此部分是铭飞平台MStroe的客户端(MStore不在铭飞开源产品范围),如果不需要使用MStore可以删除掉 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.mingsoft</groupId>
|
|
||||||
<artifactId>store-client</artifactId>
|
|
||||||
<version>5.1</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<build>
|
|
||||||
<finalName>ms-mcms</finalName>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>3.1</version>
|
|
||||||
<configuration>
|
|
||||||
<source>${java.version}</source>
|
|
||||||
<target>${java.version}</target>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>repackage</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<!--打包生产-->
|
|
||||||
<configuration>
|
|
||||||
<fork>true</fork>
|
|
||||||
<mainClass>net.mingsoft.MSApplication</mainClass>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
打包生产
|
|
||||||
-->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
|
||||||
<version>3.1.0</version>
|
|
||||||
<configuration>
|
|
||||||
<descriptors>
|
|
||||||
<descriptor>bin/assembly.xml</descriptor>
|
|
||||||
</descriptors>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>make-assembly</id>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>single</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
</plugins>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/java</directory>
|
|
||||||
<excludes>
|
|
||||||
<exclude>**/*.java</exclude>
|
|
||||||
</excludes>
|
|
||||||
</resource>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/webapp</directory>
|
|
||||||
<excludes>
|
|
||||||
<!--打包生产-->
|
|
||||||
<exclude>static/**</exclude>
|
|
||||||
<exclude>html/**</exclude>
|
|
||||||
<exclude>upload/**</exclude>
|
|
||||||
<exclude>templets/**</exclude>
|
|
||||||
<exclude>WEB-INF/**</exclude>
|
|
||||||
</excludes>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
<defaultGoal>compile</defaultGoal>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
|
@ -1,53 +0,0 @@
|
||||||
<assembly>
|
|
||||||
<id>bin</id>
|
|
||||||
<formats>
|
|
||||||
<format>dir</format>
|
|
||||||
</formats>
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
<fileSets>
|
|
||||||
<!-- 从目标目录拷贝文件去压缩 -->
|
|
||||||
<fileSet>
|
|
||||||
<directory>target</directory>
|
|
||||||
<includes>
|
|
||||||
<include>*.jar</include>
|
|
||||||
</includes>
|
|
||||||
<outputDirectory>./</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>target/lib</directory>
|
|
||||||
<outputDirectory>./lib</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
<outputDirectory>./config</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>src/main/webapp/static</directory>
|
|
||||||
<outputDirectory>./static</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>src/main/webapp/html</directory>
|
|
||||||
<outputDirectory>./html</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>src/main/webapp/templets</directory>
|
|
||||||
<outputDirectory>./templets</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>src/main/webapp/upload</directory>
|
|
||||||
<outputDirectory>./upload</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>src/main/webapp/WEB-INF</directory>
|
|
||||||
<outputDirectory>./WEB-INF</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>./bin</directory>
|
|
||||||
<includes>
|
|
||||||
<include>*.sh</include>
|
|
||||||
<include>*.bat</include>
|
|
||||||
</includes>
|
|
||||||
<outputDirectory>./</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
</fileSets>
|
|
||||||
</assembly>
|
|
|
@ -28,6 +28,7 @@ import io.swagger.annotations.ApiOperation;
|
||||||
import net.mingsoft.base.entity.ResultData;
|
import net.mingsoft.base.entity.ResultData;
|
||||||
import net.mingsoft.basic.bean.EUListBean;
|
import net.mingsoft.basic.bean.EUListBean;
|
||||||
import net.mingsoft.basic.util.BasicUtil;
|
import net.mingsoft.basic.util.BasicUtil;
|
||||||
|
import net.mingsoft.cms.bean.ContentBean;
|
||||||
import net.mingsoft.cms.biz.IContentBiz;
|
import net.mingsoft.cms.biz.IContentBiz;
|
||||||
import net.mingsoft.cms.biz.IHistoryLogBiz;
|
import net.mingsoft.cms.biz.IHistoryLogBiz;
|
||||||
import net.mingsoft.cms.entity.ContentEntity;
|
import net.mingsoft.cms.entity.ContentEntity;
|
||||||
|
@ -98,7 +99,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
|
||||||
})
|
})
|
||||||
@RequestMapping("/list")
|
@RequestMapping("/list")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public ResultData list(@ModelAttribute @ApiIgnore ContentEntity content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model,BindingResult result) {
|
public ResultData list(@ModelAttribute @ApiIgnore ContentBean content, HttpServletResponse response, HttpServletRequest request, @ApiIgnore ModelMap model, BindingResult result) {
|
||||||
BasicUtil.startPage();
|
BasicUtil.startPage();
|
||||||
List contentList = contentBiz.query(content);
|
List contentList = contentBiz.query(content);
|
||||||
return ResultData.build().success(new EUListBean(contentList,(int)BasicUtil.endPage(contentList).getTotal()));
|
return ResultData.build().success(new EUListBean(contentList,(int)BasicUtil.endPage(contentList).getTotal()));
|
||||||
|
|
|
@ -86,7 +86,6 @@ spring:
|
||||||
charset: utf-8
|
charset: utf-8
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
|
|
||||||
mybatis-plus:
|
mybatis-plus:
|
||||||
global-config:
|
global-config:
|
||||||
db-config:
|
db-config:
|
||||||
|
|
Loading…
Reference in New Issue