Merge remote-tracking branch 'origin/master'

src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml

@@ -232,7 +232,7 @@
 			<if test="dictId != null"> and dict_id=#{dictId} </if>
 			<if test="categoryFlag != null and categoryFlag != ''"> and category_flag=#{categoryFlag}</if>
 			<if test="categoryPath != null and categoryPath != ''"> and category_path=#{categoryPath}</if>
-			<if test="categoryParentId != null and categoryParentId != ''"> and category_parent_id=#{categoryParentId}</if>
+			<if test="categoryParentId != null and categoryParentId != ''"> and  find_in_set(#{categoryParentId},category_parent_id)</if>
 			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
 			<if test="createDate != null"> and create_date=#{createDate} </if>
 			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>

src/main/resources/application.yml

@@ -11,8 +11,8 @@ logging:
 
 ms:
   mstore:
-    http: http://store.i.mingsoft.net
+    http: http://store.new.mingsoft.net
-    host: store.i.mingsoft.net
+    host: store.new.mingsoft.net
   swagger:
     enable: true #启用swagger文档，生产的时候务必关掉
   manager:

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

@@ -6,6 +6,7 @@
     <#include '/include/head-file.ftl'/>
     <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/ms/compoents/store.umd.min.js"></script>
     <style>
         .to-ele {
             font-size: 18px;
@@ -128,10 +129,7 @@
                         </el-dropdown-menu>
                     </el-dropdown>
                     <!--mstore按钮-->
-                    <div class="ms-admin-mstore-icon" @click="open(mstore)">
+                    <ms-store client="${client}"></ms-store>
-                        <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>
 
             </el-header>
@@ -528,13 +526,6 @@
             this.list();
             //获取登录用户信息
             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>

src/main/webapp/static/locale/lang/cms/category/ch.js

@@ -1,22 +0,0 @@
-var localeCh={
-    ch:{
-        form:{
-            categoryTitle:{
-                text:'栏目名称',
-                    placeholder:'请输入栏目名称',
-                    help:'',
-            },
-            categoryId:'所属栏目',
-                categoryType:'栏目类型',
-                categorySort:'自定义顺序',
-                categoryUrl:'内容模板|封面模板',
-                mdiyModelId:'自定义模型',
-                categoryListUrl:'列表模板',
-                categoryFlag:'栏目属性',
-                categoryKeyword:'栏目关键字',
-                categoryDescrip:'栏目描述',
-                categoryImg :'栏目图片',
-                categoryDiyUrl:'自定义链接',
-        }
-    }
-}

src/main/webapp/static/locale/lang/cms/category/en.js

@@ -1,22 +0,0 @@
-var  localeEn={
-    en:{
-        form:{
-            categoryTitle:{
-                text:'channel name',
-                placeholder:'please enter channel name',
-                help:'',
-            },
-            categoryId:'parent channel',
-            categoryType:'channel type',
-            categorySort:'channel sort',
-            categoryUrl:'content template|page template',
-            mdiyModelId:'diy Model',
-            categoryListUrl:'list template',
-            categoryFlag :'channel property',
-            categoryKeyword  :'channel keyword',
-            categoryDescrip  :'channel desc',
-            categoryImg  :'channel image',
-            categoryDiyUrl:'custom url',
-        }
-    }
-}

src/main/webapp/static/plugins/ms/compoents/store.umd.min.js

@@ -0,0 +1 @@
+(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("Vue")):"function"===typeof define&&define.amd?define(["Vue"],t):"object"===typeof exports?exports["store"]=t(require("Vue")):e["store"]=t(e["Vue"])})("undefined"!==typeof self?self:this,(function(e){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=2)}([function(t,n){t.exports=e},function(e,t,n){var r,o,i;(function(n,c){o=[],r=c,i="function"===typeof r?r.apply(t,o):r,void 0===i||(e.exports=i)})("undefined"!==typeof self&&self,(function(){function e(){var t=Object.getOwnPropertyDescriptor(document,"currentScript");if(!t&&"currentScript"in document&&document.currentScript)return document.currentScript;if(t&&t.get!==e&&document.currentScript)return document.currentScript;try{throw new Error}catch(l){var n,r,o,i=/.*at [^(]*\((.*):(.+):(.+)\)$/gi,c=/@([^@]*):(\d+):(\d+)\s*$/gi,u=i.exec(l.stack)||c.exec(l.stack),s=u&&u[1]||!1,a=u&&u[2]||!1,f=document.location.href.replace(document.location.hash,""),d=document.getElementsByTagName("script");s===f&&(n=document.documentElement.outerHTML,r=new RegExp("(?:[^\\n]+?\\n){0,"+(a-2)+"}[^<]*<script>([\\d\\D]*?)<\\/script>[\\d\\D]*","i"),o=n.replace(r,"$1").trim());for(var p=0;p<d.length;p++){if("interactive"===d[p].readyState)return d[p];if(d[p].src===s)return d[p];if(s===f&&d[p].innerHTML&&d[p].innerHTML.trim()===o)return d[p]}return null}}return e}))},function(e,t,n){"use strict";if(n.r(t),"undefined"!==typeof window){var r=window.document.currentScript,o=n(1);r=o(),"currentScript"in document||Object.defineProperty(document,"currentScript",{get:o});var i=r&&r.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);i&&(n.p=i[1])}var c=n(0),u=n.n(c),s=function(){var e=this,t=e.$createElement,n=e._self._c||t;return e.mstore.syncStoreUrl?n("div",{staticClass:"ms-admin-mstore-icon",on:{click:function(t){return e.$root.open(e.mstore)}}},[e.mstore.syncNum>0?n("span",{domProps:{textContent:e._s(e.mstore.syncNum)}}):e._e(),n("i",{staticClass:"iconfont icon-fenxiang2",staticStyle:{"line-height":"42px !important","font-size":"30px"}})]):e._e()},a=[];s._withStripped=!0;var f={props:{client:String},data:function(){return{mstore:{}}},methods:{},created:function(){var e=this;ms.http.get(ms.manager+"/upgrader/sync.do").then((function(t){t.result&&(t.data.syncStoreUrl+="/#/?client="+e.client,e.mstore=t.data),console.log(e.mstore)}))}},d=f;function p(e,t,n,r,o,i,c,u){var s,a="function"===typeof e?e.options:e;if(t&&(a.render=t,a.staticRenderFns=n,a._compiled=!0),r&&(a.functional=!0),i&&(a._scopeId="data-v-"+i),c?(s=function(e){e=e||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext,e||"undefined"===typeof __VUE_SSR_CONTEXT__||(e=__VUE_SSR_CONTEXT__),o&&o.call(this,e),e&&e._registeredComponents&&e._registeredComponents.add(c)},a._ssrRegister=s):o&&(s=u?function(){o.call(this,(a.functional?this.parent:this).$root.$options.shadowRoot)}:o),s)if(a.functional){a._injectStyles=s;var f=a.render;a.render=function(e,t){return s.call(t),f(e,t)}}else{var d=a.beforeCreate;a.beforeCreate=d?[].concat(d,s):[s]}return{exports:e,options:a}}var l=p(d,s,a,!1,null,null,null);l.options.__file="src/components/Store/Index.vue";var m=l.exports;u.a.component("MsStore",m)}])}));