Skip to content
GitLab
Commit 523814b2 authored by guwd's avatar guwd
Browse files

Merge branch 'master' of /Volumes/Transcend/git/ms-mcms with conflicts.

parent 93a37919
Show whitespace changes
Inline Side-by-side
.gitignore
View file @ 523814b2
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
/.* /.*
.project .project
head-file.ftl head-file.ftl
/bin/
src/main/resources/application-dev.yml
View file @ 523814b2
spring: spring:
datasource: datasource:
url: jdbc:mysql://192.168.0.8:3316/mcms-dev-5.1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai url: jdbc:mysql://localhost:3306/mcms-dev-5.1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: mcms username: root
password: mcms password: root
filters: wall,mergeStat filters: wall,mergeStat
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
src/main/resources/application.yml
View file @ 523814b2
server: server:
port: 8080 port: 8081
servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱 servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱
logging: logging:
......
src/main/webapp/WEB-INF/manager/index.ftl
View file @ 523814b2
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<#include '/include/head-file.ftl'/> <#include '/include/head-file.ftl'/>
<script src="${base}/static/plugins/sockjs/1.4.0/sockjs.min.js"></script> <script src="${base}/static/plugins/sockjs/1.4.0/sockjs.min.js"></script>
<script src="${base}/static/plugins/stomp/2.3.3/stomp.min.js"></script> <script src="${base}/static/plugins/stomp/2.3.3/stomp.min.js"></script>
<script src="${base}/static/plugins/ms/compoents/store.umd.min.js"></script>
<style> <style>
.to-ele { .to-ele {
font-size: 18px; font-size: 18px;
...@@ -129,7 +128,10 @@ ...@@ -129,7 +128,10 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<!--mstore按钮--> <!--mstore按钮-->
<ms-store client="${client}"></ms-store> <div class="ms-admin-mstore-icon" @click="open(mstore)">
<span v-if="mstore.syncNum>0" v-text="mstore.syncNum"></span>
<i style="line-height: 42px !important;font-size: 30px;" class="iconfont icon-fenxiang2"></i>
</div>
</div> </div>
</el-header> </el-header>
...@@ -526,6 +528,13 @@ ...@@ -526,6 +528,13 @@
this.list(); this.list();
//获取登录用户信息 //获取登录用户信息
this.managerGet(); this.managerGet();
var that = this;
ms.http.get(ms.manager + "/store/sync.do").then(function (res) {
if (res.result) {
res.data.syncStoreUrl += "/#/?client=${client}";
that.mstore = res.data;
}
})
}, },
}) })
</script> </script>
......
src/main/webapp/templets/1/default/about.htm deleted 100644 → 0
View file @ 93a37919
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/about_us.jpg) no-repeat center;">
<p class="banner_tit_about animated fadeInLeft">关于我们</p>
<p class="banner_tit_about_des animated fadeInRight">About us</p>
</div>
<div class="ms-content-about">
<div class="ms-content-main">
<#include "menu-left.htm"/>
<div class="ms-content-right">
<div class="ms-content-right-position">
<a href="{ms:global.host/}">首页</a>
<span>></span>
<a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
</div>
<div class="ms-content-right-main">
<div class="ms-content-right-main-title">{ms:field.title/}</div>
<div class="ms-content-right-main-content">{ms:field.content/}</div>
</div>
</div>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
\ No newline at end of file
src/main/webapp/templets/1/default/advice.htm deleted 100644 → 0
View file @ 93a37919
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/talk_online.jpeg) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">在线留言</p>
<p class="banner_tit_other_des animated fadeInRight">Talk online</p>
</div>
<div class="ms-content-advice">
<div class="ms-content-form-background">
<form class="ms-content-form" method="post" id="postForm">
<input class="ms-content-form-name" type="text" name="name" placeholder="姓名">
<input class="ms-content-form-phone" type="text" name="phone" placeholder="手机">
<textarea class="ms-content-form-message" name="words" placeholder="留言"></textarea>
<div class="ms-login-button">提交</div>
</form>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
<script>
/* 表单提交 */
var flag = false;
$(".ms-login-button").click(function() {
if(!flag) {
$.ajax({
type: "POST",
url: "{ms:global.host/}/mdiy/post/7df6529f9eaa26da7ae4e01c7f73aa06.do",
data: $("#postForm").serialize(),
success: function(msg) {
flag = true;
alert("提交成功");
location.reload();
}
});
} else {
alert("您已经提交过了！");
}
})
/* 表单验证 */
function verification() {
if($('input[name="name"]').val().length > 0 && $('input[name="phone"]').val().length > 0 && $('.ms-content-form-message').val().length > 0) {
$('.ms-login-button').css("background-color", "#009aff");
$('.ms-login-button').css("pointer-events", 'visible');
$('.ms-login-button').css("color", "#fff");
} else {
$('.ms-login-button').css("background-color", "#fafafa");
$('.ms-login-button').css('pointer-events', "none");
$('.ms-login-button').css("color", "#ddd");
}
}
$('input[name="name"]').keyup(function() {
verification();
})
$('input[name="phone"]').keyup(function() {
verification();
})
$('.ms-content-form-message').keyup(function() {
verification();
})
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/case-list.htm deleted 100644 → 0
View file @ 93a37919
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/00.png) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft">案&nbsp;&nbsp;&nbsp;例</p>
<p class="banner_tit_other_des animated fadeInRight">Case list</p>
</div>
<div class="ms-content-case">
<div class="ms-content-main">
{ms:arclist size=6 ispaging=true}
<div class="ms-content-main-case">
<div class="ms-content-main-case-img">
<img src="{ms:global.host/}[field.litpic/]">
</div>
<div class="ms-content-main-case-explain">
<div class="ms-content-main-case-title">[field.title/]</div>
<div class="ms-content-main-case-content">
<p class="ms-content-main-case-written">
[field.content/]
</p>
<!-- <p class="ms-content-main-case-QRcode">
<img src="./images/1471918025445.png">
</p> -->
</div>
<div class="ms-content-main-case-click">
<a target="_blank" href="[field.source/]">点击查看</a>
</div>
</div>
</div>
{/ms:arclist}
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
<script type="text/javascript">
$(function() {
$('.ms-content-main-case').hover(function() {
$(this).find('.ms-content-main-case-explain').toggle();
});
});
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/contact.htm deleted 100644 → 0
View file @ 93a37919
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm"/>
</head>
<body>
<#include "head.htm"/>
<div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/contact_us.jpeg) no-repeat center;">
<p class="banner_tit_other animated fadeInLeft" >联系我们</p>
<p class="banner_tit_other_des animated fadeInRight">Contact us</p>
</div>
<div class="ms-content-about">
<div class="ms-content-main">
<#include "menu-left.htm"/>
<div class="ms-content-right">
<div class="ms-content-right-position">
<a href="{ms:global.host/}">首页</a>
<span>></span>
<a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
</div>
<div class="ms-content-right-main">
<div class="ms-content-right-main-title">联系我们</div>
<div class="ms-content-right-main-content"><!-- {ms:field.content/} -->
<style type="text/css">
.BMap_Marker img{
width: 100%;
height: 100%;
}
html,body{margin:0;padding:0;}
.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
</style>
<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
<body>
<!--百度地图容器-->
<div style="width:100%;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
</body>
<script type="text/javascript">
//创建和初始化地图函数：
function initMap(){
createMap();//创建地图
setMapEvent();//设置地图事件
addMapControl();//向地图添加控件
addMarker();//向地图中添加marker
}
//创建地图函数：
function createMap(){
var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
var point = new BMap.Point(116.737158,29.153633);//定义一个中心点坐标
map.centerAndZoom(point,9);//设定地图的中心点和坐标并将地图显示在地图容器中
window.map = map;//将map变量存储在全局
}
//地图事件设置函数：
function setMapEvent(){
map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
map.enableScrollWheelZoom();//启用地图滚轮放大缩小
map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
map.enableKeyboard();//启用键盘上下左右键移动地图
}
//地图控件添加函数：
function addMapControl(){
//向地图中添加缩放控件
var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
map.addControl(ctrl_nav);
//向地图中添加缩略图控件
var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
map.addControl(ctrl_ove);
//向地图中添加比例尺控件
var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
map.addControl(ctrl_sca);
}
//标注点数组
var markerArr = [{title:"铭飞科技(景德镇)有限公司",content:"江西省景德镇市昌江区&nbsp;枫林佳苑&nbsp;15栋A区&nbsp;三单元&nbsp;302室",point:"117.187869|29.282949",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
,{title:"铭飞科技(南昌)办事处",content:"江西省南昌市青山湖区创新一路&nbsp;绿地新都会(西门)&nbsp;12栋2单元901室",point:"116.003117|28.683521",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
];
//创建marker
function addMarker(){
for(var i=0;i<markerArr.length;i++){
var json = markerArr[i];
var p0 = json.point.split("|")[0];
var p1 = json.point.split("|")[1];
var point = new BMap.Point(p0,p1);
var iconImg = createIcon(json.icon);
var marker = new BMap.Marker(point,{icon:iconImg});
var iw = createInfoWindow(i);
var label = new BMap.Label(json.title,{"offset":new BMap.Size(json.icon.lb-json.icon.x+10,-20)});
marker.setLabel(label);
map.addOverlay(marker);
label.setStyle({
borderColor:"#808080",
color:"#333",
cursor:"pointer"
});
(function(){
var index = i;
var _iw = createInfoWindow(i);
var _marker = marker;
_marker.addEventListener("click",function(){
this.openInfoWindow(_iw);
});
_iw.addEventListener("open",function(){
_marker.getLabel().hide();
})
_iw.addEventListener("close",function(){
_marker.getLabel().show();
})
label.addEventListener("click",function(){
_marker.openInfoWindow(_iw);
})
if(!!json.isOpen){
label.hide();
_marker.openInfoWindow(_iw);
}
})()
}
}
//创建InfoWindow
function createInfoWindow(i){
var json = markerArr[i];
var iw = new BMap.InfoWindow("<b class='iw_poi_title' title='" + json.title + "'>" + json.title + "</b><div class='iw_poi_content'>"+json.content+"</div>");
return iw;
}
//创建一个Icon
function createIcon(json){
var icon = new BMap.Icon("{ms:global.host/}/{ms:global.style/}/images/img-2.png", new BMap.Size(json.w,json.h),{imageOffset: new BMap.Size(-json.l,-json.t),infoWindowOffset:new BMap.Size(json.lb+5,1),offset:new BMap.Size(json.x,json.h)})
return icon;
}
initMap();//创建和初始化地图
</script>
</div>
</div>
</div>
</div>
</div>
<#include "footer.htm"/>
</body>
</html>
\ No newline at end of file
src/main/webapp/templets/1/default/footer.htm deleted 100644 → 0
View file @ 93a37919
<div class="ms-footer">
<div class="ms-footer-content">
<div class="ms-footer-left">
<div class="ms-footer-left-column">
<span class="ms-footer-left-column-about">
<a href='{ms:global.url/}/guanyuwomen53/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>
</span>|
<span class="ms-footer-left-column-contact">
<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>联系我们</a>
</span>
</div>
<span class="ms-footer-left-copyright">版权所有&copy;铭飞科技有限公司2012-2018保留一切权利</span>
</div>
<div class="ms-footer-right">
<img class='ms-footer-right-img-weixin' src="{ms:global.host/}/{ms:global.style/}/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="{ms:global.host/}/{ms:global.style/}/images/baidu.png"></a>
<a target="_blank" href='http://weibo.com/killfen'><img src="{ms:global.host/}/{ms:global.style/}/images/micro-blog.png"></a>
<div class="ms-footer-right-weixin">
<p></p>
<img alt="" src="{ms:global.host/}/{ms:global.style/}/images/weixin.jpg">
</div>
</div>
</div>
</div>
<script>
/*导航下拉*/
$(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();
});
});
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/head-file.htm deleted 100644 → 0
View file @ 93a37919
<title>{ms:global.name/}</title>
<meta charset="utf-8">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/base.css">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/index.css">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/advice.css">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/case-list.css">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/about.css">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/news-list.css">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/news-show.css">
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/center.css">
<script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
<script src="{ms:global.host/}/{ms:global.style/}/js/slider.js"></script>
<script src="{ms:global.host/}/static/plugins/less/3.9.0/less.min.js"></script>
<!--vue-懒加载-表单验证-->
<script src="{ms:global.host/}/plugins/vue/2.6.9/vue.min.js"></script>
<script src="{ms:global.host/}/plugins/validator/10.8.0/validator.min.js"></script>
<!-- Element -->
<link rel="stylesheet" href="{ms:global.host/}/plugins/element-ui/2.8.2/index.css">
<script src="{ms:global.host/}/plugins/element-ui/2.8.2/index.js"></script>
<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/animate.css">
<script src="{ms:global.host/}/static/plugins/axios/0.18.0/axios.min.js"></script>
<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.js"></script>
<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.http.js"></script>
<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.util.js"></script>
<script src="{ms:global.host/}/api/ms.people.min.js"></script>
<script src="{ms:global.host/}/static/plugins/plupload/plupload.full.min.js"></script>
<script src="{ms:global.host/}/static/plugins/qs/6.6.0/qs.min.js"></script>
<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.upload.js"></script>
<script>
window.http = ms.http;
ms.base = "{ms:global.host/}";
ms.login = '{ms:global.host/}';
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/head.htm deleted 100644 → 0
View file @ 93a37919
<div class="ms-head">
<div class="head-menu">
<div class="head-men-left head-menu-flex-center">
<a href="{ms:global.host/}/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='{ms:global.url/}/guanyuwomen53/index.html'>关于我们</a>
</li>
<li>
<a target="_blank" href='{ms:global.url/}/xinwenzhongxin/index.html'>公司动态</a>
</li>
<li>
<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
</li>
<li>
<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>加入我们</a>
</li>
<li>
<a target="_blank" href='{ms:global.url/}/lianxiwomen19/index.html'>联系我们</a>
</li>
</ul>
</li>
<li class="head-menu-list-li">
<a href='{ms:global.url/}/wangzhananli/index.html'>案例</a>
</li>
<li class="head-menu-list-li">
<a target="_blank" href='http://store.mingsoft.net/mstore/index.do'>插件&模板</a>
<!-- <ul class="head-menu-son-list">
<li><a href='http://mstore.mingsoft.net/mstoreShow.do'>模板</a></li>
<li><a href='http://mstore.mingsoft.net/mstoreShow.do'>插件</a></li>
</ul> -->
</li>
<li class="head-menu-list-li">
<a target="_blank" href='{ms:global.url/}/lianxiwomen19/zaixianliuyan/index.html'>在线留言</a>
</li>
<li class="head-menu-list-li">技术支持
<ul class="head-menu-son-list">
<li>
<a target="_blank" href='http://bbs.mingsoft.net/mbbs/main.do'>开源社区</a>
</li>
<li>
<a target="_blank" href='https://gitee.com/mingSoft/MCMS'>源码下载</a>
</li>
<li>
<a target="_blank" href='http://doc.ms.mingsoft.net/plugs-cms/'>使用手册</a>
</li>
</ul>
</li>
</ul>
</div>
<div class="head-men-right head-menu-flex-center">
<div class="head-menu-flex-center head-menu-right-search">
<form id="searchDataForm" action="{ms:global.host/}/mcms/search.do" method="post">
<input type="text" class='ms-search-input' name="content_title" placeholder="请输入关键字">
<!-- <i class="iconfont ms-search-click">&#xe85e;</i> -->
<input type="submit" value="" class="ms-search-click">
</form>
</div>
<div class="head-menu-right-content" id="ms-login-vue">
<span v-show="!isLogin" style="display: none;">
<span>
<a href='{ms:global.host/}/mdiyPage/login.do'>登录</a>
</span>|<span><a href='{ms:global.host/}/mdiyPage/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="{ms:global.host/}/people/center.do">
<img :src="'{ms:global.host/}/'+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>
</div>
</div>
</div>
</div>
</div>
<script>
var headVue = new Vue({
el: "#ms-login-vue",
data: {
isLogin: "", //登录状态
peopleInfo: "", //个人信息
imgUrl:"",
},
mounted: function() {
//获取个人信息
var target = this;
$.ajax({
type: "POST",
url: "{ms:global.host/}/checkLoginStatus.do",
success: function(msg) {
target.isLogin = msg.result; //判断用户是否登录，如登录，则target.isLogin===true
if(msg.result) {
$.ajax({
type: "GET",
url: "{ms:global.host/}/people/user/info.do",
success: function(msg) {
target.peopleInfo = msg; //target.peopleInfo为当前登录用户的基本信息
}
})
}
}
})
},
methods: {
//退出登录
quitLogin: function() {
var target = this;
$.ajax({
type: "GET",
url: "{ms:global.host/}/people/quit.do",
success: function(msg) {
if(msg.result) {
$("body").append("<form id='msHeadForm' action=''></form>");
$("#msHeadForm").attr("action", "{ms:global.host/}").submit();
}
}
})
},
},
})
/* $(function(){
var r=location.href;
if(r.match("53")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(0).addClass("head-active");
}else if(r.match("141")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(0).addClass("head-active");
}else if(r.match("59")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(0).addClass("head-active");
}else if(r.match("155")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(1).addClass("head-active");
}else if(r.match("142")){
$(".head-menu-list-li").removeClass("head-active");
$(".head-menu-list-li").eq(3).addClass("head-active");
}
}) */
</script>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment