结构更新

pom.xml

@@ -1,89 +1,93 @@
-<?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">
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>9</version>
+	</parent>
 	<modelVersion>4.0.0</modelVersion>
-
 	<groupId>net.mingsoft</groupId>
-	<artifactId>mcms</artifactId>
+	<artifactId>ms-mcms</artifactId>
 	<version>4.7.0-SNAPSHOT</version>
-	<name>ms-mcms</name>
-	<packaging>jar</packaging>
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
-	<repositories>
-		<repository>
+	<packaging>war</packaging>
+
+	<name>${project.groupId}:${project.artifactId}</name>
+	<description>ms-mcms tools Library</description>
+	<url>https://github.com/ming-soft/ms-mcms</url>
+	<licenses>
+		<license>
+			<name>The MIT License (MIT)</name>
+			<url>http://mit-license.org</url>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<name>mingsoft develop group</name>
+			<email>service@mingsoft.net</email>
+			<organization>mingsoft</organization>
+			<organizationUrl>http://www.mingsoft.net</organizationUrl>
+		</developer>
+	</developers>
+
+	<scm>
+		<connection>scm:git://github.com/ming-soft/ms-mcms.git</connection>
+		<developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection>
+		<url>https://github.com/ming-soft/ms-mcms</url>
+	</scm>
+	<distributionManagement>
+		<snapshotRepository>
 			<id>sonatype-nexus-snapshots</id>
-			<name>Sonatype Nexus Snapshots</name>
-			<url>http://repo1.maven.org/maven2/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
+			<name>Sonatype Nexus snapshot repository</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
 		<repository>
-			<id>sonatype</id>
-			<name>Sonatype Snapshots</name>
-			<url>https://oss.sonatype.org/content/groups/public/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
+			<id>sonatype-nexus-staging</id>
+			<name>Sonatype Nexus release repository</name>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
-	</repositories>
+	</distributionManagement>
+	<properties>
+		<java.version>1.8</java.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<ms.basic.version>1.0.8.1-SNAPSHOT</ms.basic.version>
+		<ms.mdiy.version>1.0.7-SNAPSHOT</ms.mdiy.version>
+		<ms.mpeople.version>1.0.7-SNAPSHOT</ms.mpeople.version>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-basic</artifactId>
-			<version>1.0.8.1-SNAPSHOT</version>
+			<version>${ms.basic.version}</version>
 			<classifier>classes</classifier>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mdiy</artifactId>
-			<version>1.0.7-SNAPSHOT</version>
+			<version>${ms.mdiy.version}</version>
 			<classifier>classes</classifier>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mpeople</artifactId>
-			<version>1.0.7-SNAPSHOT</version>
+			<version>${ms.mpeople.version}</version>
 			<classifier>classes</classifier>
 			<scope>provided</scope>
 		</dependency>
-
 	</dependencies>
 	<build>
-		<finalName>ms-mcms</finalName>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.properties</include>
+					<include>**/*.xml</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>
+		</resources>
 		<plugins>
-		    <!-- docker部署 
-		     
-			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>1.2.0</version>
-				<configuration>
-					<dockerHost>http://localhost</dockerHost>
-					<imageName>ms-mcms</imageName>
-					<baseImage>java</baseImage>
-					<entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
-				</configuration>
-			</plugin>
-			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -91,45 +95,183 @@
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
+					<encoding>${project.build.sourceEncoding}</encoding>
+					<showDeprecation>true</showDeprecation>
+					<showWarnings>true</showWarnings>
+					<compilerArguments>
+						<verbose />
+						<bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
+					</compilerArguments>
+					<compilerArgument>-Xlint:unchecked</compilerArgument>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.plexus</groupId>
+						<artifactId>plexus-compiler-eclipse</artifactId>
+						<version>2.1</version>
+					</dependency>
+				</dependencies>
+			</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.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
 				<executions>
 					<execution>
+						<id>attach-sources</id>
 						<goals>
-							<goal>repackage</goal>
+							<goal>jar-no-fork</goal>
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<fork>true</fork>
-				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+				<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>
+					<!-- <overlays>
+						<overlay>
+							<groupId>net.mingsoft</groupId>
+							<artifactId>ms-basic</artifactId>
+							<excludes>
+								<exclude>*/</exclude>
+							</excludes>
+						</overlay>
+						<overlay>
+							<groupId>net.mingsoft</groupId>
+							<artifactId>ms-mdiy</artifactId>
+							<excludes>
+								<exclude>*/</exclude>
+							</excludes>
+						</overlay>
+						<overlay>
+							<groupId>net.mingsoft</groupId>
+							<artifactId>ms-mpeople</artifactId>
+							<excludes>
+								<exclude>*/</exclude>
+							</excludes>
+						</overlay>
+					</overlays>
+ -->				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<configuration>
+					<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.7</version>
+				<extensions>true</extensions>
+				<configuration>
+					<serverId>sonatype-nexus-staging</serverId>
+					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+					<autoReleaseAfterClose>true</autoReleaseAfterClose>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>sign</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
-		<resources>
-			<resource>
-				<directory>src/main/webapp</directory>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>src/main/java</directory>
-			</resource>
-		</resources>
 		<defaultGoal>compile</defaultGoal>
+
+		<finalName>ms-mcms</finalName>
 	</build>
 </project>

src/main/webapp/WEB-INF/manager/exit-system.ftl

@@ -1,30 +0,0 @@
-<!-- 退出系统 -->
-<div id="exit-system" class="exit-system">
-    <el-dialog title="退出提示" :visible.sync="isShow">
-        确认退出
-        <div slot="footer" class="dialog-footer">
-            <el-button @click="isShow = false">取 消</el-button>
-            <el-button type="primary" @click="loginOut">确认退出</el-button>
-        </div>
-    </el-dialog>
-</div>
-<script>
-    var exitSystemVue = new Vue({
-        el: '#exit-system',
-        data: {
-            isShow: false, // 模态框的显示
-        },
-        methods: {
-            loginOut: function () {
-                var that = this;
-                ms.http.get(ms.manager + "/loginOut.do")
-                    .then((data) => {
-                        isShow = false;
-                        location.href = ms.manager + "/login.do";
-                    }, (err) => {
-                        that.$message.error(data.resultMsg);
-                    })
-            }
-        }
-    })
-</script>

src/main/webapp/WEB-INF/manager/include/head-file.ftl

@@ -1,65 +0,0 @@
-    
-    <meta charset="utf-8">
-    <!--浏览器小图标-->
-    <link rel="icon" href="http://cdn.mingsoft.net/global/images/ms.ico" type="x-icon">
-    <script type="text/javascript" src="https://unpkg.com/vue@2.5.21/dist/vue.min.js"></script>
-    <!--小图标-->
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_847907_mkdvd7gopsg.css">
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_974973_42u7cwycwta.css">
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_1035189_ddqz6fpwzxb.css">
-    <!--自定义模型-->
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_997125_lflqkedj6s9.css">
-
-    <!-- 引入样式 -->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
-    <!-- 引入组件库 -->
-    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
-    <!--网络请求框架-->
-    <script src="https://cdn.bootcss.com/axios/0.18.0/axios.min.js"></script>
-    <script src="https://cdn.bootcss.com/qs/6.5.2/qs.min.js"></script>
-    <!--铭飞-->
-    <script src="http://cdn.mingsoft.net/ms/1.0/ms.js"></script>
-    <script src="http://cdn.mingsoft.net/ms/1.0/ms.http.js"></script>
-    <script src="http://cdn.mingsoft.net/ms/1.0/ms.util.js"></script>
-
-    <!--jquery-->
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-    <!--百度富文本-->
-    <script type="text/javascript" charset="utf-8" src="http://mpm.mingsoft.net/static/plugins/ueditor/1.4.3.1/ueditor.parse.js"></script>
-    <script type="text/javascript" charset="utf-8" src="http://mpm.mingsoft.net/static/plugins/ueditor/1.4.3.1/ueditor.config.js"></script>
-    <script type="text/javascript" charset="utf-8" src="http://mpm.mingsoft.net/static/plugins/ueditor/1.4.3.1/ueditor.all.js"></script>
-    <script type="text/javascript" charset="utf-8" src="http://mpm.mingsoft.net/static/plugins/ueditor/1.4.3.1/lang/zh-cn/zh-cn.js"></script>
-    <!--图片懒加载-->
-	<script src="https://cdn.bootcss.com/vue-lazyload/1.2.6/vue-lazyload.js"></script>
-	
-    <!-- 拖拽 -->
-    <script src="//cdn.jsdelivr.net/npm/sortablejs@1.7.0/Sortable.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/Vue.Draggable/2.17.0/vuedraggable.min.js"></script>
- 
-    <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> 
-    <link rel="stylesheet" href="${base}/static/mweixin/css/custom-menu.css"> 
-    <link rel="stylesheet" href="${base}/static/mweixin/css/message-reply.css">
-
-   
-    <script>
-        ms.base = "${base}";
-        ms.manager = "${managerPath}";
-        ms.web = ms.base;
-
-        // ms.base = "http://192.168.0.54:82";
-        // ms.manager = "http://192.168.0.54:82/apis/ms";
-        // ms.web = "http://192.168.0.54:82/apis";
-        //图片懒加载
-		  Vue.use(VueLazyload, {
-		    error: ms.base + '/images/ic_image_deault.png',
-		    loading: ms.base + '/images/ic_image_deault.png',
-          })
-
-         // 测试使用 ==> 微信其他接口走之前需要先走这个接口
-         ms.http.get(ms.manager + "/mweixin/11/function.do")
-            .then((res) => {
-                console.log('微信登录接口', true);
-            }, (err) => {
-                console.log(err)
-        })
-    </script>

