sgjj 6 роки тому
батько
коміт
5b77df26f8

+ 5 - 2
README.md

@@ -1,6 +1,9 @@
-# 铭飞业务系统基础开发平台 此系统为演示版
-当前版本:4.7.0 <br/>
+# 铭飞业务系统基础开发平台
+线上ms.mingsoft.net
+
+当前版本:4.7.1 <br/>
 铭飞MS官网:http://ms.mingsoft.net<br/>
+演示版:http://demo.cms.mingsoft.net/ms/login.do<br/>
 官网同时提供一键运行版本下载,请步移官网....<br/>
 QQ交流群号:[![加入QQ群](https://img.shields.io/badge/三群-242805203-blue.svg)](https://jq.qq.com/?_wv=1027&k=5oF19sl)  [![加入QQ群](https://img.shields.io/badge/一群-231212174-blue.svg)](https://jq.qq.com/?_wv=1027&k=5zykX7V)  [![加入QQ群](https://img.shields.io/badge/二群-221335098-blue.svg)](https://jq.qq.com/?_wv=1027&k=56BqFKu) 
 

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
doc/4.7.0-to-4.7.1-mysql.sql


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
doc/db-mcms-mysql-4.7.1.sql


+ 12 - 3
pom.xml

@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.mingsoft</groupId>
-	<artifactId>wb-mcms</artifactId>
+	<artifactId>mcms</artifactId>
 	<version>4.7.1</version>
-	<packaging>war</packaging>
 	<name>ms-mcms</name>
 	<properties>
 		<java.version>1.8</java.version>
@@ -46,6 +45,16 @@
 			<artifactId>ms-mpeople</artifactId>
 			<version>1.0.8</version>
 		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-msso-client</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-msso-server</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
 		<!-- 此部分是铭飞平台MStroe的客户端(MStore不在铭飞开源产品范围),如果不需要使用MStore可以删除掉 -->
 		<dependency>
 			<groupId>net.mingsoft</groupId>

+ 4 - 5
src/main/java/net/mingsoft/config/WebConfig.java

@@ -1,10 +1,9 @@
 package net.mingsoft.config;
 
 import java.io.File;
-import java.util.Arrays;
 
-import net.mingsoft.basic.filter.XSSEscapeFilter;
 import org.springframework.aop.Advisor;
+import net.mingsoft.basic.filter.XSSEscapeFilter;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.JdkRegexpMethodPointcut;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -133,9 +132,9 @@ public class WebConfig implements WebMvcConfigurer {
 		return new DefaultPointcutAdvisor(druidStatPointcut(), druidStatInterceptor());
 	}
 
-//	 /**
-//	 * xssFilter注册
-//	 */
+	 /**
+	 * xssFilter注册
+	 */
 //	 @Bean
 //	 public FilterRegistrationBean xssFilterRegistration() {
 //	 XSSEscapeFilter xssFilter = new XSSEscapeFilter();

+ 4 - 4
src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true
-    username: root
-    password: root
+    url: jdbc:mysql://172.17.0.1:3308/db-ms?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+    username: pm
+    password: pm!2019
     filters: wall,mergeStat
-    type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource

+ 41 - 20
src/main/resources/application.yml

@@ -2,29 +2,50 @@ server:
   port: 8080
   servlet.context-path: /ms-mcms
   servlet.session.timeout: 60M
-  
+
 logging:
- level:
-  net.mingsoft: trace
+  level:
+    net.mingsoft: trace
 ms:
- manager: 
-  path: /ms
-  view-path: /WEB-INF/manager
-  
- upload: 
-   path: /upload 
-   denied: .exe,.jsp
-   allowed: jpg
-   max-size: 1
-   memory-size: 4096
-      
+  wx:
+    app.id: wx8c96aa3db4611395
+    secret: 6502f1437c583a346f0d71c4be7d99b2
+  sso:
+    url:
+      login: http://ms.mingsoft.net/sso/login.do
+      logout: http://ms.mingsoft.net/sso/logout.do
+      token: http://ms.mingsoft.net/sso/token.do
+    session:
+      prefix: msso
+      time: 2592000
+    cookie: ms.mingsoft.net,pm.mingsoft.net,code.mingsoft.net,bbs.mingsoft.net,localhost
+  manager:
+    path: /m-admin
+    view-path: /WEB-INF/manager
+
+  upload:
+    path: /upload
+    denied: .exe,.jsp
+    allowed: jpg
+    max-size: 1
+    memory-size: 4096
+
 spring:
+  redis:
+    host: 172.17.0.1
+    port: 6380
+    password: mingsoft
+    pool:
+      max-idle: 300
+      min-idle: 0
+      max-active: 600
+      max-wait: 1000
   http.multipart.enabled: false
   profiles:
     active: dev
   mvc:
-    pathmatch: 
-     use-suffix-pattern: true
+    pathmatch:
+      use-suffix-pattern: true
   devtools:
     restart:
       enabled: true
@@ -45,7 +66,7 @@ spring:
     expose-spring-macro-helpers: true
     prefer-file-system-access: false
     template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
-    settings: 
+    settings:
       template_update_delay: 1
       default_encoding: UTF-8
       classic_compatible: true
@@ -53,8 +74,8 @@ spring:
       time_format: HH:mm:ss
       datetime_format: yyyy-MM-dd HH:mm:ss
       auto_import: /include/macro.ftl as ms
-      
+
 mybatis:
   mapper-locations: classpath*:**/dao/*.xml
-  configuration: 
-   database-id: mysql
+  configuration:
+    database-id: mysql

+ 13 - 602
src/main/webapp/WEB-INF/manager/main.ftl

@@ -3,613 +3,24 @@
 <html lang="en">
 <head> 
   <title>铭飞CMS</title> 
-  <meta content="IE=edge" http-equiv="X-UA-Compatible" />
-  <link rel="icon" href="http://cdn.mingsoft.net/global/images/ms.ico" type="x-icon">
+  <meta content="IE=edge" http-equiv="X-UA-Compatible" /> 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" /> 
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> 
-  <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-  <script src="${base}/static/plugins/echarts.4.2.1/echarts.min.js"></script>
-  <#include "../../include/head-file.ftl">
+  <meta content="text/html; charset=utf-8" http-equiv="Content-Type" /> 
 <style>
 body{  height: 100%;}
- [v-cloak] {
-   display: none;
- }
 </style>
 </head>
 <body>
-<div id="main" v-cloak>
-  <el-main class="ms-container">
-    <!-- 右侧头部 -->
-    <div class="left">
-      <div class="real-time-data">
-        <el-header class="header" style="height: 35px;">
-          <div> <i class="iconfont icon-shugang"></i>实时数据</div>
-        </el-header>
-        <div class="box">
-          <el-row :gutter="20" class="box-detail" justify="center" style="text-align: center">
-            <el-col :span="8">在售</el-col>
-            <el-col :span="8">断货</el-col>
-            <el-col :span="8">停售</el-col>
-          </el-row>
-          <el-row :gutter="20" class="box-number" >
-            <el-col :span="8">1204</el-col>
-            <el-col :span="8">23</el-col>
-            <el-col :span="8">2</el-col>
-          </el-row>
-          <el-row :gutter="20" class="box-percentage" >
-            <el-col :span="8">99%</el-col>
-            <el-col :span="8">5%</el-col>
-            <el-col :span="8">0.1%</el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="real-time-data">
-        <el-header class="header" style="height: 35px;">
-          <i class="iconfont icon-shugang"></i>计划目标
-        </el-header>
-        <div class="box">
-          <el-row :gutter="20" class="box-detail" >
-            <el-col :span="12">生产中</el-col>
-            <el-col :span="12">已完成</el-col>
-          </el-row>
-          <el-row :gutter="20" class="box-number" >
-            <el-col :span="12">104</el-col>
-            <el-col :span="12">230</el-col>
-          </el-row>
-          <el-row :gutter="20" class="box-percentage" >
-            <el-col :span="12">28%</el-col>
-            <el-col :span="12">62%</el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="real-time-data" style="flex: 3;">
-        <el-header class="header" style="height: 35px;">
-          <i class="iconfont icon-shugang"></i>财务状况
-            <div style="float: right;">
-                五月<i class="el-icon-arrow-down"></i>
-            </div>
-        </el-header>
-        <div class="box">
-          <el-row :gutter="20" class="box-detail" >
-            <el-col :span="12">当前余额</el-col>
-            <el-col :span="12">待收货款</el-col>
-          </el-row>
-          <el-row :gutter="20" class="box-number" >
-            <el-col :span="12"><div class="money"><span class="font">¥</span>120400.<span class="font">00</span></div></el-col>
-            <el-col :span="12"><span class="font">¥</span>5111.<span class="font">99</span></el-col>
-          </el-row>
-        </div>
-        <#--统计图-->
-        <div id="chartFinance" style="width: 100%;height: 180px"></div>
-      </div>
-    </div>
-    <div class="right">
-      <div class="right-top">
-        <div class="right-top-box real-time-data" style="width: 40%">
-          <el-header class="header" style="height: 35px;">
-            <i class="iconfont icon-shugang"></i>广告收支对比
-          </el-header>
-          <#--统计图-->
-            <div id="chartAdvertising" style="width: 100%;height: 240px"></div>
-        </div>
-        <div class="right-top-box real-time-data">
-          <el-header class="header">
-            <i class="iconfont icon-shugang"></i>生命周期
-          </el-header>
-          <#--统计图-->
-            <div id="chartLife" style="width: 100%;height: 210px"></div>
-        </div>
-        <div class="right-top-box real-time-data">
-          <el-header class="header">
-            <i class="iconfont icon-shugang"></i>销售物流
-          </el-header>
-            <div id="chartSales" style="width: 100%;height: 210px"></div>
-          <#--统计图-->
-        </div>
-      </div>
-      <div class="real-time-data" style="flex: 5;margin: 9px;">
-        <el-header class="header" style="height: 35px;">
-          <i class="iconfont icon-shugang"></i>团队业绩
-            <div style="float: right;">
-                本周<i class="el-icon-arrow-down"></i>
-            </div>
-        </el-header>
-        <div class="backgroundImage">
-          <div id="chartTeam" style="width: 100%;height: 400px"></div>
-        </div>
-        <#--统计图-->
-      </div>
-    </div>
-  </el-main>
-</div>
-<div id="custom">
-  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">
-    <el-form :model="form">
-      <el-form-item label="活动名称" :label-width="150">
-        <el-input v-model="form.name" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="活动区域" :label-width="150">
-        <el-select v-model="form.region" placeholder="请选择活动区域">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="dialogFormVisible = false">取 消</el-button>
-      <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
-    </div>
-  </el-dialog>
-</div>
-</body>
-</html>
-<script>
-
-  function cs(){
-    var data= {
-      data(){ return {
-        dialogFormVisible: true,
-        form: {
-          region: "111",
-          formLabelWidth:150,
-          name: "测试弹框"
-        },
-      }} ,
-      mounted: function () {
-        console.log(2222)
-      }
-    };
-    custom('custom',data);
-  }
-  function custom(id,obj) {
-    var dom = parent.document.getElementById("id");
-    if (!dom) {
-      dom = parent.document.createElement('div');
-      dom.id =id;
-      parent.document.body.appendChild(dom);
-    }
-    dom.innerHTML = document.querySelector('#'+id).innerHTML;
-    if(obj.data&&(typeof obj.data)==="object"){
-      obj.data = function () {
-        return obj.data
-      }
-    }
-    var ctor = parent.Vue.extend(obj);
-   return  new ctor().$mount('#'+id);
-  }
-</script>
-<script>
-  var mainVue = new Vue({
-    el: '#main',
-    data:{
-      chartFinance:'',
-      chartAdvertising:'',
-      chartLife:'',
-      chartSales:'',
-      chartTeam:'',
-    },
-    methods: {
-      list: function () {
-        this.finance();
-        this.advertising();
-        this.life();
-        this.sales();
-        this.team();
-      },
-      finance: function () {
-        this.chartFinance = echarts.init(document.getElementById("chartFinance"));
-        var option = {
-          tooltip: {
-            trigger: 'none',
-          },
-          grid:{
-            x:5,
-            y:30,
-            x2:5,
-            y2:30,
-          },
-          xAxis: {
-            type: 'category',
-            silent: false,
-            splitLine: {
-              show: false
-            },
-            axisLine: {
-              show: false
-            },
-            axisTick: {
-              show: false
-            },
-            data: ['01', '02', '03', '04', '05', '06','07']
-          },
-          yAxis: {
-            show: false,
-            minInterval: 8,
-          },
-          series: [
-            {
-              type:'line',
-              smooth: true,
-              data: [{value:7,symbol:'none'},
-                {value:4.5,symbol:'circle',symbolSize:9,itemStyle:{borderColor:'#069bff',color:'#ffe'}},
-                {value:3.5,symbol:'none'},
-                {value:2.5,symbol:'none'},
-                {value:2,symbol:'none'},
-                {value:1.5,symbol:'none'},
-                {value:2,symbol:'none'}],
-              lineStyle:{
-                color:'#069bff',
-                width: 2,
-              },
-            areaStyle: {
-                normal: {
-                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                        offset: 0,
-                        color: '#cfebfd'
-                    }, {
-                        offset: 1,
-                        color: '#ffe'
-                    }])
-                }
-            },
-              itemStyle:{
-                color:'#069bff',
-                borderWidth: 4,
-              }
-            },
-            {
-              type:'line',
-              smooth: true,
-              data: [{value:2,symbol:'none'},
-                    {value:1,symbol:'none'},
-                    {value:2,symbol:'none'},
-                    {value:3,symbol:'none'},
-                    {value:5,symbol:'circle',symbolSize:9,itemStyle:{borderColor:'#feb23a',color:'#ffe'}},
-                    {value:4,symbol:'none'},
-                    {value:6,symbol:'none'}],
-              lineStyle:{
-                color:'#feb23a',
-                width: 2,
-              },
-                areaStyle: {
-                    normal: {
-                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                            offset: 0,
-                            color: '#fedba3'
-                        }, {
-                            offset: 1,
-                            color: '#ffe'
-                        }])
-                    }
-                },
-              itemStyle:{
-                color:'#feb23a',
-                borderWidth: 4,
-              }
-            }
-          ]
-        };
-          this.chartFinance.setOption(option);
-      },
-        advertising: function(){
-            this.chartAdvertising = echarts.init(document.getElementById("chartAdvertising"));
-            var option = {
-                tooltip: {
-                    trigger: 'none',
-                },
-                legend: {
-                    itemWidth: 10,
-                    itemHeight: 10,
-                    right: '10%',
-                    top: 0,
-                    data:['支出','收入']
-                },
-                grid:{
-                  x:25,
-                  y:10,
-                  x2:25,
-                  y2:25,
-                },
-                xAxis: {
-                    type: 'category',
-                    silent: false,
-                    splitLine: {
-                        show: false
-                    },
-                    axisLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    data: ['01', '02', '03', '04', '05', '06','07']
-                },
-                yAxis: {
-                    splitLine:{
-                      show: true,
-                      lineStyle:{
-                        color:'#f6f6f6',
-                      },
-                    },
-                    axisLine:{
-                      show: false,
-                    },
-                    axisTick:{
-                      show: false,
-                    },
-                    axisLabel:{
-                      show: false,
-                    },
-                },
-                series: [
-                    {
-                        name:'支出',
-                        type:'bar',
-                        barWidth:'15%',
-                        itemStyle:{
-                            color: '#feb23a',
-                        },
-                        data:[7,7,7,4,5,7.5,7.5]
-                    },
-                    {
-                        name:'收入',
-                        type:'bar',
-                        barWidth:'15%',
-                        itemStyle:{
-                            color: '#069bff',
-                        },
-                        data:[8,8,5,3.5,8,9,9]
-                    }
-                ]
-            };
-            this.chartAdvertising.setOption(option);
-        },
-        life: function(){
-            this.chartLife = echarts.init(document.getElementById("chartLife"));
-            var option = {
-                tooltip : {
-                    trigger: 'none',
-                },
-                legend: {
-                  itemWidth: 10,
-                  itemHeight: 10,
-                  itemGap:20,
-                    x : 'center',
-                    y : 'bottom',
-                    data:['热销期','复购率','平销期','旺销期','滞销期']
-                },
-                calculable : true,
-                series : [
-                    {
-                        type:'pie',
-                        radius : [20, 40],
-                        center: ['50%','40%'],
-                        roseType : 'radius',
-                        data:[
-                            {value:150, name:'热销期',itemStyle:{color: '#2e65fd'}},
-                            {value:100, name:'复购率',itemStyle:{color: '#8abe78'}},
-                            {value:60, name:'平销期',itemStyle:{color: '#feb23a'}},
-                            {value:100, name:'旺销期',itemStyle:{color: '#69c0fe'}},
-                            {value:40, name:'滞销期',itemStyle:{color: '#d0e3fe'}},
-                        ]
-                    }
-                ]
-            };
-            this.chartLife.setOption(option);
-        },
-        sales: function(){
-            this.chartSales = echarts.init(document.getElementById("chartSales"));
-            var option = {
-                tooltip : {
-                    trigger: 'none',
-                },
-                legend: {
-                  itemWidth: 10,
-                  itemHeight: 10,
-                  itemGap:20,
-                    x : 'center',
-                    y : 'bottom',
-                    data:['0-2天','2-5天','5-8天','8天以上']
-                },
-                calculable : true,
-                series : [
-                    {
-                        type:'pie',
-                        radius : [20, 40],
-                        center: ['50%','40%'],
-                        roseType : 'radius',
-                        data:[
-                            {value:130, name:'0-2天',itemStyle:{color: '#2e65fd'}},
-                            {value:30, name:'2-5天',itemStyle:{color: '#d0e3fe'}},
-                            {value:80, name:'5-8天',itemStyle:{color: '#feb23a'}},
-                            {value:100, name:'8天以上',itemStyle:{color: '#8abe78'}},
-                        ]
-                    }
-                ]
-            };
-            this.chartSales.setOption(option);
-        },
-        team: function(){
-            this.chartTeam = echarts.init(document.getElementById("chartTeam"));
-            var option = {
-                grid:{
-                  x:40,
-                  y:40,
-                  x2:20,
-                  y2:40,
-                },
-                xAxis: {
-                    type: 'category',
-                    boundaryGap: false,
-                    silent: false,
-                    splitLine: {
-                        show: false
-                    },
-                    axisLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    data: ['30.05', '31.05', '01.06', '02.06', '03.06', '04.06', '05.06','06.06','07.06','08.06','09.06']
-                },
-                yAxis: {
-                    type: 'value',
-                    boundaryGap: true,
-                    axisLine:{
-                      show: false,
-                    },
-                    axisTick:{
-                      show: false,
-                    },
-                    splitLine:{
-                      show: true,
-                    },
-                },
-                series: [{
-                    data: [{value:42.5,symbol:'none'},
-                      {value:39,symbol:'none'},
-                      {value:45,symbol:'none'},
-                      {value:30,symbol:'none'},
-                      {value:38,symbol:'none'},
-                      {value:45,symbol:'none'},
-                      {value:30,symbol:'none'},
-                      {value:36,symbol:'none'},
-                      {value:46,symbol:'circle',symbolSize:10,itemStyle:{borderColor:'#0099ff',color:'#ffe',borderWidth:4}},
-                      {value:28,symbol:'none'},
-                      {value:45,symbol:'none'}],
-                    type: 'line',
-                    markPoint : {
-                        data : [
-                            {type : 'max', name: '最大值'},
-                        ]
-                    },
-                    smooth: 0.5,
-                    lineStyle:{
-                        color: '#0099ff',
-                        width: 6,
-                    },
-                    itemStyle:{
-                        color: '#0099ff',
-                        width: 5,
-                    },
-                }]
-            };
-            this.chartTeam.setOption(option);
-        },
-    },
-    mounted(){
-      var that = this;
-      that.$nextTick(function () {
-        that.list();
-      });
-    },
-  })
-  window.addEventListener("resize", function () {
-    mainVue.chartTeam.resize();
-    mainVue.chartFinance.resize();
-    mainVue.chartAdvertising.resize();
-    mainVue.chartLife.resize();
-    mainVue.chartSales.resize();
-  });
-  window.onload = function () {
-    mainVue.chartAdvertising.resize();
-    mainVue.chartLife.resize();
-    mainVue.chartSales.resize();
-    mainVue.chartTeam.resize();
-    mainVue.chartFinance.resize();
-    mainVue.chartAdvertising.resize();
-    mainVue.chartLife.resize();
-  }
-</script>
-<style>
-  html{
-    overflow: hidden;
-  }
-  #main .ms-container{
-    display: flex;
-    flex-direction: row;
-    height: 100vh;
-    margin: 0px !important;
- }
-  #main{
-    min-width: 1200px;
- }
- #main .left{
-   display: flex;
-   flex-direction: column;
-   width: 25%;
- }
- #main .left .real-time-data{
-   flex: 2;
-   margin: 9px;
- }
- #main .right-top .right-top-box{
-   width: 30%;
-   margin: 9px;
- }
- #main .right{
-   width: 75%;
-   display: flex;
-   flex-direction: column;
- }
- #main .right-top{
-   display: flex;
-   flex-direction: row;
-   flex: 4;
- }
-  #main .real-time-data{
-    box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
-  }
-  #main .iconfont{
-    padding-top: 5px;
-    font-size: 20px;
-    color: #0099ff;
-  }
-  #main .header{
-    font-size: 16px;
-    color: #333;
-    padding-top: 10px;
-  }
-  #main .box{
-    padding: 0 10px;
+<div style="
     text-align: center;
-    padding-bottom: 17px;
-  }
-  #main .box-detail{
-    color: #3c5175;
-    padding-top: 24px;
-    font-size: 14px;
-  }
-  #main .box-number{
-    color: #0099ff;
-    padding-top: 24px;
-    font-size: 19px;
-    font-weight: bolder;
-  }
-  #main .box-percentage{
-    color: #3c5175;
-    padding-top: 24px;
-    font-size: 14px;
-  }
-  #main .box-number .money{
-    color: #feb23a;
-  }
-  #main .font{
-    font-size: 16px;
-  }
-  #main .backgroundImage{
-    background: url('../images/background.png') no-repeat center!important;
-    background-size: 132% 80%!important;
-  }
-</style>
-<script>
-  var _hmt = _hmt || [];
-  (function() {
-    var hm = document.createElement("script");
-    hm.src = "https://hm.baidu.com/hm.js?f9a6362fff0e5ef420e8566f15e5806e";
-    var s = document.getElementsByTagName("script")[0];
-    s.parentNode.insertBefore(hm, s);
-  })();
-</script>
+    color: #555;
+    background: #FCFCFC;
+    height: 300px;
+    padding-top: 200px;
+    vertical-align: middle;
+"><h2>欢迎使用铭飞产品</h2><p>技术交流加群:①242805203 ②231212174(满) ③221335098(满)  或到<a href="http://ms.mingsoft.net/mbbs/main.do" target="_blank"  style="
+    text-decoration: none;
+">官方论坛进行技术交流</a></p></div>
+</body>
+</html>

+ 77 - 68
src/main/webapp/html/1/index.html

@@ -3,32 +3,40 @@
     <head>
         <title>MCMS-OPEN</title>
 <meta charset="utf-8">
-<link rel="stylesheet" type="text/css" href="http://localhost:8080/ms-mcms/plugins/iconfont/1.0.0/iconfont.css" />
-<link rel="stylesheet/less" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/less/base.less">
-<link rel="stylesheet/less" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/less/index.less">
-<link rel="stylesheet/less" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/less/advice.less">
-<link rel="stylesheet/less" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/less/case-list.less">
-<link rel="stylesheet/less" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/less/about.less">
-<link rel="stylesheet/less" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/less/news-list.less">
-<link rel="stylesheet/less" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/less/news-show.less">
-<link rel="stylesheet/less" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/less/center.less">
-<script src="http://localhost:8080/ms-mcms/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
-<script src="http://localhost:8080/ms-mcms/templets/1/default/js/slider.js"></script>
-<script src="http://localhost:8080/ms-mcms/static/plugins/less/3.9.0/less.min.js"></script>
+<link rel="stylesheet" type="text/css" href="http://127.0.0.1:8080/ms-mcms/plugins/iconfont/1.0.0/iconfont.css" />
+<link rel="stylesheet/less" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/less/base.less">
+<link rel="stylesheet/less" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/less/index.less">
+<link rel="stylesheet/less" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/less/advice.less">
+<link rel="stylesheet/less" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/less/case-list.less">
+<link rel="stylesheet/less" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/less/about.less">
+<link rel="stylesheet/less" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/less/news-list.less">
+<link rel="stylesheet/less" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/less/news-show.less">
+<link rel="stylesheet/less" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/less/center.less">
+<script src="http://127.0.0.1:8080/ms-mcms/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/templets/1/default/js/slider.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/static/plugins/less/3.9.0/less.min.js"></script>
 <!--vue-懒加载-表单验证-->
-<script src="http://localhost:8080/ms-mcms/plugins/vue/2.3.3/vue.min.js"></script>
-<script src="http://localhost:8080/ms-mcms/plugins/validator/5.5.0/validator.min.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/plugins/vue/2.6.9/vue.min.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/plugins/validator/10.8.0/validator.min.js"></script>
+<!-- Element -->
+<link rel="stylesheet" href="http://127.0.0.1:8080/ms-mcms/plugins/element-ui/2.8.2/index.css">
+<script src="http://127.0.0.1:8080/ms-mcms/plugins/element-ui/2.8.2/index.js"></script>
 
-<link rel="stylesheet" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/css/animate.css">
-<script src="http://localhost:8080/ms-mcms/static/plugins/axios/0.18.0/axios.min.js"></script>
-<script src="http://localhost:8080/ms-mcms/static/plugins/ms/1.0.0/ms.js"></script>
-<script src="http://localhost:8080/ms-mcms/static/plugins/ms/1.0.0/ms.http.js"></script>
-<script src="http://localhost:8080/ms-mcms/static/plugins/ms/1.0.0/ms.util.js"></script>
-<script type="text/javascript">
+<link rel="stylesheet" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/css/animate.css">
+<script src="http://127.0.0.1:8080/ms-mcms/static/plugins/axios/0.18.0/axios.min.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/static/plugins/ms/1.0.0/ms.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/static/plugins/ms/1.0.0/ms.http.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/static/plugins/ms/1.0.0/ms.util.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/api/ms.people.min.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/static/plugins/plupload/plupload.full.min.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/static/plugins/qs/6.6.0/qs.min.js"></script>
+<script src="http://127.0.0.1:8080/ms-mcms/static/plugins/ms/1.0.0/ms.upload.js"></script>
+<script>
 	window.http = ms.http;
-</script>
-        <link rel="stylesheet" type="text/css" href="http://localhost:8080/ms-mcms/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
-        <script type="text/javascript" src="http://localhost:8080/ms-mcms/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+	ms.base = "http://127.0.0.1:8080/ms-mcms";
+	ms.login = 'http://127.0.0.1:8080/ms-mcms';
+</script>        <link rel="stylesheet" type="text/css" href="http://127.0.0.1:8080/ms-mcms/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
+        <script type="text/javascript" src="http://127.0.0.1:8080/ms-mcms/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
         <script>
         	var ms = {
         			base:"http://mstore.mingsoft.net"
@@ -41,17 +49,17 @@
 <div class="ms-head">
     <div class="head-menu">
         <div class="head-men-left head-menu-flex-center">
-            <a href="http://localhost:8080/ms-mcms/html/1/index.html">
+            <a href="http://127.0.0.1:8080/ms-mcms/html/1/index.html">
                 <img src="http://cdn.mingsoft.net/images/logo.png" />
             </a>
             <ul class="head-menu-list">
                 <li class="head-menu-list-li">走进铭飞
                     <ul class="head-menu-son-list">
                         <li>
-                            <a target="_blank" href='http://localhost:8080/ms-mcms/html/1//53/index.html'>关于我们</a>
+                            <a target="_blank" href='http://127.0.0.1:8080/ms-mcms/html/1//53/index.html'>关于我们</a>
                         </li>
                         <li>
-                            <a target="_blank" href='http://localhost:8080/ms-mcms/html/1//59/index.html'>公司动态</a>
+                            <a target="_blank" href='http://127.0.0.1:8080/ms-mcms/html/1//59/index.html'>公司动态</a>
                         </li>
                         <li>
                             <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
@@ -60,12 +68,12 @@
                             <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>加入我们</a>
                         </li>
                         <li>
-                            <a target="_blank" href='http://localhost:8080/ms-mcms/html/1//19/141/index.html'>联系我们</a>
+                            <a target="_blank" href='http://127.0.0.1:8080/ms-mcms/html/1//19/141/index.html'>联系我们</a>
                         </li>
                     </ul>
                 </li>
                 <li class="head-menu-list-li">
-                    <a href='http://localhost:8080/ms-mcms/html/1//149/index.html'>案例</a>
+                    <a href='http://127.0.0.1:8080/ms-mcms/html/1//149/index.html'>案例</a>
                 </li>
                 <li class="head-menu-list-li">
                     <a target="_blank" href='http://mstore.mingsoft.net/mstoreShow.do'>插件&模板</a>
@@ -75,7 +83,7 @@
                     </ul> -->
                 </li>
                 <li class="head-menu-list-li">
-                    <a target="_blank" href='http://localhost:8080/ms-mcms/html/1//19/142/index.html'>在线留言</a>
+                    <a target="_blank" href='http://127.0.0.1:8080/ms-mcms/html/1//19/142/index.html'>在线留言</a>
                 </li>
                 <li class="head-menu-list-li">技术支持
                     <ul class="head-menu-son-list">
@@ -94,7 +102,7 @@
         </div>
         <div class="head-men-right head-menu-flex-center">
             <div class="head-menu-flex-center head-menu-right-search">
-                <form id="searchDataForm" action="http://localhost:8080/ms-mcms/cms/1/search.do" method="post">
+                <form id="searchDataForm" action="http://127.0.0.1:8080/ms-mcms/cms/1/search.do" method="post">
                     <input type="text" class='ms-search-input' name="basic_title" placeholder="请输入关键字">
                     <!-- <i class="iconfont ms-search-click">&#xe85e;</i> -->
                     <input type="submit" value="" class="ms-search-click">
@@ -103,12 +111,12 @@
             <div class="head-menu-right-content" id="ms-login-vue">
                 <span v-show="!isLogin" style="display: none;">
                     <span>
-                        <a href='http://localhost:8080/ms-mcms/mcms/login.do'>登录</a>
-                    </span>|<span><a href='http://localhost:8080/ms-mcms/mcms/register.do'>注册</a></span>
+                        <a href='http://127.0.0.1:8080/ms-mcms/mcms/login.do'>登录</a>
+                    </span>|<span><a href='http://127.0.0.1:8080/ms-mcms/mcms/register.do'>注册</a></span>
                 </span>
                 <div class="topbar-info J_userInfo loginSuccess hide-default" v-show="isLogin" style="display: none;">
-                    <a class="user-name" href="http://localhost:8080/ms-mcms/people/center.do">
-                        <img :src="'http://localhost:8080/ms-mcms'+ peopleInfo.puIcon" class="loginImg user_icon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'">
+                    <a class="user-name" href="http://127.0.0.1:8080/ms-mcms/people/center.do">
+                        <img :src="'http://127.0.0.1:8080/ms-mcms/'+peopleInfo.puIcon" class="loginImg user_icon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'">
                         <b class="userName ms-userName" v-text="peopleInfo.puNickname"></b>
                     </a>
                     <a href="javascript:;" class="quitLogin" @click="quitLogin">退出</a>
@@ -123,21 +131,23 @@
         data: {
             isLogin: "", //登录状态
             peopleInfo: "", //个人信息
+            imgUrl:"",
         },
+        
         mounted: function() {
             //获取个人信息
             var target = this;
             $.ajax({
                 type: "POST",
-                url: "http://localhost:8080/ms-mcms/checkLoginStatus.do",
+                url: "http://127.0.0.1:8080/ms-mcms/checkLoginStatus.do",
                 success: function(msg) {
-                    target.isLogin = msg.result;
+                    target.isLogin = msg.result;  //判断用户是否登录,如登录,则target.isLogin===true
                     if(msg.result) {
                         $.ajax({
                             type: "GET",
-                            url: "http://localhost:8080/ms-mcms/people/user/info.do",
+                            url: "http://127.0.0.1:8080/ms-mcms/people/user/info.do",
                             success: function(msg) {
-                                target.peopleInfo = msg;
+                                target.peopleInfo = msg;  //target.peopleInfo为当前登录用户的基本信息
                             }
                         })
                     }
@@ -150,11 +160,11 @@
                 var target = this;
                 $.ajax({
                     type: "GET",
-                    url: "http://localhost:8080/ms-mcms/people/quit.do",
+                    url: "http://127.0.0.1:8080/ms-mcms/people/quit.do",
                     success: function(msg) {
                         if(msg.result) {
                             $("body").append("<form id='msHeadForm' action=''></form>");
-                            $("#msHeadForm").attr("action", "http://localhost:8080/ms-mcms").submit();
+                            $("#msHeadForm").attr("action", "http://127.0.0.1:8080/ms-mcms").submit();
                         }
                     }
                 })
@@ -188,15 +198,15 @@
             <div id="banner_tabs" class="flexslider">
                 <ul class="slides">
                     <template v-for="banner in bannerList">
-                        <li style="background:url(http://localhost:8080/ms-mcms/templets/1/default/images/03.jpg) no-repeat center;">
+                        <li style="background:url(http://127.0.0.1:8080/ms-mcms/templets/1/default/images/03.jpg) no-repeat center;">
                             <p class="banner_tit animated fadeInLeft">铭飞MS平台</p>
                             <p class="banner_des animated fadeInRight">MCms系统永久完整开源</p>
                         </li>
-                        <li style="background:url(http://localhost:8080/ms-mcms/templets/1/default/images/03.jpg) no-repeat center;">
+                        <li style="background:url(http://127.0.0.1:8080/ms-mcms/templets/1/default/images/03.jpg) no-repeat center;">
                             <p class="banner_tit animated fadeInLeft">MStore</p>
                             <p class="banner_des animated fadeInRight">丰富强大的功能插件、海量精美的行业模板</p>
                         </li>
-                        <li style="background:url(http://localhost:8080/ms-mcms/templets/1/default/images/03.jpg) no-repeat center;">
+                        <li style="background:url(http://127.0.0.1:8080/ms-mcms/templets/1/default/images/03.jpg) no-repeat center;">
                             <p class="banner_tit animated fadeInLeft">优质的服务体验</p>
                             <p class="banner_des animated fadeInRight">人工远程协助服务、永久享受更新升级</p>
                         </li>
@@ -226,23 +236,23 @@
                             <div class="tab-content">
                                 <div role="tabpanel" class="tab-pane active" id="model">
                                     <div style="display: none;" class="ms-loading" v-show="!loading">
-                                        <img src="http://localhost:8080/ms-mcms/templets/1/default/images/loading.gif" />
+                                        <img src="http://127.0.0.1:8080/ms-mcms/templets/1/default/images/loading.gif" />
                                     </div>
                                     <div class="ms-model-content" style="display: none;" v-show="loading">
                                         <template v-for="model in modelList">
                                             <div class="ms-model-list">
                                                 <a class="ms-model-img" :href="model.upgraderVersionUrl" target="_blank">
-                                                    <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://mstore.mingsoft.net/'+model.upgraderVersionImg" onerror="this.src='http://localhost:8080/ms-mcms/templets/1/default/images/no-data.png'" />
+                                                    <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://mstore.mingsoft.net/'+model.upgraderVersionImg" onerror="this.src='http://127.0.0.1:8080/ms-mcms/templets/1/default/images/no-data.png'" />
                                                 </a>
-                                                <div class="ms-model-mobile-img" v-if="model.upgraderVersionMobileImg != '' && model.upgraderVersionMobileImg != undefined" style="background: url(http://localhost:8080/ms-mcms/templets/1/default/images/mobile.png)">
+                                                <div class="ms-model-mobile-img" v-if="model.upgraderVersionMobileImg != '' && model.upgraderVersionMobileImg != undefined" style="background: url(http://127.0.0.1:8080/ms-mcms/templets/1/default/images/mobile.png)">
                                                     <div>
-                                                        <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://mstore.mingsoft.net/'+model.upgraderVersionMobileImg" onerror="this.src='http://localhost:8080/ms-mcms/templets/1/default/images/no-data.png'" />
+                                                        <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://mstore.mingsoft.net/'+model.upgraderVersionMobileImg" onerror="this.src='http://127.0.0.1:8080/ms-mcms/templets/1/default/images/no-data.png'" />
                                                     </div>
                                                 </div>
                                                 <div class="ms-model-info">
                                                     <span v-text="model.upgraderVersionName"></span>
                                                     <img class="ms-model-info-img" :src="model.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
-                                                    <img :src="'http://localhost:8080/ms-mcms/templets/1/default/images/level-'+model.upgraderVersionStart+'.png'" />
+                                                    <img :src="'http://127.0.0.1:8080/ms-mcms/templets/1/default/images/level-'+model.upgraderVersionStart+'.png'" />
                                                     <div class="ms-model-type">模板</div>
                                                 </div>
                                             </div>
@@ -259,12 +269,12 @@
                                         <template v-for="pulg in pulgList">
                                             <div class="ms-model-list">
                                                 <a class="ms-model-img" :href="pulg.upgraderVersionUrl" target="_blank">
-                                                    <img :src="'http://mstore.mingsoft.net/'+pulg.upgraderVersionImg" onerror="this.src='http://localhost:8080/ms-mcms/templets/1/default/images/no-data.png'" />
+                                                    <img :src="'http://mstore.mingsoft.net/'+pulg.upgraderVersionImg" onerror="this.src='http://127.0.0.1:8080/ms-mcms/templets/1/default/images/no-data.png'" />
                                                 </a>
                                                 <div class="ms-model-info">
                                                     <span v-text="pulg.upgraderVersionName"></span>
                                                     <img class="ms-model-info-img" :src="pulg.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
-                                                    <img :src="'http://localhost:8080/ms-mcms/templets/1/default/images/level-'+pulg.upgraderVersionStart+'.png'" />
+                                                    <img :src="'http://127.0.0.1:8080/ms-mcms/templets/1/default/images/level-'+pulg.upgraderVersionStart+'.png'" />
                                                     <div class="ms-model-type">插件</div>
                                                 </div>
                                             </div>
@@ -285,13 +295,13 @@
                         <div class="ms-content-case-title">
                             <div class="ms-content-case-title-words">网站案例</div>
                             <div class="ms-content-case-more">
-                                <a href='http://localhost:8080/ms-mcms/html/1//149/index.html'>MORE>></a>
+                                <a href='http://127.0.0.1:8080/ms-mcms/html/1//149/index.html'>MORE>></a>
                             </div>
                         </div>
                         <div class="ms-content-case-list">
                             <div class="ms-content-main-case">
                                 <div class="ms-content-main-case-img">
-                                    <img src="http://localhost:8080/ms-mcms/upload/1//article/1531105696938.jpg">
+                                    <img src="http://127.0.0.1:8080/ms-mcms/upload/1//article/1531105696938.jpg">
                                 </div>
                                 <div class="ms-content-main-case-explain">
                                     <div class="ms-content-main-case-title">攀臣广告</div>
@@ -308,7 +318,7 @@
                             </div>
                             <div class="ms-content-main-case">
                                 <div class="ms-content-main-case-img">
-                                    <img src="http://localhost:8080/ms-mcms/upload/1//article/1531105877049.jpg">
+                                    <img src="http://127.0.0.1:8080/ms-mcms/upload/1//article/1531105877049.jpg">
                                 </div>
                                 <div class="ms-content-main-case-explain">
                                     <div class="ms-content-main-case-title">华赋科创</div>
@@ -325,7 +335,7 @@
                             </div>
                             <div class="ms-content-main-case">
                                 <div class="ms-content-main-case-img">
-                                    <img src="http://localhost:8080/ms-mcms/upload/1//article/1531105970322.jpg">
+                                    <img src="http://127.0.0.1:8080/ms-mcms/upload/1//article/1531105970322.jpg">
                                 </div>
                                 <div class="ms-content-main-case-explain">
                                     <div class="ms-content-main-case-title">洛阳洛龙</div>
@@ -389,14 +399,14 @@
                         <div class="ms-content-news-main-title">
                             <div class="ms-content-news-main-title-words">公司动态</div>
                             <div class="ms-content-news-main-title-more">
-                                <a href='http://localhost:8080/ms-mcms/html/1//59/index.html'>MORE>></a>
+                                <a href='http://127.0.0.1:8080/ms-mcms/html/1//59/index.html'>MORE>></a>
                             </div>
                         </div>
                         <div class="ms-content-news-main-img-text">
-	                            <img src="http://localhost:8080/ms-mcms/upload/article/1/1461384072200.jpeg">
+	                            <img src="http://127.0.0.1:8080/ms-mcms/upload/article/1/1461384072200.jpeg">
                             <ul class="ms-content-news-main-ul">
                                 <li>
-                                    <a href="http://localhost:8080/ms-mcms/html/1//59/69\70.html">
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1//59/69/70.html">
                                         <div class="ms-content-news-main-li-title">
                                             <!-- <span class="ms-content-news-main-li-span">·</span> -->
                                             <span class="">2015年 铭飞MCms获得最热门开源项目第40位</span>
@@ -405,7 +415,7 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="http://localhost:8080/ms-mcms/html/1//59/68\71.html">
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1//59/68/71.html">
                                         <div class="ms-content-news-main-li-title">
                                             <!-- <span class="ms-content-news-main-li-span">·</span> -->
                                             <span class="">国内java开源 cms系统</span>
@@ -414,7 +424,7 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="http://localhost:8080/ms-mcms/html/1//59/68\72.html">
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1//59/68/72.html">
                                         <div class="ms-content-news-main-li-title">
                                             <!-- <span class="ms-content-news-main-li-span">·</span> -->
                                             <span class="">2016年CMS开源系统排行榜</span>
@@ -423,7 +433,7 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="http://localhost:8080/ms-mcms/html/1//59/68\73.html">
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1//59/68/73.html">
                                         <div class="ms-content-news-main-li-title">
                                             <!-- <span class="ms-content-news-main-li-span">·</span> -->
                                             <span class="">国内java开源商城系统</span>
@@ -432,7 +442,7 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="http://localhost:8080/ms-mcms/html/1//59/68\74.html">
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1//59/68/74.html">
                                         <div class="ms-content-news-main-li-title">
                                             <!-- <span class="ms-content-news-main-li-span">·</span> -->
                                             <span class="">国内java开源bbs系统</span>
@@ -441,7 +451,7 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="http://localhost:8080/ms-mcms/html/1//59/70\177.html">
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1//59/70/177.html">
                                         <div class="ms-content-news-main-li-title">
                                             <!-- <span class="ms-content-news-main-li-span">·</span> -->
                                             <span class="">国内开源 java cms,铭飞MCms</span>
@@ -460,7 +470,7 @@
         <div class="ms-footer-left">
             <div class="ms-footer-left-column">
                 <span class="ms-footer-left-column-about">
-                	<a href='http://localhost:8080/ms-mcms/html/1//53/index.html'>关于我们</a>
+                	<a href='http://127.0.0.1:8080/ms-mcms/html/1//53/index.html'>关于我们</a>
                 </span>|
                 <span class="ms-footer-left-column-course">
                 	<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
@@ -472,12 +482,12 @@
             <span class="ms-footer-left-copyright">版权所有&copy;铭飞科技有限公司2012-2018保留一切权利</span>
         </div>
         <div class="ms-footer-right">
-            <img class='ms-footer-right-img-weixin' src="http://localhost:8080/ms-mcms/templets/1/default/images/we-chat.png">
-            <a target="_blank" href='http://tieba.baidu.com/f?kw=%E9%93%AD%E9%A3%9E%E7%A7%91%E6%8A%80&fr=index&fp=0&ie=utf-8'><img class="ms-footer-right-baidu" src="http://localhost:8080/ms-mcms/templets/1/default/images/baidu.png"></a>
-            <a target="_blank" href='http://weibo.com/killfen'><img src="http://localhost:8080/ms-mcms/templets/1/default/images/micro-blog.png"></a>
+            <img class='ms-footer-right-img-weixin' src="http://127.0.0.1:8080/ms-mcms/templets/1/default/images/we-chat.png">
+            <a target="_blank" href='http://tieba.baidu.com/f?kw=%E9%93%AD%E9%A3%9E%E7%A7%91%E6%8A%80&fr=index&fp=0&ie=utf-8'><img class="ms-footer-right-baidu" src="http://127.0.0.1:8080/ms-mcms/templets/1/default/images/baidu.png"></a>
+            <a target="_blank" href='http://weibo.com/killfen'><img src="http://127.0.0.1:8080/ms-mcms/templets/1/default/images/micro-blog.png"></a>
         	<div class="ms-footer-right-weixin">
         		<p></p>
-        		<img alt="" src="http://localhost:8080/ms-mcms/templets/1/default/images/weixin.jpg">
+        		<img alt="" src="http://127.0.0.1:8080/ms-mcms/templets/1/default/images/weixin.jpg">
         	</div>
         </div>
     </div>
@@ -488,7 +498,6 @@ $(function(){
     $(".head-menu-list-li").hover(function(){
         $(this).find(".head-menu-son-list").fadeToggle();
     });
-    
     $('.ms-footer-right-img-weixin').hover(function(){
     	$('.ms-footer-right-weixin').toggle();
     });

+ 51 - 51
src/main/webapp/html/1/m/index.html

@@ -4,46 +4,46 @@
     <title>MCMS-OPEN</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="http://localhost:8080/ms-mcms/plugins/amazeui/2.7.2/css/amazeui.min.css" />
-    <link rel="stylesheet" type="text/css" href="http://localhost:8080/ms-mcms/plugins/iconfont/1.0.0/iconfont.css" />
-    <link rel="stylesheet" type="text/less" href="http://localhost:8080/ms-mcms/templets/1/default/m/less/index.less" />
-    <link rel="stylesheet" type="text/less" href="http://localhost:8080/ms-mcms/templets/1/default/m/less/base.less" />
-    <link rel="stylesheet" type="text/less" href="http://localhost:8080/ms-mcms/templets/1/default/m/less/about.less" />
-    <link rel="stylesheet" type="text/less" href="http://localhost:8080/ms-mcms/templets/1/default/m/less/case-list.less" />
-    <link rel="stylesheet" type="text/less" href="http://localhost:8080/ms-mcms/templets/1/default/m/less/news-list.less" />
-    <link rel="stylesheet" type="text/less" href="http://localhost:8080/ms-mcms/templets/1/default/m/less/news-show.less" />
-    <link rel="stylesheet" type="text/less" href="http://localhost:8080/ms-mcms/templets/1/default/m/less/advice.less" />
-    <script src="http://localhost:8080/ms-mcms/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
-    <script src="http://localhost:8080/ms-mcms/plugins/amazeui/2.7.2/js/amazeui.min.js"></script>
-    <script src="http://localhost:8080/ms-mcms/templets/1/default/m/js/jiaoben.js"></script>
-    <script src="http://localhost:8080/ms-mcms/plugins/seajs/3.0.0/sea.js"></script>
+    <link rel="stylesheet" type="text/css" href="http://127.0.0.1:8080/ms-mcms/plugins/amazeui/2.7.2/css/amazeui.min.css" />
+    <link rel="stylesheet" type="text/css" href="http://127.0.0.1:8080/ms-mcms/plugins/iconfont/1.0.0/iconfont.css" />
+    <link rel="stylesheet" type="text/less" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/less/index.less" />
+    <link rel="stylesheet" type="text/less" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/less/base.less" />
+    <link rel="stylesheet" type="text/less" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/less/about.less" />
+    <link rel="stylesheet" type="text/less" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/less/case-list.less" />
+    <link rel="stylesheet" type="text/less" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/less/news-list.less" />
+    <link rel="stylesheet" type="text/less" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/less/news-show.less" />
+    <link rel="stylesheet" type="text/less" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/less/advice.less" />
+    <script src="http://127.0.0.1:8080/ms-mcms/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
+    <script src="http://127.0.0.1:8080/ms-mcms/plugins/amazeui/2.7.2/js/amazeui.min.js"></script>
+    <script src="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/js/jiaoben.js"></script>
+    <script src="http://127.0.0.1:8080/ms-mcms/plugins/seajs/3.0.0/sea.js"></script>
     <!--vue-懒加载-表单验证-->
-    <script src="http://localhost:8080/ms-mcms/plugins/vue/2.3.3/vue.min.js"></script>
-    <script src="http://localhost:8080/ms-mcms/plugins/validator/5.5.0/validator.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="http://localhost:8080/ms-mcms/templets/1/default/m/css/style.css">
+    <script src="http://127.0.0.1:8080/ms-mcms/plugins/vue/2.3.3/vue.min.js"></script>
+    <script src="http://127.0.0.1:8080/ms-mcms/plugins/validator/5.5.0/validator.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/css/style.css">
     <script>
     ms.config({
-        base: "http://localhost:8080/ms-mcms",
+        base: "http://127.0.0.1:8080/ms-mcms",
         filter: {
             people: {
-                loginUrl: 'http://localhost:8080/ms-mcms'
+                loginUrl: 'http://127.0.0.1:8080/ms-mcms'
             }
         }
     });
 </script>
-</head>    <link rel="stylesheet" type="text/css" href="http://localhost:8080/ms-mcms/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
-    <script type="text/javascript" src="http://localhost:8080/ms-mcms/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+</head>    <link rel="stylesheet" type="text/css" href="http://127.0.0.1:8080/ms-mcms/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
+    <script type="text/javascript" src="http://127.0.0.1:8080/ms-mcms/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
     <body>
 <div class="ms-head">
     <header data-am-widget="header" class="am-header am-header-default ms-head-background">
         <div class="am-header-left am-header-nav">
-            <a href="http://localhost:8080/ms-mcms/" class="">
+            <a href="http://127.0.0.1:8080/ms-mcms/" class="">
                 <i class="iconfont">&#xe99b;</i>
             </a>
         </div>
         <h1 style="height: 100%;" class="am-header-title ms-header-title">
-            <a href="http://localhost:8080/ms-mcms" class="">
-                <img src="http://localhost:8080/ms-mcms/templets/1/default/m/images/ms.ico">
+            <a href="http://127.0.0.1:8080/ms-mcms" class="">
+                <img src="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/ms.ico">
             </a>
         </h1>
         <nav data-am-widget="menu" class="am-menu  am-menu-offcanvas1" data-am-menu-offcanvas>
@@ -54,16 +54,16 @@
                 <div class="am-offcanvas-bar">
                     <ul class="am-menu-nav am-avg-sm-1">
                     	<li class="">
-                            <a href="http://localhost:8080/ms-mcms" class="">首页</a>
+                            <a href="http://127.0.0.1:8080/ms-mcms" class="">首页</a>
                         </li>
                         <li class="am-parent">
                             <a href="##" class="">走进铭飞</a>
                             <ul class="am-menu-sub am-collapse  am-avg-sm-3 ">
                                 <li class="">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/53/index.html" class="">关于我们</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/53/index.html" class="">关于我们</a>
                                 </li>
                                 <li class="">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/59/index.html" class="">公司动态</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/59/index.html" class="">公司动态</a>
                                 </li>
                                 <li class="">
                                     <a href="http://mingsoft.net/html/1//5527/index.html#faz" class="">发展历程</a>
@@ -72,19 +72,19 @@
                                     <a href="http://mingsoft.net/html/1//5527/index.html#lianx" class="">加入我们</a>
                                 </li>
                                 <li class="">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/19/index.html" class="">联系我们</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/19/index.html" class="">联系我们</a>
                                 </li>
                                 
                             </ul>
                         </li>
                         <li class="">
-                            <a href="http://localhost:8080/ms-mcms/html/1/m/149/index.html" class="">案例</a>
+                            <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/149/index.html" class="">案例</a>
                         </li>
                         <li class="">
                             <a href="http://mstore.mingsoft.net/mstoreShow.do" class="">模板&插件</a>
                         </li>
                         <li class="">
-                            <a href="http://localhost:8080/ms-mcms/html/1/m/19/142/index.html" class="">在线留言</a>
+                            <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/19/142/index.html" class="">在线留言</a>
                         </li>
                         <li class="am-parent">
                             <a>技术支持</a>
@@ -111,7 +111,7 @@
                     <ul class="am-slides">
                         <template v-for="banner in bannerList">
                             <li>
-                                <img :src="'http://localhost:8080/ms-mcms/templets/1/default/m/images/'+banner+'.png'">
+                                <img :src="'http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/'+banner+'.png'">
                             </li>
                         </template>
                     </ul>
@@ -131,23 +131,23 @@
                         <div class="tab-content">
                             <div role="tabpanel" class="tab-pane active" id="model">
                                 <div style="display: none;" class="ms-loading" v-show="!loading">
-                                    <img src="http://localhost:8080/ms-mcms/templets/1/default/m/images/loading.gif" />
+                                    <img src="http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/loading.gif" />
                                 </div>
                                 <div class="ms-model-content" style="display: none;" v-show="loading">
                                     <template v-for="model in modelList">
                                         <div class="ms-model-list">
                                             <a class="ms-model-img" :href="model.upgraderVersionUrl" target="_blank">
-                                                <img :src="'http://mstore.mingsoft.net/'+model.upgraderVersionImg" onerror="this.src='http://localhost:8080/ms-mcms/templets/1/default/m/images/no-data.png'" />
+                                                <img :src="'http://mstore.mingsoft.net/'+model.upgraderVersionImg" onerror="this.src='http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/no-data.png'" />
                                             </a>
-                                            <div class="ms-model-mobile-img" v-if="model.upgraderVersionMobileImg != '' && model.upgraderVersionMobileImg != undefined" style="background-image: url(http://localhost:8080/ms-mcms/templets/1/default/m/images/mobile.png)">
+                                            <div class="ms-model-mobile-img" v-if="model.upgraderVersionMobileImg != '' && model.upgraderVersionMobileImg != undefined" style="background-image: url(http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/mobile.png)">
                                                 <div>
-                                                    <img :src="'http://mstore.mingsoft.net/'+model.upgraderVersionMobileImg" onerror="this.src='http://localhost:8080/ms-mcms/templets/1/default/m/images/no-data.png'" />
+                                                    <img :src="'http://mstore.mingsoft.net/'+model.upgraderVersionMobileImg" onerror="this.src='http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/no-data.png'" />
                                                 </div>
                                             </div>
                                             <div class="ms-model-info">
                                                 <span v-text="model.upgraderVersionName"></span>
                                                 <img class="ms-model-info-img" :src="model.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
-                                                <img :src="'http://localhost:8080/ms-mcms/templets/1/default/m/images/level-'+model.upgraderVersionStart+'.png'" width="60px" />
+                                                <img :src="'http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/level-'+model.upgraderVersionStart+'.png'" width="60px" />
                                                 <div class="ms-model-type">模板</div>
                                             </div>
                                         </div>
@@ -164,12 +164,12 @@
                                     <template v-for="pulg in pulgList">
                                         <div class="ms-model-list">
                                             <a class="ms-model-img" :href="pulg.upgraderVersionUrl" target="_blank">
-                                                <img :src="'http://mstore.mingsoft.net/'+pulg.upgraderVersionImg" onerror="this.src='http://localhost:8080/ms-mcms/templets/1/default/m/images/no-data.png'" />
+                                                <img :src="'http://mstore.mingsoft.net/'+pulg.upgraderVersionImg" onerror="this.src='http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/no-data.png'" />
                                             </a>
                                             <div class="ms-model-info">
                                                 <span v-text="pulg.upgraderVersionName"></span>
-                                                <img class="ms-model-info-img" :src="'http://localhost:8080/ms-mcms/'+ pulg.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
-                                                <img :src="'http://localhost:8080/ms-mcms/templets/1/default/m/images/level-'+pulg.upgraderVersionStart+'.png'"  width="60px"/>
+                                                <img class="ms-model-info-img" :src="'http://127.0.0.1:8080/ms-mcms/'+ pulg.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
+                                                <img :src="'http://127.0.0.1:8080/ms-mcms/templets/1/default/m/images/level-'+pulg.upgraderVersionStart+'.png'"  width="60px"/>
                                                 <div class="ms-model-type">插件</div>
                                             </div>
                                         </div>
@@ -191,7 +191,7 @@
                         <!--列表标题-->
                         <div class="am-list-news-hd am-cf ms-case-title">
                             <!--带更多链接-->
-                            <a href="http://localhost:8080/ms-mcms/html/1/m/149/index.html" class="">
+                            <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/149/index.html" class="">
                                 <h2 class="ms-case-title-h2">网站案例</h2>
                                 <span class="am-list-news-more am-fr ms-case-more">MORE &raquo;</span>
                             </a>
@@ -201,21 +201,21 @@
                                 <li>
                                     <div class="am-gallery-item ms-case-div-li">
                                         <a href='http://www.panchen-china.com/'>
-                                            <img class="ms-case-list-img" src="http://localhost:8080/ms-mcms/upload/1//article/1531105696938.jpg" alt="攀臣广告" />
+                                            <img class="ms-case-list-img" src="http://127.0.0.1:8080/ms-mcms/upload/1//article/1531105696938.jpg" alt="攀臣广告" />
                                         </a>
                                     </div>
                                 </li>
                                 <li>
                                     <div class="am-gallery-item ms-case-div-li">
                                         <a href='http://www.huaful.com/'>
-                                            <img class="ms-case-list-img" src="http://localhost:8080/ms-mcms/upload/1//article/1531105877049.jpg" alt="华赋科创" />
+                                            <img class="ms-case-list-img" src="http://127.0.0.1:8080/ms-mcms/upload/1//article/1531105877049.jpg" alt="华赋科创" />
                                         </a>
                                     </div>
                                 </li>
                                 <li>
                                     <div class="am-gallery-item ms-case-div-li">
                                         <a href='http://www.luolong.gov.cn/ '>
-                                            <img class="ms-case-list-img" src="http://localhost:8080/ms-mcms/upload/1//article/1531105970322.jpg" alt="洛阳洛龙" />
+                                            <img class="ms-case-list-img" src="http://127.0.0.1:8080/ms-mcms/upload/1//article/1531105970322.jpg" alt="洛阳洛龙" />
                                         </a>
                                     </div>
                                 </li>
@@ -249,7 +249,7 @@
                     <div data-am-widget="list_news" class="am-list-news am-list-news-default">
                         <div class="am-list-news-hd am-cf ms-news-title">
                             <!--带更多链接-->
-                            <a href="http://localhost:8080/ms-mcms/html/1/m/59/index.html" class="">
+                            <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/59/index.html" class="">
                                 <h2 class="ms-news-title-h2">公司动态</h2>
                                 <span class="am-list-news-more am-fr ms-news-more">MORE &raquo;</span>
                             </a>
@@ -257,27 +257,27 @@
                         <div class="am-list-news-bd ms-product-news-list">
                             <ul class="am-list">
                                 <li class="am-g am-list-item-dated ms-product-news-list-li">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/59/69\70.html" class="am-list-item-hd ">2015年 铭飞MCms获得最热门开源项目第40位</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/59/69/70.html" class="am-list-item-hd ">2015年 铭飞MCms获得最热门开源项目第40位</a>
                                     <span class="am-list-date">2028-00-01</span>
                                 </li>
                                 <li class="am-g am-list-item-dated ms-product-news-list-li">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/59/68\71.html" class="am-list-item-hd ">国内java开源 cms系统</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/59/68/71.html" class="am-list-item-hd ">国内java开源 cms系统</a>
                                     <span class="am-list-date">2028-00-01</span>
                                 </li>
                                 <li class="am-g am-list-item-dated ms-product-news-list-li">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/59/68\72.html" class="am-list-item-hd ">2016年CMS开源系统排行榜</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/59/68/72.html" class="am-list-item-hd ">2016年CMS开源系统排行榜</a>
                                     <span class="am-list-date">2028-00-01</span>
                                 </li>
                                 <li class="am-g am-list-item-dated ms-product-news-list-li">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/59/68\73.html" class="am-list-item-hd ">国内java开源商城系统</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/59/68/73.html" class="am-list-item-hd ">国内java开源商城系统</a>
                                     <span class="am-list-date">2028-00-01</span>
                                 </li>
                                 <li class="am-g am-list-item-dated ms-product-news-list-li">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/59/68\74.html" class="am-list-item-hd ">国内java开源bbs系统</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/59/68/74.html" class="am-list-item-hd ">国内java开源bbs系统</a>
                                     <span class="am-list-date">2028-00-01</span>
                                 </li>
                                 <li class="am-g am-list-item-dated ms-product-news-list-li">
-                                    <a href="http://localhost:8080/ms-mcms/html/1/m/59/70\177.html" class="am-list-item-hd ">国内开源 java cms,铭飞MCms</a>
+                                    <a href="http://127.0.0.1:8080/ms-mcms/html/1/m/59/70/177.html" class="am-list-item-hd ">国内开源 java cms,铭飞MCms</a>
                                     <span class="am-list-date">2028-00-01</span>
                                 </li>
                             </ul>
@@ -289,11 +289,11 @@
 <div class="ms-footer">
     <footer class="am-footer am-footer-default">
         <div class="am-footer-switch ms-footer-div">
-            <a id="godesktop" class="am-footer-desktop ms-footer-div-a" href="http://localhost:8080/ms-mcms/html/1/m/53/index.html">关于我们</a>
+            <a id="godesktop" class="am-footer-desktop ms-footer-div-a" href="http://127.0.0.1:8080/ms-mcms/html/1/m/53/index.html">关于我们</a>
             <span class="am-footer-divider ms-footer-div-a">|</span>
             <a id="godesktop" class="am-footer-desktop ms-footer-div-a" href="http://mingsoft.net/html/1//5527/index.html#faz">发展历程</a>
             <span class="am-footer-divider ms-footer-div-a">|</span>
-            <a id="godesktop" class="am-footer-desktop ms-footer-div-a" href="http://localhost:8080/ms-mcms/html/1/m/19/index.html">联系我们</a>
+            <a id="godesktop" class="am-footer-desktop ms-footer-div-a" href="http://127.0.0.1:8080/ms-mcms/html/1/m/19/index.html">联系我们</a>
         </div>
         <div class="am-footer-miscs ms-footer-copyright">
             <p>版权所有©铭飞科技有限公司2012-2018保留一切权利</p>

+ 0 - 1
src/main/webapp/templets/1/default/head-file.htm

@@ -1,6 +1,5 @@
 <title>{ms:global.name/}</title>
 <meta charset="utf-8">
-<link rel="icon" href="http://cdn.mingsoft.net/global/images/ms.ico" type="x-icon">
 <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
 <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
 <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/index.less">

Деякі файли не було показано, через те що забагато файлів було змінено