Skip to content
GitLab
You need to sign in or sign up before continuing.
Commit 6201a48d authored by 信 赵's avatar 信 赵
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
#	src/main/java/net/mingsoft/cms/biz/IArticleBiz.java
#	src/main/java/net/mingsoft/cms/biz/impl/ArticleBizImpl.java
#	src/main/java/net/mingsoft/cms/dao/IArticleDao.java
#	src/main/java/net/mingsoft/cms/dao/IArticleDao.xml
#	src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
parents dfad56af 2d19a084
Expand all Hide whitespace changes
Inline Side-by-side
README.md
View file @ 6201a48d
This diff is collapsed.
doc/4.6.5-to-4.7.0-mysql.sql deleted 100644 → 0
View file @ dfad56af
This diff is collapsed.
doc/4.6.5-to-4.7.0-sqlserver.sql deleted 100644 → 0
View file @ dfad56af
This diff is collapsed.
doc/SQL文件版本说明.md deleted 100644 → 0
View file @ dfad56af
# 温馨提示，请使用master分支
db-mcms-mysql-4.7.0 最低版本mysql 5.7
db-mcms-sqlserver-4.7.0 最低版本 SQLServer2012
如果使用低与要求版本数据库会出现如下错误
1、导入 mysql文件 datetime时间函数报错，请使用4.6.5版本以下的SQL文件（不包含4.6.5）
2、SQLServer数据库版本 自定义标签 使用了SQLServer2012最新的分页函数 ，
请自行修改mdiy_tag_sql表中的分页函数
数据库类型切换 ：修改application.yml中
database-id: mysql、sqlServer、oracle
数据库连接切换：修改
spring:
http.multipart.enabled: false
profiles:
active: dev、prod、test
\ No newline at end of file
doc/db-mcms-5.0.sql 0 → 100644
View file @ 6201a48d
This diff is collapsed.
doc/db-mcms-mysql-4.7.0.sql deleted 100644 → 0
View file @ dfad56af
This diff is collapsed.
doc/db-mcms-sqlserver-4.7.0.sql deleted 100644 → 0
View file @ dfad56af
This diff is collapsed.
doc/历史/4.7.0-to-4.7.1-mysql.sql 0 → 100644
View file @ 6201a48d
This diff is collapsed.
doc/历史/4.7.1-to-4.7.2-mysql.sql 0 → 100644
View file @ 6201a48d
UPDATE `model` SET `model_icon` = 'icon-neirongguanli' WHERE `model_id` = 1;
UPDATE `model` SET `model_icon` = 'icon-huiyuanzhongxin' WHERE `model_id` = 22;
UPDATE `model` SET `model_icon` = 'icon-quanxianguanli' WHERE `model_id` = 23;
UPDATE `model` SET `model_icon` = 'icon-xitongguanli' WHERE `model_id` = 84;
UPDATE `model` SET `model_icon` = 'icon-zidingyiguanli' WHERE `model_id` = 104;
UPDATE `mdiy_tag_sql` SET `tag_sql`='<#assign _typeid=\"\"/>\r\n<#if column?? && column.categoryId gt 0>\r\n <#assign _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n <#assign _typeid=\"${typeid}\">\r\n</#if>\r\nselect \r\n @rownum := @rownum + 1 AS typeindex,\r\n category_id as id,\r\n category_id as typeid,\r\n category_title as typetitle,\r\n (select count(*) from category c where c.category_categoryid=typeid and c.del=0) as childsize,\r\n <#--返回父id集合-->\r\n category_parent_id as pids,\r\n <#--栏目选中的样式-->\r\n IF(<#if column?? && column.categoryId gt 0>${column.categoryId}<#else>${_typeid}</#if> = category_id ,\"${class!\'\'}\",\"\") as class,\r\n <#--动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", category_id) as typelink,\r\n <#else>\r\n CONCAT(column_path,\"/index.html\") as typelink,\r\n </#if>\r\n column_keyword as typekeyword,\r\n column_diy_url as typeurl,\r\n column_flag as flag,\r\n column_descrip as typedescrip,\r\n category_smallimg as typelitpic \r\n from (SELECT @rownum := 0) r,category \r\n LEFT JOIN basic_column bc on bc.column_category_id=category.category_id where \r\n category.del=0 \r\n <#--根据站点编号查询-->\r\n <#if appId?? >\r\n and category.category_appid=${appId}\r\n </#if>\r\n <#--根据模块编号查询分类-->\r\n <#if column?? && column.categoryModelId?has_content>\r\n and category_modelid=${column.categoryModelId}\r\n </#if>\r\n <#--栏目属性-->\r\n <#if flag?? && flag != \'\'>\r\n and bc.column_flag like CONCAT(\'%\',\'${flag}\',\'%\') \r\n </#if>\r\n <#if noflag?? && noflag != \'\'>\r\n and bc.column_flag not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n </#if>\r\n<#if type?has_content>\r\n <#--顶级栏目（单个）-->\r\n <#if type==\"top\">\r\n and category_id=(select left(category_parent_id,LOCATE(\",\",category_parent_id)-1) from category where category_id = ${_typeid})\r\n <#elseif type==\"nav\">\r\n and(category_categoryid=0 or category_categoryid is null)\r\n <#--同级栏目（多个）-->\r\n <#elseif type==\"level\">\r\n and\r\n <#if _typeid?has_content>\r\n category_categoryid=(select category_categoryid from category where category_id=${_typeid})\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--当前栏目（单个）-->\r\n <#elseif type==\"self\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id=${_typeid}\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--当前栏目的所属栏目（多个）-->\r\n <#elseif type==\"path\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id in (<#if column?? && column.categoryParentId??>${column.categoryParentId},</#if>${_typeid})\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--子栏目（多个）-->\r\n <#elseif type==\"son\">\r\n and \r\n <#if _typeid?has_content>\r\n category_categoryid=${_typeid}\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--上一级栏目没有则取当前栏目（单个）-->\r\n <#elseif type==\"parent\">\r\n and \r\n <#if _typeid?has_content>\r\n <#if column?? && column.categoryCategoryId?? && column.categoryCategoryId!=0>\r\n category_id=${column.categoryCategoryId}\r\n <#else>\r\n category_id=${_typeid}\r\n </#if>\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--子栏目或同级栏目（多个）-->\r\n <#elseif type==\"sonOrLevel\">\r\n and \r\n <#if _typeid?has_content>\r\n category_categoryid= if((SELECT count(*) FROM category\r\n LEFT JOIN basic_column bc ON bc.column_category_id = category.category_id \r\n WHERE category_categoryid=${_typeid})>0,${_typeid},(select category_categoryid from category where category_id=${_typeid}))\r\n <#else>\r\n 1=1\r\n </#if>\r\n </#if>\r\n<#else> <#--默认son-->\r\n and\r\n <#if _typeid?has_content>\r\n category_categoryid=${_typeid}\r\n <#else>\r\n (category_categoryid=0 or category_categoryid is null)\r\n </#if>\r\n</#if>\r\n<#if order?? >\r\n <#if order==\"desc\"> desc</#if>\r\n <#if order==\"asc\"> asc</#if>\r\n </#if>' WHERE (`id`='6')
\ No newline at end of file
doc/历史/db-mcms-mysql-4.6.5.sql deleted 100644 → 0
View file @ dfad56af
This diff is collapsed.
doc/历史/db-mcms-mysql-4.7.1.sql 0 → 100644
View file @ 6201a48d
This diff is collapsed.
doc/历史/db-mcms-mysql-4.7.2.sql 0 → 100644
View file @ 6201a48d
This diff is collapsed.
doc/历史/db-mcms-oracle-4.6.5.sql deleted 100644 → 0
View file @ dfad56af
This source diff could not be displayed because it is too large. You can view the blob instead.
doc/历史/db-mcms-sqlserver-4.6.5.sql deleted 100644 → 0
View file @ dfad56af
This diff is collapsed.
pom.xml
View file @ 6201a48d
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <parent>
<groupId>net.mingsoft</groupId>
<groupId>net.mingsoft</groupId> <artifactId>ms-pom</artifactId>
<artifactId>mcms</artifactId> <version>1.0.0</version>
<version>4.7.0-SNAPSHOT</version> <relativePath/>
<name>ms-mcms</name> </parent>
<properties> <modelVersion>4.0.0</modelVersion>
<java.version>1.8</java.version> <groupId>net.mingsoft</groupId>
</properties> <artifactId>ms-mcms</artifactId>
<repositories> <version>5.0.0</version>
<repository> <name>${project.groupId}:${project.artifactId}</name>
<id>sonatype-nexus-snapshots</id> <description>ms-mcms tools Library</description>
<name>Sonatype Nexus Snapshots</name> <url>https://github.com/ming-soft/ms-mcms</url>
<url>http://repo1.maven.org/maven2/</url> <licenses>
<releases> <license>
<enabled>true</enabled> <name>The MIT License (MIT)</name>
</releases> <url>http://mit-license.org</url>
<snapshots> </license>
<enabled>true</enabled> </licenses>
</snapshots> <developers>
</repository> <developer>
<repository> <name>mingsoft develop group</name>
<id>sonatype</id> <email>service@mingsoft.net</email>
<name>Sonatype Snapshots</name> <organization>mingsoft</organization>
<url>https://oss.sonatype.org/content/groups/public/</url> <organizationUrl>http://www.mingsoft.net</organizationUrl>
<releases> </developer>
<enabled>true</enabled> </developers>
</releases>
<snapshots> <scm>
<enabled>true</enabled> <connection>scm:git://github.com/ming-soft/ms-mcms.git</connection>
</snapshots> <developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection>
</repository> <url>https://github.com/ming-soft/ms-mcms</url>
</repositories> </scm>
<dependencies> <distributionManagement>
<dependency> <snapshotRepository>
<groupId>net.mingsoft</groupId> <id>sonatype-nexus-snapshots</id>
<artifactId>ms-mpeople</artifactId> <name>Sonatype Nexus snapshot repository</name>
<version>1.0.7</version> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
</dependency> </snapshotRepository>
<dependency> <repository>
<groupId>net.mingsoft</groupId> <id>sonatype-nexus-staging</id>
<artifactId>ms-upgrader</artifactId> <name>Sonatype Nexus release repository</name>
<version>1.0.5-SNAPSHOT</version> <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</dependency> </repository>
<dependency> </distributionManagement>
<groupId>javax.servlet</groupId> <properties>
<artifactId>javax.servlet-api</artifactId> <java.version>1.8</java.version>
<version>3.1.0</version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scope>test</scope> </properties>
</dependency> <dependencies>
<dependency> <!-- 如果使用的是mysql8.0需要使用8.0的驱动 -->
<groupId>org.apache.tomcat.embed</groupId> <!-- <dependency>-->
<artifactId>tomcat-embed-jasper</artifactId> <!-- <groupId>mysql</groupId>-->
<version>9.0.16</version> <!-- <artifactId>mysql-connector-java</artifactId>-->
</dependency> <!-- <version>8.0.11</version>-->
</dependencies> <!-- </dependency>-->
<build> <dependency>
<finalName>ms-mcms</finalName> <groupId>net.mingsoft</groupId>
<plugins> <artifactId>ms-mpeople</artifactId>
<plugin> </dependency>
<groupId>org.apache.maven.plugins</groupId> <dependency>
<artifactId>maven-compiler-plugin</artifactId> <groupId>net.mingsoft</groupId>
<version>3.1</version> <artifactId>ms-upgrader</artifactId>
<configuration> </dependency>
<source>${java.version}</source> </dependencies>
<target>${java.version}</target> <build>
</configuration> <resources>
</plugin> <resource>
<plugin> <directory>src/main/java</directory>
<groupId>org.springframework.boot</groupId> </resource>
<artifactId>spring-boot-maven-plugin</artifactId> <resource>
<executions> <directory>src/main/webapp</directory>
<execution> <excludes>
<goals> <exclude>html/</exclude>
<goal>repackage</goal> <exclude>static/</exclude>
</goals> <exclude>upload/</exclude>
</execution> <exclude>templets/</exclude>
</executions> </excludes>
<configuration> </resource>
<fork>true</fork> <resource>
</configuration> <directory>src/main/resources</directory>
</plugin> </resource>
<plugin> </resources>
<groupId>org.apache.maven.plugins</groupId> <plugins>
<artifactId>maven-war-plugin</artifactId> <plugin>
<configuration> <groupId>org.apache.maven.plugins</groupId>
<failOnMissingWebXml>false</failOnMissingWebXml> <artifactId>maven-jar-plugin</artifactId>
<!-- 打包时候需需要启用，注意避免快照依赖的冗余jar包 --> <version>2.6</version>
<!-- outputFileNameMapping>@{artifactId}@- @{baseVersion}@. @{extension}@</outputFileNameMapping --> <executions>
</configuration> <execution>
</plugin> <phase>package</phase>
</plugins> <goals>
<resources> <goal>jar</goal>
<resource> </goals>
<directory>src/main/webapp</directory> </execution>
</resource> </executions>
<resource> <configuration>
<directory>src/main/resources</directory> <excludes>
</resource> <!--注意这玩意从编译结果目录开始算目录结构 -->
<resource> <exclude>**/static/plugins/</exclude>
<directory>src/main/java</directory> <exclude>**/static/skin/</exclude>
</resource> <exclude>**/Dockerfile</exclude>
</resources> <exclude>**/ehcache.xml</exclude>
<defaultGoal>compile</defaultGoal> <exclude>**/upgrade/</exclude>
</build> <exclude>**/*.java</exclude>
</project> </excludes>
\ No newline at end of file </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<configuration>
<excludes>
<exclude>**/static/plugins/</exclude>
<exclude>**/static/skin/</exclude>
<exclude>**/application*.yml</exclude>
<exclude>**/Dockerfile</exclude>
<exclude>**/ehcache.xml</exclude>
<exclude>**/upgrade/</exclude>
<exclude>**/config/</exclude>
<exclude>**/MSApplication.java</exclude>
<exclude>**/MSServletInitializer.java</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<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>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.8</version>
<configuration>
<additionalConfig>
<file>
<name>.settings/org.eclipse.core.resources.prefs</name>
<content>
<![CDATA[
eclipse.preferences.version=1
encoding/<project>=${project.build.sourceEncoding}
]]>
</content>
</file>
</additionalConfig>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx256m</argLine>
</configuration>
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<version>2.6.3</version>
<configuration>
<licenseLocation>${clover.license.file}</licenseLocation>
<encoding>${project.build.sourceEncoding}</encoding>
<generateXml>true</generateXml>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>1.2</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
<xmlOutput>true</xmlOutput>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<webResources>
<resource>
<directory>src/main/webapp/WEB-INF</directory>
<targetPath>WEB-INF</targetPath>
<filtering>true</filtering>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>web.xml</exclude>
</excludes>
</resource>
</webResources>
<attachClasses>true</attachClasses>
<warSourceExcludes>*/web.xml,static</warSourceExcludes>
<failOnMissingWebXml>false</failOnMissingWebXml>
<packagingExcludes>
ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class
</packagingExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
</configuration>
</plugin>
</plugins>
<defaultGoal>compile</defaultGoal>
<finalName>ms-mcms</finalName>
</build>
</project>
src/main/java/net/mingsoft/MSApplication.java
View file @ 6201a48d
...@@ -13,7 +13,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; ...@@ -13,7 +13,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@ComponentScan(basePackages = {"net.mingsoft"}) @ComponentScan(basePackages = {"net.mingsoft"})
@MapperScan(basePackages={"**.dao"}) @MapperScan(basePackages={"**.dao"})
@ServletComponentScan(basePackages = {"net.mingsoft"}) @ServletComponentScan(basePackages = {"net.mingsoft"})
@EnableSwagger2
public class MSApplication { public class MSApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(MSApplication.class, args); SpringApplication.run(MSApplication.class, args);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment