Skip to content
GitLab
Commit af868d14 authored by wangwenbing's avatar wangwenbing
Browse files

Revert "微信修改" 

This reverts commit 0871b95a
parent 0871b95a
Expand all Hide whitespace changes
Inline Side-by-side
mcms.iml deleted 100644 → 0
View file @ 0871b95a
This diff is collapsed.
pom.xml
View file @ af868d14
......@@ -59,49 +59,8 @@
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-upgrader</artifactId>
<version>1.0.9</version>
</dependency>
<!--支付插件-->
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mpay</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mweixin</artifactId>
<version>1.0.8</version>
</dependency>
<!-- 微信公众号第三方插件 -->
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-mp</artifactId>
<version>3.3.0</version>
</dependency>
<!-- 微信公众号公共包第三方插件 -->
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-common</artifactId>
<version>3.3.0</version>
</dependency>
<!-- 微信公众号支付第三方插件 -->
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>
<version>3.3.0</version>
</dependency>
<!-- ms-msend发送模块源码 -->
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-msend</artifactId>
<version>1.0.5</version>
</dependency>
<!--评论插件依赖-->
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mcomment</artifactId>
<version>1.0.1</version>
</dependency>
</dependencies>
<build>
<finalName>ms-mcms</finalName>
......
src/main/java/net/mingsoft/cms/action/BaseAction.java deleted 100644 → 0
View file @ 0871b95a
package net.mingsoft.cms.action;
import java.util.MissingResourceException;
/**
* @Author: 铭飞开源团队--huise
* @Date: 2019/8/9 20:47
*/
public class BaseAction extends net.mingsoft.mdiy.action.BaseAction{
@Override
protected String getResString(String key) {
// TODO Auto-generated method stub
String str = "";
try {
str = super.getResString(key);
} catch (MissingResourceException e) {
str = net.mingsoft.cms.constant.Const.RESOURCES.getString(key);
}
return str;
}
}
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
View file @ af868d14
......@@ -98,7 +98,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
* @param key
*/
@RequestMapping("/{diy}.do")
@ExceptionHandler(NullPointerException.class)
@ExceptionHandler(java.lang.NullPointerException.class)
public void diy(@PathVariable(value = "diy") String diy, HttpServletRequest req, HttpServletResponse resp) {
Map map = BasicUtil.assemblyRequestMap();
map.put(ParserUtil.URL, BasicUtil.getUrl());
......
src/main/java/net/mingsoft/cms/biz/IArticleBiz.java
View file @ af868d14
......@@ -137,7 +137,7 @@ public interface IArticleBiz extends IBasicBiz {
* @return 文章集合
*/
List<ArticleEntity> query(int webId, int[] basicCategoryIds, String flag, String noFlag, String orderBy,
boolean order, String beginTime, String endTime, ArticleEntity article);
boolean order, String beginTime,String endTime, ArticleEntity article);
/**
* 查询文章编号集合
......@@ -146,7 +146,7 @@ public interface IArticleBiz extends IBasicBiz {
* @param endTime 结束时间
* @return
*/
public List<ColumnArticleIdBean> queryIdsByCategoryIdForParser(int categoryId, String beginTime, String endTime);
public List<ColumnArticleIdBean> queryIdsByCategoryIdForParser(int categoryId, String beginTime,String endTime);
/**
* 查询文章编号集合
* @param categoryId 栏目编号
......@@ -156,7 +156,7 @@ public interface IArticleBiz extends IBasicBiz {
* @param order 排序方式
* @return
*/
public List<ColumnArticleIdBean> queryIdsByCategoryIdForParser(int categoryId, String beginTime, String endTime, String orderBy, String order);
public List<ColumnArticleIdBean> queryIdsByCategoryIdForParser(int categoryId, String beginTime,String endTime,String orderBy,String order);
/**
* 根据页面栏目的id获取与其绑定的文章实体
*
......@@ -186,6 +186,6 @@ public interface IArticleBiz extends IBasicBiz {
*/
@Deprecated
public List<ArticleEntity> queryListForSearch(ContentModelEntity conntentModel, Map whereMap,
int appId, List ids, Map orders);
int appId, List ids, Map orders);
}
\ No newline at end of file
src/main/java/net/mingsoft/cms/constant/Const.java deleted 100644 → 0
View file @ 0871b95a
package net.mingsoft.cms.constant;
import java.util.ResourceBundle;
/**
* @Author: 铭飞开源团队--huise
* @Date: 2019/8/9 20:51
*/
public class Const {
/**
* 资源文件
*/
public final static ResourceBundle RESOURCES = ResourceBundle.getBundle("net.mingsoft.cms.resources.resources");
}
src/main/java/net/mingsoft/cms/dao/IArticleDao.java
View file @ af868d14
......@@ -57,7 +57,7 @@ public interface IArticleDao extends IBaseDao {
*/
@Deprecated
int count(@Param("webId") int webId, @Param("basicCategoryIds") int[] basicCategoryIds, @Param("flag") String flag,
@Param("noFlag") String noFlag, @Param("article") ArticleEntity article);
@Param("noFlag") String noFlag, @Param("article") ArticleEntity article);
/**
* 通过分类id获取文章内容
......@@ -91,7 +91,7 @@ public interface IArticleDao extends IBaseDao {
* @return
*/
ArticleEntity getNextOrPrevious(@Param("appId") int appId, @Param("basicId") int basicId,
@Param("flag") boolean flag, @Param("categoryId") Integer categoryId);
@Param("flag") boolean flag, @Param("categoryId") Integer categoryId);
/**
* 根据查询文章实体总数
......@@ -104,7 +104,7 @@ public interface IArticleDao extends IBaseDao {
* @return 文章实体总数
*/
int getSearchCount(@Param("tableName") String tableName, @Param("map") Map<String, List> map,
@Param("websiteId") int websiteId, @Param("ids") String ids);
@Param("websiteId") int websiteId, @Param("ids") String ids);
/**
* 文章查询
......@@ -127,9 +127,9 @@ public interface IArticleDao extends IBaseDao {
* @return 文章集合
*/
List<ArticleEntity> query(@Param("webId") int webId, @Param("basicCategoryIds") int[] basicCategoryIds,
@Param("flag") String flag, @Param("noFlag") String noFlag, @Param("orderBy") String orderBy,
@Param("order") boolean order, @Param("beginTime") String beginTime, @Param("endTime") String endTime,
@Param("article") ArticleEntity article);
@Param("flag") String flag, @Param("noFlag") String noFlag, @Param("orderBy") String orderBy,
@Param("order") boolean order, @Param("beginTime") String beginTime,@Param("endTime") String endTime,
@Param("article") ArticleEntity article);
/**
* 根据页面栏目的id获取与其绑定的文章实体
......@@ -152,8 +152,8 @@ public interface IArticleDao extends IBaseDao {
*/
@Deprecated
List<ArticleEntity> queryListForSearch(@Param("tableName") String tableName, @Param("map") Map<String, List> map,
@Param("websiteId") int websiteId, @Param("ids") List ids,
@Param("sortMap") Map sortMap);
@Param("websiteId") int websiteId, @Param("ids") List ids,
@Param("sortMap") Map sortMap);
/**
* 查询文章编号集合
......@@ -163,7 +163,7 @@ public interface IArticleDao extends IBaseDao {
* @param endTime 结束时间
* @return
*/
public List<ColumnArticleIdBean> queryIdsByCategoryIdForParser(@Param("categoryId") int categoryId, @Param("appId") int appId, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderBy") String orderBy, @Param("order") String order);
public List<ColumnArticleIdBean> queryIdsByCategoryIdForParser(@Param("categoryId")int categoryId,@Param("appId")int appId , @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("orderBy")String orderBy,@Param("order")String order);
}
\ No newline at end of file
src/main/java/net/mingsoft/config/FreemarkerConfig.java
View file @ af868d14
......@@ -19,7 +19,7 @@ public class FreemarkerConfig {
@Autowired
protected freemarker.template.Configuration configuration;
@Autowired
protected FreeMarkerConfigurer configurer;
protected org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer configurer;
@Autowired
protected org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver resolver;
@Autowired
......
src/main/resources/application-dev.yml
View file @ af868d14
spring:
datasource:
url: jdbc:mysql://192.168.123.183:3306/db-mcms?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=
username: mcms
password: mcms
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
\ No newline at end of file
type: com.alibaba.druid.pool.DruidDataSource
src/main/webapp/html/1/index.html deleted 100644 → 0
View file @ 0871b95a
This diff is collapsed.
src/main/webapp/html/1/m/index.html deleted 100644 → 0
View file @ 0871b95a
This diff is collapsed.
src/main/webapp/static/plugins/vue-quill-editor/quill.min.js deleted 100644 → 0
View file @ 0871b95a
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/static/plugins/vue-quill-editor/vue-quill-editor.js deleted 100644 → 0
View file @ 0871b95a
! function (t, e) {
"object" == typeof exports && "object" == typeof module ? module.exports = e(require("quill")) : "function" == typeof define && define.amd ? define(["quill"], e) : "object" == typeof exports ? exports.VueQuillEditor = e(require("quill")) : t.VueQuillEditor = e(t.Quill)
}(this, function (t) {
return function (t) {
function e(i) {
if (n[i]) return n[i].exports;
var l = n[i] = {
i: i,
l: !1,
exports: {}
};
return t[i].call(l.exports, l, l.exports, e), l.l = !0, l.exports
}
var n = {};
return e.m = t, e.c = n, e.i = function (t) {
return t
}, e.d = function (t, n, i) {
e.o(t, n) || Object.defineProperty(t, n, {
configurable: !1,
enumerable: !0,
get: i
})
}, e.n = function (t) {
var n = t && t.__esModule ? function () {
return t.default
} : function () {
return t
};
return e.d(n, "a", n), n
}, e.o = function (t, e) {
return Object.prototype.hasOwnProperty.call(t, e)
}, e.p = "/", e(e.s = 2)
}([function (e, n) {
e.exports = t
}, function (t, e, n) {
"use strict";
Object.defineProperty(e, "__esModule", {
value: !0
});
var i = n(4),
l = n.n(i),
o = n(6),
r = n(5),
u = r(l.a, o.a, !1, null, null, null);
e.default = u.exports
}, function (t, e, n) {
"use strict";
function i(t) {
return t && t.__esModule ? t : {
default: t
}
}
Object.defineProperty(e, "__esModule", {
value: !0
}), e.install = e.quillEditor = e.Quill = void 0;
var l = n(0),
o = i(l),
r = n(1),
u = i(r),
s = window.Quill || o.default,
a = function (t, e) {
e && (u.default.props.globalOptions.default = function () {
return e
}), t.component(u.default.name, u.default)
},
c = {
Quill: s,
quillEditor: u.default,
install: a
};
e.default = c, e.Quill = s, e.quillEditor = u.default, e.install = a
}, function (t, e, n) {
"use strict";
Object.defineProperty(e, "__esModule", {
value: !0
}), e.default = {
theme: "snow",
boundary: document.body,
modules: {
toolbar: [
["bold", "italic", "underline", "strike"],
["blockquote", "code-block"],
[{
header: 1
}, {
header: 2
}],
[{
list: "ordered"
}, {
list: "bullet"
}],
[{
script: "sub"
}, {
script: "super"
}],
[{
indent: "-1"
}, {
indent: "+1"
}],
[{
direction: "rtl"
}],
[{
size: ["small", !1, "large", "huge"]
}],
[{
header: [1, 2, 3, 4, 5, 6, !1]
}],
[{
color: []
}, {
background: []
}],
[{
font: []
}],
[{
align: []
}],
["clean"],
["link", "image", "video"]
]
},
placeholder: "Insert text here ...",
readOnly: !1
}
}, function (t, e, n) {
"use strict";
function i(t) {
return t && t.__esModule ? t : {
default: t
}
}
Object.defineProperty(e, "__esModule", {
value: !0
});
var l = n(0),
o = i(l),
r = n(3),
u = i(r),
s = window.Quill || o.default;
"function" != typeof Object.assign && Object.defineProperty(Object, "assign", {
value: function (t, e) {
if (null == t) throw new TypeError("Cannot convert undefined or null to object");
for (var n = Object(t), i = 1; i < arguments.length; i++) {
var l = arguments[i];
if (null != l)
for (var o in l) Object.prototype.hasOwnProperty.call(l, o) && (n[o] = l[o])
}
return n
},
writable: !0,
configurable: !0
}), e.default = {
name: "quill-editor",
data: function () {
return {
_options: {},
_content: "",
defaultOptions: u.default
}
},
props: {
content: String,
value: String,
disabled: {
type: Boolean,
default: !1
},
options: {
type: Object,
required: !1,
default: function () {
return {}
}
},
globalOptions: {
type: Object,
required: !1,
default: function () {
return {}
}
}
},
mounted: function () {
this.initialize()
},
beforeDestroy: function () {
this.quill = null, delete this.quill
},
methods: {
initialize: function () {
var t = this;
this.$el && (this._options = Object.assign({}, this.defaultOptions, this.globalOptions, this.options), this.quill = new s(this.$refs.editor, this._options), this.quill.enable(!1), (this.value || this.content) && this.quill.pasteHTML(this.value || this.content), this.disabled || this.quill.enable(!0), this.quill.on("selection-change", function (e) {
e ? t.$emit("focus", t.quill) : t.$emit("blur", t.quill)
}), this.quill.on("text-change", function (e, n, i) {
var l = t.$refs.editor.children[0].innerHTML,
o = t.quill,
r = t.quill.getText();
"<p><br></p>" === l && (l = ""), t._content = l, t.$emit("input", t._content), t.$emit("change", {
html: l,
text: r,
quill: o
})
}), this.$emit("ready", this.quill))
}
},
watch: {
content: function (t, e) {
this.quill && (t && t !== this._content ? (this._content = t, this.quill.pasteHTML(t)) : t || this.quill.setText(""))
},
value: function (t, e) {
this.quill && (t && t !== this._content ? (this._content = t, this.quill.pasteHTML(t)) : t || this.quill.setText(""))
},
disabled: function (t, e) {
this.quill && this.quill.enable(!t)
}
}
}
}, function (t, e) {
t.exports = function (t, e, n, i, l, o) {
var r, u = t = t || {},
s = typeof t.default;
"object" !== s && "function" !== s || (r = t, u = t.default);
var a = "function" == typeof u ? u.options : u;
e && (a.render = e.render, a.staticRenderFns = e.staticRenderFns, a._compiled = !0), n && (a.functional = !0), l && (a._scopeId = l);
var c;
if (o ? (c = function (t) {
t = t || this.$vnode && this.$vnode.ssrContext || this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext, t || "undefined" == typeof __VUE_SSR_CONTEXT__ || (t = __VUE_SSR_CONTEXT__), i && i.call(this, t), t && t._registeredComponents && t._registeredComponents.add(o)
}, a._ssrRegister = c) : i && (c = i), c) {
var d = a.functional,
f = d ? a.render : a.beforeCreate;
d ? (a._injectStyles = c, a.render = function (t, e) {
return c.call(e), f(t, e)
}) : a.beforeCreate = f ? [].concat(f, c) : [c]
}
return {
esModule: r,
exports: u,
options: a
}
}
}, function (t, e, n) {
"use strict";
var i = function () {
var t = this,
e = t.$createElement,
n = t._self._c || e;
return n("div", {
staticClass: "quill-editor"
}, [t._t("toolbar"), t._v(" "), n("div", {
ref: "editor"
})], 2)
},
l = [],
o = {
render: i,
staticRenderFns: l
};
e.a = o
}])
});
\ No newline at end of file
src/main/webapp/templets/1/default/about.htm deleted 100644 → 0
View file @ 0871b95a
<!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 @ 0871b95a
<!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="content" 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/diyForm/f2c131968438246e885e0feed7256dbc.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
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