配置更新

pom.xml

@@ -1,5 +1,6 @@
 <?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"
+<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">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -48,7 +49,12 @@
 			<classifier>classes</classifier>
 			<scope>provided</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-basic</artifactId>
+			<version>1.0.8.1-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mdiy</artifactId>
@@ -58,12 +64,26 @@
 		</dependency>
 		<dependency>
 			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-mdiy</artifactId>
+			<version>1.0.7-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mpeople</artifactId>
 			<version>1.0.7-SNAPSHOT</version>
 			<classifier>classes</classifier>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-mpeople</artifactId>
+			<version>1.0.7-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
+		
+		<!-- swagger2接口文档依赖 -->
+		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
 			<version>2.9.2</version>
@@ -120,7 +140,6 @@
 			<version>2.9.2</version>
 		</dependency>
 	</dependencies>
-
 	<build>
 		<finalName>ms-mcms</finalName>
 		<plugins>
@@ -144,7 +163,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<fork>true</fork><!-- 如果没有该项配置，肯呢个devtools不会起作用，即应用不会restart -->
+					<fork>true</fork>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -157,8 +176,7 @@
 				<configuration>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
-			</plugin><!-- 打包成war使用 -->
-
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>

src/main/java/net/mingsoft/MSServletInitializer.java

@@ -1,8 +1,10 @@
 package net.mingsoft;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
+@SpringBootApplication(scanBasePackages={"net.mingsoft"})
 public class MSServletInitializer extends SpringBootServletInitializer {
 
 	@Override

src/main/java/net/mingsoft/cms/action/ColumnAction.java

@@ -80,7 +80,7 @@ public class ColumnAction extends BaseAction{
 	 */
 	@RequestMapping("/add")
 	public String add(HttpServletRequest request,ModelMap model) {
-		ManagerEntity managerSession = (ManagerEntity) getSession(request, SessionConstEnum.MANAGER_SESSION);
+		ManagerEntity managerSession = (ManagerEntity) BasicUtil.getSession( SessionConstEnum.MANAGER_SESSION);
 		// 站点ID
 		int appId =this.getAppId(request);
 		List<ColumnEntity> list = columnBiz.queryAll(appId, this.getModelCodeId(request));
@@ -192,7 +192,7 @@ public class ColumnAction extends BaseAction{
 	@RequestMapping("/{columnId}/edit")
 	public String edit(@PathVariable int columnId, HttpServletRequest request,ModelMap model) {
 		// 获取管理实体
-		ManagerEntity managerSession = (ManagerEntity) getSession(request, SessionConstEnum.MANAGER_SESSION);
+		ManagerEntity managerSession = (ManagerEntity) BasicUtil.getSession( SessionConstEnum.MANAGER_SESSION);
 		// 站点ID
 		int appId = this.getAppId(request);
 		List<ColumnEntity> list = new ArrayList<ColumnEntity>();

src/main/resources/application.yml

@@ -1,3 +1,5 @@
+application: 
+ version: mcms-4.7.0
 server:
   port: 8080
   servlet.context-path: /ms-mcms