src/main/webapp/WEB-INF/manager/index.ftl

@@ -1,269 +0,0 @@
-<!DOCTYPE html>
-<html>
-   <head>
-      <title></title>
-          <!-- <#include "/include/head-file.ftl"/> 
-         <#include "/reset-password.ftl"/>
-        <#include "/exit-system.ftl"/>  -->
-        <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/index.css">
-     
-    <!--#include virtual="include/head-file.ftl" -->
-    <!--#include virtual="./reset-password.ftl" -->
-    <!--#include virtual="./exit-system.ftl" --> 
-    <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">
-   </head>
-   <body>
-      <div id="app" class="index">
-         <el-container>
-            <!--头部-->
-            <el-header class="ms-admin-header">
-               <el-aside width="200px" class="ms-admin-logo">
-                  <img :src="ms.base+'/static/ms-admin/4.7.0/images/logo.png'" />
-                  <div>
-                     <img :src="ms.base+'/static/ms-admin/4.7.0/images/version.png'" />
-                     <span>v4.6.3</span>
-                  </div>
-               </el-aside>
-
-               <!--头部menu-->
-               <el-menu class="ms-admin-header-menu" :default-active="0+''" mode="horizontal" >
-                  <el-menu-item 
-                    class="ms-admin-menu-item" 
-                    :index="i+''" 
-                    v-for="(menu,i) in mainParentMenuList" 
-                    :key='i'
-                    @click="openMenu(menu,i)"
-                    v-text="menu.modelTitle"
-                ></el-menu-item>
-                  <el-menu-item class="ms-admin-menu-item" :index="menuList.length+''" @click=''>
-                     <i class="iconfont icon-gengduo" @click.stop.self='shortcutMenu = !shortcutMenu'></i>
-                  </el-menu-item>
-                   <!-- 快捷菜单 -->
-                   <ul class="ms-admin-shortcut-menu" v-show='shortcutMenu'>
-                        <li v-for="(item,index) of parentMenuList" 
-                            :key='index'
-                             v-text='item.modelTitle' 
-                             @click='openMenu(item,index)'
-                             ></li>
-                        <i class="iconfont icon-gengduo" @click.stop.self='shortcutMenu = !shortcutMenu'></i>
-                    </ul>
-               </el-menu>
-
-               <!--头部右侧-->
-               <el-main class="ms-admin-mstore">
-                  <!--登录-->
-                  <el-dropdown trigger="click" class="ms-admin-login" placement="top-start" @visible-change="loginDown = !loginDown">
-                     <span class="el-dropdown-link" :class="{'active':loginDown}">
-                        <img src="${base}/static/ms-admin/4.7.0/images/default_handsome.jpg" />
-                        <span v-text='peopleInfo.managerName'></span>
-                     </span>
-                     <el-dropdown-menu class="ms-admin-login-down" slot="dropdown" @click.native='openModal'>
-                        <el-dropdown-item>修改密码</el-dropdown-item>
-                        <el-dropdown-item>退出</el-dropdown-item>
-                     </el-dropdown-menu>
-                  </el-dropdown>
-                  <!--mstore按钮-->
-                  <div class="ms-admin-mstore-icon">
-                     <i class="iconfont icon-gengduo1"></i>
-                  </div>
-               </el-main>
-
-            </el-header>
-            <el-container class="ms-admin-container">
-               <!--菜单-->
-               <el-aside :class="['ms-admin-menu-aside',{'ms-admin-menu-aside-active':collapseMenu}]">
-                  <el-menu 
-                    :class="['ms-admin-menu',{'ms-admin-menu-active':collapseMenu}]" 
-                    :default-active="menuActive"
-                    :collapse="collapseMenu" 
-                    mode='vertical' 
-                    :collapse-transition='true' 
-                    :unique-opened='true' 
-                    ref='menu'
-                    >
-                     <el-submenu 
-                        :index="i+''" 
-                        v-for="(menu,i) in parentMenuList"
-                        :key='i'
-                        >
-                        <template slot="title">
-                           <i class="iconfont" :class="iconType(menu.modelTitle)"></i>
-                           <span v-text="menu.modelTitle"></span>
-                        </template>
-                        <!-- 子菜单 -->
-                        <el-menu-item 
-                            :index="i+'-'+index" 
-                            v-for="(sub,index) in getSubMenu(menu.modelId)" 
-                            :key='sub.modelModelId'
-                            v-text="sub.modelTitle"
-                            @click.self='open(sub.modelTitle,sub.modelUrl)'
-                        ></el-menu-item>
-                     </el-submenu>
-                     <!-- 收缩按钮 -->
-                     <div :class="['ms-menu-expand',{'ms-menu-expand-active':collapseMenu}]" @click='collapseMenu = !collapseMenu'>
-                        <i class="iconfont icon-shousuo"></i>
-                     </div>
-                  </el-menu>
-               </el-aside>
-               <!--内容-->
-               <el-main class="ms-admin-main">
-                  <!--选项卡-->
-                  <el-tabs 
-                    class="ms-admin-tabs" 
-                    v-model="currentTab" 
-                    type="card" 
-                    closable 
-                    @tab-remove="closeTab"
-                    >
-                     <el-tab-pane 
-                        v-for="(item, index) in editableTabs" 
-                        :key="index" 
-                        :label="item.title" 
-                        :name="item.title"
-                    >
-                        <iframe :src='ms.manager+"/"+item.url'></iframe>
-                     </el-tab-pane>
-                  </el-tabs>
-               </el-main>
-            </el-container>
-         </el-container>
-      </div>
-   </body>
-</html>
-<script>
-   var indexVue = new Vue({
-      el: "#app",
-      data: {
-        // 预置菜单图标
-        icon:{
-            '消息管理':'icon-xiaoxiguanli',
-            '评论管理':'icon-pinglunguanli',
-            '内容管理':'icon-bianji1',
-            '会员中心':'icon-huiyuan',
-            '自定义管理':'icon-gengduo-2',
-            '权限管理':'icon-UPMSquanxianicon-',
-            '系统管理':'icon-xitong',
-        },
-        menuList:[],//菜单接口数据
-        parentMenuList:[],//一级菜单
-        subMenuList:[],//二级菜单 所有
-        mainParentMenuList:[],//头部菜单显示主要的选项
-        loginDown: false, //登录下拉
-        menuActive: "", //选中菜单
-        editableTabsValue: '',
-        editableTabs: [],//当前打开的tab页面
-        shortcutMenu:false,//快捷菜单显示状态
-        collapseMenu:false,//菜单折叠，false不折叠
-        currentTab:'',//当前激活tab的name
-        tabIndex: 2,
-        //登录用户信息
-        peopleInfo:{
-        	managerName:''//账号
-        },
-        subMenuList:[],//
-      },
-      watch:{
-          menuList:function(n,o){
-              var that = this;
-            n && n.forEach(function(item,index){
-                item.modelModelId == 0 ? that.parentMenuList.push(item) : that.subMenuList.push(item)
-            })
-          },
-          parentMenuList:function(n,o){
-             this.mainParentMenuList = n.slice(0,5);
-          },
-          menuActive:function(n,o){
-              console.log('激活',n);
-          }
-      },
-      methods: {
-        // 菜单列表
-        list:function(){
-            var that = this;
-            ms.http.post(ms.manager + "/model/list.do")
-                .then((data)=>{
-                    that.menuList = data.rows
-                }, (err) => {
-                    that.$message.error(err);
-                })	
-        },
-        // 菜单打开页面
-        open:function(title,url){
-            var result = '';
-            result = this.editableTabs.some(function (item,index) {return item.title == title})
-            !result ?　this.editableTabs.push({title:title,url:url}) : ""
-            this.currentTab = title;
-            // 处理其他逻辑
-        },
-        // 获取当前菜单的子菜单
-        getSubMenu:function (modelId) {
-            var result = [];
-            var that = this;
-            that.subMenuList && that.subMenuList.forEach(function (item) {
-                item.modelModelId == modelId ? result.push(item) : ''
-            })
-            return result;
-        },
-        // 匹配图标
-        iconType:function (title) {
-            return this.icon[title] || 'icon-xitongpeizhi'
-        },
-         //关闭tab标签页
-         closeTab(targetName) {
-            var that = this;
-            // 关闭的面板是当前激活面板
-            if(that.currentTab == targetName){
-                that.editableTabs.forEach(function (tab,index,arr) {
-                    if(tab.title == targetName){
-                        var nextTab = arr[index + 1] || arr[index - 1];
-                        if(nextTab){
-                            that.currentTab = nextTab.title
-                        }
-                    }
-                })
-            }
-            // 关闭的不是当前面板
-            that.editableTabs = that.editableTabs.filter(function (tab) {
-                return tab.title !== targetName
-            })
-         },
-        //  头部导航打开菜单
-         openMenu:function(menu,index){
-             this.$refs.menu.open(index);
-             var children = [];
-             this.menuList.forEach(function (tab) {
-                 if(tab.modelModelId == menu.modelId){
-                    children.push(tab)
-                 }
-             })
-             this.currentTab = children[0] && children[0].modelTitle;
-             this.open(children[0].modelTitle,children[0].modelUrl);
-             var that = this;
-             setTimeout(function(){
-                that.shortcutMenu = false
-             },50)
-         },
-         managerGet:function(){
-         	var that = this;
-         	ms.http.get(ms.manager + "/basic/manager/get.do")
-               .then((data)=>{
-                   that.peopleInfo = data
-                   resetPasswordVue.resetPasswordForm.managerName = that.peopleInfo.managerName
-               }, (err) => {
-                   that.$message.error(err);
-               })	
-         },
-        //  打开修改密码，退出的模态框
-         openModal:function(){
-            event.target.innerText.indexOf('修改密码')>-1
-            ? resetPasswordVue.isShow=true : exitSystemVue.isShow=true
-         }
-      },
-      mounted:function(){
-            // 菜单列表
-            this.list();
-            //获取登录用户信息
-            this.managerGet();
-      },
-   })
-</script>

