diff --git a/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl b/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl
deleted file mode 100644
index 63f5ebce..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl
+++ /dev/null
@@ -1,231 +0,0 @@
-<@ms.html5>
- <@ms.nav title="文章管理" back=true>
- <#if article.basicId == 0>
- <@ms.saveButton id="saveUpdate" value="保存"/>
- <#else>
- <@ms.updateButton id="saveUpdate" value="更新"/>
- #if>
- @ms.nav>
- <@ms.panel>
- <@ms.form isvalidation=true name="articleForm" action="${managerPath}/cms/article/${action}.do">
- <@ms.text name="basicTitle" colSm="2" width="400" label="文章标题" title="文章标题" size="5" placeholder="请输入文章标题" value="${article.basicTitle?default('')}" validation={"maxlength":"300","required":"true", "data-bv-notempty-message":"文章标题不能为空","data-bv-stringlength-message":"标题在300个字符以内!", "data-bv-notempty-message":"必填项目"}/>
- <@ms.text name="basicSort" colSm="2" width="200" label="自定义顺序" title="自定义顺序" size="5" placeholder="请输入文章顺序" value="${article.basicSort?c?default(0)}" validation={"data-bv-between":"true","required":"true", "data-bv-between-message":"自定义顺序必须大于0","data-bv-between-min":"0", "data-bv-between-max":"99999999","data-bv-notempty-message":"自定义顺序不能为空"}/>
- <#if articleType?has_content>
- <@ms.checkboxlist colSm="2" name="checkbox" label="文章属性" list=articleType listKey="dictValue" listValue="dictLabel" />
- #if>
- <@ms.radio name="basicDisplay"
- list=[{"id":"0","value":"是"},{"id":"1","value":"否"}] value="${article.basicDisplay?c?default()}"
- listKey="id" listValue="value" label="是否显示" help="选择否后前端将不显示,需要重新生成才有效果"
- />
- <@ms.formRow colSm="2" label="文章缩略图" width="400" >
- <@ms.uploadImg path="article" uploadFloderPath="${articleImagesUrl?default('')}" inputName="basicThumbnails" size="1" msg="提示:文章缩略图,支持jpg格式" imgs="${article.basicThumbnails?default('')}" />
- @ms.formRow>
- <@ms.text name="articleSource" colSm="2" width="200" label="文章来源" title="文章来源" size="5" placeholder="请输入文章来源" value="${article.articleSource?default('')}" validation={"maxlength":"300", "data-bv-stringlength-message":"文章来源在300个字符以内!"} />
- <@ms.text name="articleAuthor" colSm="2" width="200" label="文章作者" title="文章作者" size="5" placeholder="请输入文章作者" value="${article.articleAuthor?default('')}" validation={"maxlength":"12", "data-bv-stringlength-message":"文章作者在12个字符以内!"} />
- <#if !isEditCategory>
- <@ms.formRow colSm="2" label="所属栏目" width="300">
- <#if categoryTitle=="">
- <@ms.treeInput treeId="inputTree" json="${listColumn?default('')}" jsonId="categoryId" jsonPid="categoryCategoryId" jsonName="categoryTitle" inputName="basicCategoryId" inputValue="${categoryId}" buttonText="选择栏目" clickZtreeId="clickZtreeId(event,treeId,treeNode);" expandAll="true" showIcon="true"/>
- <#else>
- <@ms.treeInput treeId="inputTree" json="${listColumn?default('')}" jsonId="categoryId" jsonPid="categoryCategoryId" jsonName="categoryTitle" inputName="basicCategoryId" inputValue="${categoryId}" buttonText="${(categoryTitle)!}" clickZtreeId="clickZtreeId(event,treeId,treeNode);" expandAll="true" showIcon="true"/>
- #if>
- @ms.formRow>
- #if>
- <@ms.hidden id="basicDateTime" name="basicDateTime" value=""/>
- <@ms.date id="articleDateTime" name="articleDateTime" time=true label="发布时间" single=true readonly="readonly" width="300" value="${(article.basicDateTime?default(.now))?string('yyyy-MM-dd HH:mm')}" validation={"required":"true", "data-bv-notempty-message":"必填项目"} placeholder="点击该框选择时间段" />
- <@ms.textarea colSm="2" name="basicDescription" label="描述" wrap="Soft" rows="4" size="" value="${article.basicDescription?default('')}" placeholder="请输入对该文章的简短描述,以便用户查看文章简略" validation={"maxlength":"400","data-bv-stringlength-message":"文章描述在400个字符以内!"}/>
- <@ms.textarea colSm="2" name="articleKeyword" label="关键字" wrap="Soft" rows="4" size="" placeholder="请输入文章关键字" value="${article.articleKeyword?default('')}" validation={"maxlength":"155", "data-bv-stringlength-message":"文章作者在155个字符以内!"}/>
-
-
-
- <@ms.hidden name="articleTypeJson" />
- <@ms.editor colSm="2" name="articleContent" label="文章内容" content="${article.articleContent?default('')}" appId="${appId?default(0)}"/>
- <@ms.hidden name="modelId" value="${Session.model_id_session?default('0')}" />
- @ms.form>
- @ms.panel>
-@ms.html5>
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/article/article_main.ftl b/src/main/webapp/WEB-INF/manager/cms/article/article_main.ftl
deleted file mode 100644
index ab8dd801..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/article/article_main.ftl
+++ /dev/null
@@ -1,163 +0,0 @@
-<@ms.html5>
- <@ms.nav title="文章列表">@ms.nav>
- <@ms.searchForm name="searchForm" action="">
- <#if articleTypeList?has_content>
- <@ms.select label="文章属性" default="全部" value="a" name="articleType" id="forumSelect" list=articleTypeList listValue="dictLabel" listKey="dictValue" value="${articleType?default('')}"/>
- <#else>
- <@ms.select label="文章属性" name="articleType" id="forumSelect" value="" list=["默认属性"] />
- #if>
- <@ms.text label="文章标题" name="basicTitle" value="" title="请输入文章标题" placeholder="请输入文章标题" />
- <@ms.searchFormButton>
- <@ms.queryButton id="submitSearch" />
- @ms.searchFormButton>
- @ms.searchForm>
-
- <@ms.panelNavBtnGroup>
- <@shiro.hasPermission name="article:save"><@ms.panelNavBtnAdd title=""/>@shiro.hasPermission>
- <@shiro.hasPermission name="article:del"><@ms.panelNavBtnDel title=""/>@shiro.hasPermission>
- @ms.panelNavBtnGroup>
-
- <@ms.panel>
-
- @ms.panel>
-@ms.html5>
-
-<@ms.modal modalName="delete" title="删除文章">
- <@ms.modalBody>
- 确定要删除所选的文章吗?
- @ms.modalBody>
- <@ms.modalButton>
- <@ms.button class="btn btn-danger rightDelete" value="确定"/>
- @ms.modalButton>
-@ms.modal>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/manager/cms/article/index.ftl b/src/main/webapp/WEB-INF/manager/cms/article/index.ftl
deleted file mode 100644
index 5158ca3e..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/article/index.ftl
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-<#include "/include/macro.ftl"/>
-<#include "/include/meta.ftl"/>
-
-
-<@ms.content>
- <@ms.contentMenu>
-
- <#if listColumn?has_content>
- <@ms.tree treeId="inputTree" json="${listColumn?default('')}" addNodesName="全部" jsonId="categoryId" jsonPid="categoryCategoryId" jsonName="categoryTitle" showIcon="true" expandAll="true" getZtreeId="getZtreeId(event,treeId,treeNode);" />
- <#else>
- <@ms.nodata content="暂无栏目"/>
- #if>
-
- @ms.contentMenu>
- <@ms.contentBody width="85%" style="overflow-y: hidden;">
- <@ms.contentPanel style="margin:0;padding:0;overflow-y: hidden;">
-
- @ms.contentPanel>
- @ms.contentBody>
-@ms.content>
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/column/shiro-button.ftl b/src/main/webapp/WEB-INF/manager/cms/column/shiro-button.ftl
deleted file mode 100644
index 118fbc08..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/column/shiro-button.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-<@shiro.hasPermission name="cms:column:save"><@ms.addButton id="addColumnBtn"/>@shiro.hasPermission>
-<@shiro.hasPermission name="cms:column:del"><@ms.delButton id="delColumnBtn"/>@shiro.hasPermission>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/column/shiro-update.ftl b/src/main/webapp/WEB-INF/manager/cms/column/shiro-update.ftl
deleted file mode 100644
index e51e0179..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/column/shiro-update.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-<@shiro.hasPermission name="cms:column:update">
-var url = "${managerPath}/${model?default("")}/column/"+row.categoryId+"/edit.do?modelId=${Session.model_id_session?default(0)}&modelTitle=${Session.model_title_session?default('')}";
-return "" + value + "";
-@shiro.hasPermission>
-<@shiro.lacksPermission name="cms:column:update">
-return value;
-@shiro.lacksPermission>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
deleted file mode 100644
index d99d0f50..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
+++ /dev/null
@@ -1,161 +0,0 @@
-<@ms.html5>
- <@ms.nav title="静态化">@ms.nav>
- <@ms.panel>
-
-
-
- 更新主页,如果系统存在引导页面可以手动修改主页位置文件名,default.html引导页面index.html主页。
-
-
-
- 更新栏目列表,推荐使用指定栏目更新。系统提示“更新中...”请不要刷新页面或点击其他菜单。
-
-
-
- 根据时间与栏目类型生成文章
-
-
- <@ms.form name="generateIndex">
- <@ms.formRow label="选择主页模板" width="300">
-
-
- @ms.formRow>
- <@ms.text id="position" label="选择主页位置 " width="300" value="index" placeholder="输入主页位置" name="position" help="注:主页位置htm文件名一般为index.html或default.html"/>
-
- @ms.form>
-
- <@ms.form name="generateColumn">
- <@ms.formRow label="选择要生成栏目" width="300">
- <#if list?has_content>
- <@ms.treeInput treeId="inputTree" json="${list?default('')}" jsonId="categoryId" jsonPid="categoryCategoryId" jsonName="categoryTitle" buttonText="选择更新的栏目" addNodesName="所有栏目" inputName="columnId" showIcon="true" expandAll="true" />
- <#else>
- <@ms.treeInput treeId="errorTree" buttonText="暂无数据" />
- #if>
- @ms.formRow>
-
- @ms.form>
- <@ms.form name="generateArticle">
- <@ms.formRow label="文章栏目" width="300">
- <#if list?has_content>
- <@ms.treeInput treeId="inputTreee" json="${list?default('')}" jsonId="categoryId" jsonPid="categoryCategoryId" jsonName="categoryTitle" addNodesName="所有栏目" buttonText="选择更新的栏目" inputName="articleId" showIcon="true" expandAll="true" />
- <#else>
- <@ms.treeInput treeId="errorTree" buttonText="暂无数据" />
- #if>
- @ms.formRow>
- <@ms.date name="dateTime" label="指定时间" single=true readonly="readonly" width="300" value="${now?string('yyyy-MM-dd')}" validation={"required":"true", "data-bv-notempty-message":"必填项目"} placeholder="点击该框选择时间段" />
-
- @ms.form>
- @ms.panel>
-@ms.html5>
-
-
-
-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl
deleted file mode 100644
index 4ed6ba1d..00000000
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
- ${app.appName}
- <#include "/include/head-file.ftl"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
- 账户登录 / User login
-
-
-
-
-
-
-
-
-
-
- 看不清?
- 换一张
-
-
-
- 记住密码
-
-
- 登录
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/main.ftl b/src/main/webapp/WEB-INF/manager/main.ftl
deleted file mode 100644
index f5e5a622..00000000
--- a/src/main/webapp/WEB-INF/manager/main.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- 铭飞CMS
-
-
-
-
-
-
-
-欢迎使用铭飞产品
技术交流加群:①242805203 ②231212174(满) ③221335098(满) 或到官方论坛进行技术交流
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/sso/login.ftl b/src/main/webapp/WEB-INF/sso/login.ftl
deleted file mode 100644
index 02ee9772..00000000
--- a/src/main/webapp/WEB-INF/sso/login.ftl
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
- 登录
- <#include "/include/head-file.ftl"/>
-
-
-
-
-
-
-
-
-
-
- 账号登录
-
- 扫码登录
-
-
-
-
-
- @qq.com
-
-
-
-
-
-
- 登录
-
-
-
-
-
-
-
-

-

-
扫码成功!
-
请在手机上确认登录
-
返回二维码
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/api/ms.people.min.js b/src/main/webapp/api/ms.people.min.js
deleted file mode 100644
index 30c9e295..00000000
--- a/src/main/webapp/api/ms.people.min.js
+++ /dev/null
@@ -1,882 +0,0 @@
-/**
- * 用户基础信息
- */
-(function () {
- /**
- *退出
- ------
- * @callmethod people.quit(function(){...});
- * @param {{type:function,have:true}} 回调方法 无返回值
- * @examples
- * ...
- * 退出
- * ...
- * ...
- * @function
- * 无返回值
- * @return {{type:none}} 无返回值
- */
- function quit(func) {
- ms.http.get(ms.base + "/people/quit.do", {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 设置密码
- ------
- * @callmethod people.resetPassword(data,function(returnJson){...});
- * @param {{type:String,have:true}} peoplePassword 用户密码
- * @param {{type:function}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- * ...
- * @function
- * {"resultMsg":"","result":true}
- * @return {{type:resultMsg}} 提示信息
- * @return {{type:result}} true成功、false失败
- */
- function resetPassword(data, func) {
- if (validator.isEmpty(data + "")) {
- alert("数据不能为空");
- return;
- }
- if (validator.isEmpty(data.peoplePassword + "")) {
- alert("密码不能为空");
- return;
- }
- ms.http.post(ms.base + "/people/resetPassword.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 验证用户接收的验证码
- ------
- * @callmethod people.checkPeopleCode(peopleCode,function(returnJson){...});
- * @param {{type:string,have:true}} peopleCode 短信、邮箱验证码
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- * ...
- * @function
- * {code:"模块编码",result:true}
- * @return {{type:code}} 编码
- * @return {{type:result}} true成功、false失败
- */
- function checkPeopleCode(peopleCode, func) {
- if (validator.isEmpty(peopleCode + "")) {
- return;
- }
- ms.http.post(ms.base + "/people/checkPeopleCode.do", peopleCode, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 获取用户基本信息
- ------
- * @callmethod people.info(function(returnJson){...});
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- * ...
- * @function
- * {
- * "peopleAutoLogin":0,
- * "peopleName":"mstest",
- * "peopleDateTime":"2016-05-08 13:14:00",
- * "peopleId":5201314,
- * }
- * @return {{type:peopleAutoLogin}} 自动登录多少天
- * @return {{type:peopleName}} 用户名
- * @return {{type:peopleDateTime}} 用户登录时间
- * @return {{type:peopleId}} 用户编号
- */
- function info(func) {
- ms.http.get(ms.base + "/people/info.do")
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 修改密码
- ------
- * 如果修改密码,在输入新密码后需要再次填入确认密码,需要前端自行判断新密码与再次确认密码是否一致,接口未做判断
- * @callmethod people.changePassword(data,function(returnJson){...});
- * @param {{type:string,have:true}} peopleOldPassword 原密码
- * @param {{type:string,have:true}} peoplePassword 新密码
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- * ...
- * @function
- * {code:"模块编码",result:true,resultMsg:""}
- * @return {{type:code}} 模块编码
- * @return {{type:result}} true成功、false失败
- * @return {{type:resultMsg}} 错误信息
- */
- function changePassword(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if (validator.isEmpty(data.peopleOldPassword + "")) {
- alert("原密码不能为空");
- return;
- }
- if (validator.isEmpty(data.peoplePassword + "")) {
- alert("新密码不能为空");
- return;
- }
- ms.http.post(ms.base + "/people/changePassword.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 验证用户名,手机号或邮箱
- * @param data
- * @returns
- */
- function checkValidator(data) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if ((validator.isEmpty(data.peopleName + "") || typeof (data.peopleName) == "undefined") &&
- (validator.isEmpty(data.peoplePhone + "") || typeof (data.peoplePhone) == "undefined") &&
- (validator.isEmpty(data.peopleMail + "") || typeof (data.peopleMail) == "undefined")) {
- alert("用户名,手机号,邮箱必须有一个不为空");
- return;
- }
- if (!validator.isEmpty(data.peoplePhone + "") && typeof (data.peoplePhone) != "undefined") {
- if (!validator.isMobilePhone(data.peoplePhone, 'zh-CN')) {
- alert("请输入正确的手机号");
- return;
- }
- }
- if (!validator.isEmpty(data.peopleMail + "") && typeof (data.peopleMail) != "undefined") {
- if (!validator.isEmail(data.peopleMail)) {
- alert("请输入正确的邮箱");
- return;
- }
- }
- if (validator.isEmpty(data.peoplePassword + "")) {
- alert("密码不能为空");
- return;
- }
- }
- /**
- * 注册
- - -----
- * 用户可以用名称、手机号、邮箱三者之一进行注册
- * 几种注册流程的形式:
- * 1、普通用户名称、登录密码,优先用户名注册,登录密码最长度范围3~30个字符;
- * 2、邮箱、邮箱验证码、登录密码(邮箱必须是可接收验证码);
- * 3、手机号、短信验证码、登录密码;
- * 注意: 1、注册页面必须存在图片验证码
- * 2、如果需要接收验证码操作,需要使用“发送验证码”配合使用才能完成注册流程
- * @callmethod register(data,function(returnJson){...});
- * @param {{type:string}} peoplePhone 手机号
- * @param {{type:string}} peopleName 用名称 用户名长度在3~30个字符之间,只能是字母数字混合
- * @param {{type:string}} peopleMail 邮箱
- * @param {{type:string,have:true}} peoplePassword 注册密码
- * @param {{type:strings,have:true}} rand_code 验证码
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ...
- * ...
- * @function
- * {"resultMsg":"注册成功","result":true,"code":"07010100"}
- * @return {{type:resultMsg}} 提示信息
- * @return {{type:code}} 错误编码
- * @return {{type:result}} true成功、false失败
- */
- function register(data, func) {
- checkValidator(data); //验证表单信息
- ms.http.post(ms.base + "/register.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err);
- })
- }
- /**
- *登录
- ------
- * 登录验证,登录必须存在验证码
- * @callmethod checkLogin(data,function(returnJson){...});
- * @param {{type:string,have:true}} peopleName 用户名
- * @param {{type:string,have:true}} peoplePassword 登录密码
- * @param {{type:string,have:true}} rand_code 验证码
- * @param {{type:string}} peopleAutoLogin 自动登录 如果大于0表示开启自动登录,1表示自动登录保留1天
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ...
- * ...
- * @function
- * {"resultMsg":"{
- * \"peopleAppId\":0,
- * \"peopleAutoLogin\":0,
- * \"peopleId\":9020,
- * \"peopleMailCheck\":0,
- * \"peopleName\":\"mstest\",
- * \"peoplePhoneCheck\":0,
- * \"peopleState\":0}",
- * "result":true,
- * "code":"07010200"}
- * @return {{type:code}} 错误编码
- * @return {{type:result}} true成功、false失败
- * @return {{type:resultMsg}} 提示信息
- * @return {{type:resultData}} {"peopleAutoLogin":自动登录多少天,"peopleName":用户,"peopleId":用户编号,"peopleMail ":用户邮箱}
- */
- function checkLogin(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if (validator.isEmpty(data.peopleName + "")) {
- alert("用户名不能为空");
- return;
- }
- if (validator.isEmpty(data.peoplePassword + "")) {
- alert("密码不能为空");
- return;
- }
- if (validator.isEmpty(data.rand_code + "")) {
- alert("验证码不能为空");
- return;
- }
- ms.http.post(ms.base + "/checkLogin.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
- /**
- *验证登录状态
- ------
- * @callmethod checkLoginStatus(function(returnJson){...});
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- * @function
- * {result:"false"}
- * @return {{type:result}} true成功、false失败
- */
- function checkLoginStatus(func) {
- ms.http.post(ms.base + "/checkLoginStatus.do")
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 发送验证码
- ------
- * 用户发送验证码,可以通过邮箱或手机发送
- * @callmethod sendCode(data,function(returnJson){...});
- * @param {{type:string,have:true}} receive 接收地址,只能是邮箱或手机号,邮箱需要使用邮箱插件,手机号需要短信插件
- * @param {{type:string,have:true}} modelCode 对应邮件插件的模块编号
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ...
- * ...
- * @function
- * {result:"true"}
- * @return {{type:result}} true成功、false失败
- */
- function sendCode(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if (validator.isEmpty(data.receive + "")) {
- alert("接收地址不能为空");
- return;
- }
- if (validator.isEmpty(data.modelCode + "")) {
- alert("对应邮件插件的模块编号不能为空");
- return;
- }
- ms.http.get(ms.base + "/sendCode.do", data).then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 验证用户接收的验证码
- ------
- * 验证用户输入的系统发送邮件或者短信验证码是否正确
- * @callmethod checkSendCode(data,function(returnJson){...});
- * @param {{type:string,have:true}} receive 接收地址,只能是邮箱或手机号,邮箱需要使用邮箱插件,手机号需要短信插件
- * @param {{type:string,have:true}} code 对应接收的验证码
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ...
- * @function
- * {result:"true"}
- * @return {{type:result}} true成功、false失败
- */
- function checkSendCode(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if (validator.isEmpty(data.receive + "")) {
- alert("接收地址不能为空");
- return;
- }
- if (validator.isEmpty(data.code + "")) {
- alert("接收的验证码不能为空");
- return;
- }
- ms.http.post(ms.base + "/checkSendCode.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 解绑邮箱验证用户接收的验证码
- ------
- * 解绑邮箱时,验证用户输入的系统发送邮件或者短信验证码是否正确
- * @callmethod cancelBind(data,function(returnJson){...});
- * @param {{type:string,have:true}} receive 接收地址,只能是邮箱或手机号,邮箱需要使用邮箱插件,手机号需要短信插件
- * @param {{type:string,have:true}} code 对应接收的验证码
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ...
- * @function
- * {result:"true"}
- * @return {{type:result}} true成功、false失败
- */
- function cancelBind(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if (validator.isEmpty(data.receive + "")) {
- alert("接收的验证码不能为空");
- return;
- }
- if (validator.isEmpty(data.code + "")) {
- alert("接收的验证码不能为空");
- return;
- }
- ms.http.post(ms.base + "/cancelBind.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 验证已保存用户
- ------
- * 验证用户名、手机号、邮箱是否已保存,同一时间只能判断一种,优先用户名称
- * 适用场景:
- * 1、用户注册是对用户名、邮箱或手机号唯一性判断
- * 2、用户取回密码是判断账号是否存在
- * @callmethod check(data,function(returnJson){...});
- * @param {{type:string}} peopleName 用户名称验证
- * @param {{type:string}} peopleMail 用户邮箱验证
- * @param {{type:string}} peoplePhone 用户手机验证
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- *...
- *
- * ...
- * @function
- * {result:"true"}
- * @return {{type:code}} 模块编码
- * @return {{type:result}} true存在|false不存在或错误
- * @return {{type:resultMsg}} 错误信息
- */
- function check(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- checkValidator(data); //验证表单
- ms.http.post(ms.base + "/check.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 验证已绑定用户
- ------
- * 验证用户名、手机号、邮箱是否已保存并绑定,同一时间只能判断一种,优先用户名称
- * 适用场景:
- * 1、用户注册是对用户名、邮箱或手机号唯一性判断
- * 2、用户取回密码是判断账号是否存在
- * 3、用户绑定邮箱或者手机号验证,邮箱或手机号是否存在并已绑定
- * @callmethod isExists(data,function(returnJson){...});
- * @param {{type:string}} peopleName 用户名称验证
- * @param {{type:string}} peopleMail 用户邮箱验证,注意:只验证绑定成功的邮箱
- * @param {{type:string}} peoplePhone 用户手机验证,注意:只验证绑定成功的手机
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ...
- * super.load(["super.people"],function(mpeople){
- * mpeople.isExists($("form").serialize(),function(returnJson){
- * alert(JSON.stringify(returnJson));
- * });
- * })
- * @function
- * {result:"true"}
- * @return {{type:code}} 模块编码
- * @return {{type:result}} true存在|false不存在或错误
- * @return {{type:resultMsg}} 错误信息
- */
- function isExists(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- checkValidator(data); //验证表单信息
- ms.http.post(ms.base + "/isExists.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
- /**
- *验证图片验证码
- ------
- *例如流程需要短信验证或邮箱验证,为有效防止恶意发送验证码。提供给ajax异步请求使用
- *注意:页面提交对验证码表单属性名称必须是rand_code,否则无效
- * @callmethod checkCode(rand_code,function(returnJson){...});
- * @param {{type:strings,have:true}} rand_code 验证码
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- *...
- * @function
- * {code:"错误编码",result:"true成功、false失败",resultMsg: "提示信息"}
- * @return {{type:code}} 错误编码
- * @return {{type:result}} true成功、false失败
- * @return {{type:resultMsg}} 提示信息
- */
- function checkCode(rand_code, func) {
- if (validator.isEmpty(rand_code + "")) {
- alert("接收的验证码不能为空");
- return;
- }
- ms.http.post(ms.base + "/checkCode.do", rand_code, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 重置密码
- ------
- * 当用户忘记登录密码时可以通过注册绑定的邮箱或绑定的手机号进行取回,操作过程中需要通过邮件模块与短信模块发送验证码给用户
- * 业务场景:用户输入手机号(邮箱),点击发送验证码,发送间隔时间为60秒,用户将接收到的验证码输入提交,此接口不会对用户再次输入新密码进行判断,需要开发者做前端判断
- * @callmethod resetPassword(data,function(returnJson){...});
- * @param {{type:string,have:true}} peoplePassword 用户新密码
- * @param {{type:string,have:true}} rand_code 验证码
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ...
- * ...
- * @function
- * {code:"0777700",result:true,resultMsg: "提示信息"}
- * @return {{type:code}} 错误编码
- * @return {{type:result}} true成功、false失败
- * @return {{type:resultMsg}} 提示信息
- */
- function resetPassword(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if (validator.isEmpty(data.peoplePassword + "")) {
- alert("用户新密码不能为空");
- return;
- }
- if (validator.isEmpty(data.peopleCode + "")) {
- alert("接收的验证码不能为空");
- return;
- }
- if (validator.isEmpty(data.rand_code + "")) {
- alert("图片验证码不能为空");
- return;
- }
- ms.http.post(ms.base + "/resetPassword.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 验证重置密码收到的验证码
- ------
- * 忘记密码时需要将第一步验证用户时的接收验证码作为重置密码的验证码
- * @callmethod checkResetPasswordCode(data,function(returnJson){...});
- * @param {{type:string,have:true}} peopleCode 短信、邮箱验证码
- * @param {{type:string,have:true}} rand_code 验证码,可能会传递经过多个流程,具体根据业务确定
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ...
- * @function
- * {result:"true"}
- * @return {{type:result}} true成功、false失败
- */
- function checkResetPasswordCode(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if (validator.isEmpty(data.peopleCode + "")) {
- alert("接收的验证码不能为空");
- return;
- }
- if (validator.isEmpty(data.rand_code + "")) {
- alert("图片验证码不能为空");
- return;
- }
- ms.http.post(ms.base + "/checkResetPasswordCode.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
- let people = {
- quit: quit,
- resetPassword: resetPassword,
- checkPeopleCode: checkPeopleCode,
- info: info,
- changePassword: changePassword,
- register: register,
- sendCode: sendCode,
- checkLogin: checkLogin,
- checkLoginStatus: checkLoginStatus,
- checkSendCode: checkSendCode,
- cancelBind: cancelBind,
- check: check,
- isExists: isExists,
- checkCode: checkCode,
- resetPassword: resetPassword,
- checkResetPasswordCode: checkResetPasswordCode,
- }
- window.ms.people = people;
-}());
-/**
- * 用户基础信息
- */
-(function () {
- /**
- * 获取用户详情
- ------
- * @callmethod people.info(function(returnJson){...});
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- * ...
- * @function
- * {
- * "peopleAutoLogin":0,
- * "peopleName":"mstest",
- * "peopleDateTime":"2016-05-08 13:14:00",
- * "peopleId":5201314,
- * }
- * @return {{type:peopleAutoLogin}} 自动登录多少天
- * @return {{type:peopleName}} 用户名
- * @return {{type:peopleDateTime}} 用户登录时间
- * @return {{type:peopleId}} 用户编号
- */
- function info(func) {
- ms.http.get(ms.base + "/people/user/info.do")
- .then(func, (err) => {
- console.log(err)
- })
- }
- /**
- * 更新手机号或邮箱
- ------
- * 更新用户信息中保存的手机号或者邮箱号,二者必须存在一个
- * @callmethod people.update(data,function(returnJson){...});
- * @param {{type:string,have:true}} peopleMail 邮箱
- * @param {{type:string}} peoplePhone 手机号
- * @param {{type:function,have:true}} 回调方法 返回值(returnJson)
- * @examples
- * ...
- *
- * ..
- * ...
- * @function
- * {code:"模块编码",result:true,resultMsg:""}
- * @return {{type:code}} 模块编码
- * @return {{type:result}} true成功、false失败
- * @return {{type:resultMsg}} 错误信息
- */
- function update(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- if ((validator.isEmpty(data.peoplePhone + "") || typeof (data.peoplePhone) == "undefined") &&
- (validator.isEmpty(data.peopleMail + "") || typeof (data.peopleMail) == "undefined")) {
- alert("用户名,手机号,邮箱必须有一个不为空");
- return;
- }
- if (!validator.isEmpty(data.peoplePhone + "") && typeof (data.peoplePhone) != "undefined") {
- if (!validator.isMobilePhone(data.peoplePhone, 'zh-CN')) {
- alert("请输入正确的手机号");
- return;
- }
- }
- if (!validator.isEmpty(data.peopleMail + "") && typeof (data.peopleMail) != "undefined") {
- if (!validator.isEmail(data.peopleMail)) {
- alert("请输入正确的邮箱");
- return;
- }
- }
- ms.http.post(ms.base + "/people/user/update.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
-
- function saveUserIcon(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- ms.http.post(ms.base + "/people/user/saveUserIcon.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
-
- function updateUserIcon(data, func) {
- if (validator.isEmpty(data + "")) {
- return;
- }
- ms.http.post(ms.base + "/people/user/updateUserIcon.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- })
- .then(func, (err) => {
- console.log(err)
- })
- }
- let user = {
- info: info,
- update: update,
- saveUserIcon: saveUserIcon,
- updateUserIcon: updateUserIcon
- }
- window.ms.people.user = user;
-}());
-/**
- * 普通用户收货地址信息
- */
-(function () {
- /**
- * 用户收货地址列表
- * @param data
- * @param func
- * @returns
- */
- function list(data, func) {
- ms.http.get(ms.base + "/people/address/list.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
-
- /**
- * 保存用户收货地址
- * @param data
- * @param func
- * @returns
- */
- function save(data, func) {
- ms.http.post(ms.base + "/people/address/save.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
-
- /**
- * 更新用户收货地址
- * @param data
- * @param func
- * @returns
- */
- function update(data, func) {
- ms.http.post(ms.base + "/people/address/update.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
-
-
- /**
- * 设置默认地址
- * @param data
- * @param func
- * @returns
- */
- function setDefault(data, func) {
- ms.http.post(ms.base + "/people/address/setDefault.do", data, {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- }
- }).then(func, (err) => {
- console.log(err)
- })
- }
-
- /**
- * 通过peopleAddressId查询用户收货地址实体
- * @param data
- * @param func
- * @returns
- */
- function get(data, func) {
- ms.http.get(ms.base + "/people/address/get.do", data).then(func, (err) => {
- console.log(err)
- })
- }
-
-
- /**
- * 根据收货地址id删除收货信息
- * @param data
- * @param func
- * @returns
- */
- function del(data, func) {
- ms.http.get(ms.base + "/people/address/delete.do", data).then(func, (err) => {
- console.log(err)
- })
- }
- let address = {
- list: list,
- save: save,
- update: update,
- setDefault: setDefault,
- get: get,
- del: del
- }
- window.ms.people.address = address;
-}());
\ No newline at end of file