src/main/webapp/WEB-INF/manager/login.ftl

@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-
-   <head>
-      <title></title>
-      <#include "/include/head-file.ftl"/>
-      <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css">
-	  
-	  
-      <!--#include virtual="include/head-file.ftl"-->
-      <!-- <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css"> -->
-      
-   </head>
-
-   <body>
-      <div id="login" class="login">
-         <el-container class="ms-admin-login-container">
-            <el-main class="ms-admin-login-main">
-               <div class="ms-admin-login-warp">
-                  <img :src="ms.base+'/static/ms-admin/4.7.0/images/login-slogn.png'">
-                  <el-form :model="loginForm" status-icon :rules="loginFormRule" ref="loginForm" label-width="100px" class="ms-admin-login-form">
-                     <h1>
-                        <span>账户登录 / </span>User login</h1>
-                     <el-form-item prop="name" class="ms-admin-form-item">
-                        <el-input type="text" placeholder='用户名' v-model="loginForm.managerName" autocomplete="off"></el-input>
-                     </el-form-item>
-                     <el-form-item prop="pass" class="ms-admin-form-item">
-                        <el-input type="password" placeholder='密码' v-model="loginForm.managerPassword" autocomplete="off"></el-input>
-                     </el-form-item>
-                     <el-form-item prop="code" class="ms-admin-form-item ms-admin-form-item-code">
-                        <el-input type="text" placeholder='验证码' v-model="loginForm.rand_code" autocomplete="off"></el-input>
-                        <img :src="verifCode" class="code-img" @click="code" />
-                        <p>
-                           <span>看不清?</span>
-                           <span @click="code">换一张</span>
-                        </p>
-                     </el-form-item>
-                     <el-form-item class="ms-admin-form-item ms-admin-form-item-checkout">
-                        <el-checkbox v-model="rememberPass">记住密码</el-checkbox>
-                     </el-form-item>
-                     <el-form-item class="ms-admin-form-item">
-                        <el-button type="primary" @click="checkLogin" class="ms-admin-login-btn">登录</el-button>
-                     </el-form-item>
-                  </el-form>
-               </div>
-            </el-main>
-         </el-container>
-      </div>
-   </body>
-
-</html>
-<script>
-   var loginVue = new Vue({
-      el: '#login',
-      data: {
-         loginForm: {
-            managerName: '',
-            managerPassword: "",
-            rand_code: ''
-         },
-         verifCode: ms.manager + "/code?t=" + new Date().getTime(),
-         rememberPass: '',
-         loginFormRule: {
-
-            managerName: [{
-                  required: true,
-                  message: '请输入用户名',
-                  trigger: 'blur'
-               },
-               {
-                  min: 3,
-                  max: 6,
-                  message: '长度在 3 到 5 个字符',
-                  trigger: 'blur'
-               }
-            ],
-            managerPassword: [{
-                  required: true,
-                  message: '请输入密码',
-                  trigger: 'blur'
-               },
-               {
-                  min: 6,
-                  max: 20,
-                  message: '长度在 6 到 20 个字符',
-                  trigger: 'blur'
-               }
-            ],
-            rand_code: [{
-                  required: true,
-                  message: '请填写验证码',
-                  trigger: 'blur'
-               },
-               {
-                  min: 1,
-                  max: 4,
-                  message: '长度在1 到 4 个字符',
-                  trigger: 'blur'
-               }
-            ],
-         }
-      },
-      methods: {
-         // 登录
-         checkLogin: function() {
-            var that = this;
-            ms.http.post(ms.manager + "/checkLogin.do", that.loginForm).then(function(data) {
-               if(data.result) {
-                  that.$notify({
-                     title: '成功',
-                     message: '登录成功',
-                     type: 'success'
-                  });
-                  location.href = ms.manager + "/index.do";
-               } else {
-                  that.$notify({
-                     title: '失败',
-                     message: data.resultMsg,
-                     type: 'warning'
-                  });
-               }
-            }, (err) => {
-               that.$message.error(data.resultMsg);
-            })
-         },
-         code: function() {
-            this.verifCode = ms.web + "/code?t=" + new Date().getTime();
-         },
-
-      },
-      mounted: function() {
-         this.verifCode = ms.web + "/code?t=" + new Date().getTime()
-      }
-   })
-
-</script>

src/main/webapp/WEB-INF/manager/reset-password.ftl

@@ -1,48 +0,0 @@
-<!-- 修改密码 -->
-<div id="reset-password" class="reset-password">
-        <el-dialog title="修改密码" :visible.sync="isShow">
-            <el-form :model="resetPasswordForm" label-width='80px'>
-                <el-form-item label="账号">
-                    <el-input v-model="resetPasswordForm.managerName" autocomplete="off" readonly disabled></el-input>
-                </el-form-item>
-                <el-form-item label="旧密码">
-                    <el-input v-model="resetPasswordForm.oldManagerPassword" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="新密码">
-                    <el-input v-model="resetPasswordForm.newManagerPassword" autocomplete="off"></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="isShow = false">取 消</el-button>
-                <el-button type="primary" @click="updatePassword">更新密码</el-button>
-            </div>
-    </el-dialog>
-</div>
-<script>
-    var resetPasswordVue = new Vue({
-        el: '#reset-password',
-        data: {
-            // 模态框的显示
-            isShow: false,
-            resetPasswordForm: {
-                managerName: '',
-                oldManagerPassword: '',
-                newManagerPassword: '',
-            }
-        },
-        methods: {
-            // 更新密码
-            updatePassword: function () {
-            	var that = this;
-            	ms.http.post(ms.manager + "/updatePassword.do",that.resetPasswordForm)
-               .then((data)=>{
-                	that.resetPasswordForm.oldManagerPassword = '';
-                	that.resetPasswordForm.newManagerPassword = '';
-                	that.isShow = false;
-               }, (err) => {
-                   that.$message.error(err);
-               })	
-            }
-        }
-    })
-</script>