Merge remote-tracking branch 'origin/master'

1a246361 · zhouyk · fa098cfc · 6710d7b9 · 1a246361 · 1a246361
Commit 1a246361 authored Sep 14, 2022 by zhouyk
8 changed files
--- a/.workflow/branch-pipeline.yml
+++ b/.workflow/branch-pipeline.yml
+version: '1.0'
+name: branch-pipeline
+displayName: BranchPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+  - stage: 
+    name: release
+    displayName: 发布
+    steps:
+      - step: publish@release_artifacts
+        name: publish_release_artifacts
+        displayName: '发布'
+        # 上游上传制品任务的产出
+        dependArtifact: output
+        # 发布制品版本号
+        version: '1.0.0.0'
+        # 是否开启版本号自增，默认开启
+        autoIncrement: true
+triggers:
+  push:
+    branches:
+      exclude:
+        - master
+      include:
+        - .*
--- a/.workflow/master-pipeline.yml
+++ b/.workflow/master-pipeline.yml
+version: '1.0'
+name: master-pipeline
+displayName: MasterPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+  - stage: 
+    name: release
+    displayName: 发布
+    steps:
+      - step: publish@release_artifacts
+        name: publish_release_artifacts
+        displayName: '发布'
+        # 上游上传制品任务的产出
+        dependArtifact: output
+        # 发布制品版本号
+        version: '1.0.0.0'
+        # 是否开启版本号自增，默认开启
+        autoIncrement: true
+triggers:
+  push:
+    branches:
+      include:
+        - master
--- a/.workflow/pr-pipeline.yml
+++ b/.workflow/pr-pipeline.yml
+version: '1.0'
+name: pr-pipeline
+displayName: PRPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 构建产物制品库，默认default，系统默认创建
+        artifactRepository: default
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+triggers:
+  pr:
+    branches:
+      include:
+        - master
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ QQ交流群号： [![加入QQ群](https://img.shields.io/badge/五群-231211521-
 建议开发者使用以下环境，这样避免版本带来的问题
 * Windows、Linux
 * Eclipse、Idea
-* Mysql≧5.7
+* Mysql≧5.7 (开启忽略大小写)
 * JDK≧8
 * Tomcat≧8


--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -23,12 +23,13 @@ ms:
  xss:
    xssEnable: true #xss过滤器的开关
    filterUrl: /**   #过滤的url,多个用逗号分开
-    excludeUrl: /ms/**,/static/**,/template/**,/file/upload.do,/static/plugins/ueditor/1.4.3.3/jsp/editor.do,/activity/saveUser.do  #排除的url,多个用逗号分开
+    excludeUrl: /ms/**,/static/**,/template/**,/file/upload.do,/static/plugins/ueditor/1.4.3.3/jsp/editor.do  #排除的url,多个用逗号分开
  #  mstore-url: http://store.i.mingsoft.net
  #  mstore-host: store.i.mingsoft.net
  # shiro-key:  #16位长度，不填写默认随机生成
  cookie-name: SHIRO_SESSION_ID
-  html-dir: html
+  diy:
+    html-dir: html
  rand-code:
    length: 4 #验证码长度
    circle: 10 #干扰线条数，值越大越不容易辨别

--- a/src/main/webapp/static/plugins/ms/2.0/ms.umd.js
+++ b/src/main/webapp/static/plugins/ms/2.0/ms.umd.js
--- a/src/main/webapp/static/plugins/vue-awesome-swiper/4.1.1/vue-awesome-swiper.min.js
+++ b/src/main/webapp/static/plugins/vue-awesome-swiper/4.1.1/vue-awesome-swiper.min.js
+/**
+ * Minified by jsDelivr using Terser v3.14.1.
+ * Original file: /npm/vue-awesome-swiper@4.1.1/dist/vue-awesome-swiper.js
+ *
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("swiper"),require("vue")):"function"==typeof define&&define.amd?define(["exports","swiper","vue"],t):t((e=e||self).VueAwesomeSwiper={},e.Swiper,e.Vue)}(this,function(e,t,n){"use strict";var i;t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t,n=n&&Object.prototype.hasOwnProperty.call(n,"default")?n.default:n,function(e){e.SwiperComponent="Swiper",e.SwiperSlideComponent="SwiperSlide",e.SwiperDirective="swiper",e.SwiperInstance="$swiper"}(i||(i={}));var o,r,l=Object.freeze({containerClass:"swiper-container",wrapperClass:"swiper-wrapper",slideClass:"swiper-slide"});!function(e){e.Ready="ready",e.ClickSlide="clickSlide"}(o||(o={})),function(e){e.AutoUpdate="autoUpdate",e.AutoDestroy="autoDestroy",e.DeleteInstanceOnDestroy="deleteInstanceOnDestroy",e.CleanupStylesOnDestroy="cleanupStylesOnDestroy"}(r||(r={}));var a=["init","beforeDestroy","slideChange","slideChangeTransitionStart","slideChangeTransitionEnd","slideNextTransitionStart","slideNextTransitionEnd","slidePrevTransitionStart","slidePrevTransitionEnd","transitionStart","transitionEnd","touchStart","touchMove","touchMoveOpposite","sliderMove","touchEnd","click","tap","doubleTap","imagesReady","progress","reachBeginning","reachEnd","fromEdge","setTranslate","setTransition","resize","observerUpdate","beforeLoopFix","loopFix"];function s(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;var i=Array(e),o=0;for(t=0;t<n;t++)for(var r=arguments[t],l=0,a=r.length;l<a;l++,o++)i[o]=r[l];return i}var d,u=function(e){return e.replace(/([a-z])([A-Z])/g,"$1-$2").replace(/\s+/g,"-").toLowerCase()},p=function(e,t,n){var i,r,l;if(e&&!e.destroyed){var a=(null===(i=t.composedPath)||void 0===i?void 0:i.call(t))||t.path;if((null==t?void 0:t.target)&&a){var s=Array.from(e.slides),d=Array.from(a);if(s.includes(t.target)||d.some(function(e){return s.includes(e)})){var p=e.clickedIndex,c=Number(null===(l=null===(r=e.clickedSlide)||void 0===r?void 0:r.dataset)||void 0===l?void 0:l.swiperSlideIndex),v=Number.isInteger(c)?c:null;n(o.ClickSlide,p,v),n(u(o.ClickSlide),p,v)}}}},c=function(e,t){a.forEach(function(n){e.on(n,function(){for(var e=arguments,i=[],o=0;o<arguments.length;o++)i[o]=e[o];t.apply(void 0,s([n],i));var r=u(n);r!==n&&t.apply(void 0,s([r],i))})})},v="instanceName";function f(e,t){var n=function(e,t){var n,i,o,r,l=null===(i=null===(n=e.data)||void 0===n?void 0:n.attrs)||void 0===i?void 0:i[t];return void 0!==l?l:null===(r=null===(o=e.data)||void 0===o?void 0:o.attrs)||void 0===r?void 0:r[u(t)]},a=function(e,t,o){return t.arg||n(o,v)||e.id||i.SwiperInstance},s=function(e,t,n){var i=a(e,t,n);return n.context[i]||null},d=function(e){return e.value||t},f=function(e){return[!0,void 0,null,""].includes(e)},h=function(e){var t,n,i=(null===(t=e.data)||void 0===t?void 0:t.on)||(null===(n=e.componentOptions)||void 0===n?void 0:n.listeners);return function(e){for(var t,n=arguments,o=[],r=1;r<arguments.length;r++)o[r-1]=n[r];var l=null===(t=i)||void 0===t?void 0:t[e];l&&l.fns.apply(l,o)}};return{bind:function(e,t,n){-1===e.className.indexOf(l.containerClass)&&(e.className+=(e.className?" ":"")+l.containerClass),e.addEventListener("click",function(i){var o=h(n),r=s(e,t,n);p(r,i,o)})},inserted:function(t,n,i){var r=i.context,l=d(n),s=a(t,n,i),u=h(i),p=r,v=null==p?void 0:p[s];v&&!v.destroyed||(v=new e(t,l),p[s]=v,c(v,u),u(o.Ready,v))},componentUpdated:function(e,t,i){var o,l,a,u,p,c,v,h,w,S,y,m,C=n(i,r.AutoUpdate);if(f(C)){var g=s(e,t,i);if(g){var I=d(t).loop;I&&(null===(l=null===(o=g)||void 0===o?void 0:o.loopDestroy)||void 0===l||l.call(o)),null===(a=null==g?void 0:g.update)||void 0===a||a.call(g),null===(p=null===(u=g.navigation)||void 0===u?void 0:u.update)||void 0===p||p.call(u),null===(v=null===(c=g.pagination)||void 0===c?void 0:c.render)||void 0===v||v.call(c),null===(w=null===(h=g.pagination)||void 0===h?void 0:h.update)||void 0===w||w.call(h),I&&(null===(y=null===(S=g)||void 0===S?void 0:S.loopCreate)||void 0===y||y.call(S),null===(m=null==g?void 0:g.update)||void 0===m||m.call(g))}}},unbind:function(e,t,i){var o,l=n(i,r.AutoDestroy);if(f(l)){var a=s(e,t,i);a&&a.initialized&&(null===(o=null==a?void 0:a.destroy)||void 0===o||o.call(a,f(n(i,r.DeleteInstanceOnDestroy)),f(n(i,r.CleanupStylesOnDestroy))))}}}}function h(e){var t;return n.extend({name:i.SwiperComponent,props:(t={defaultOptions:{type:Object,required:!1,default:function(){return{}}},options:{type:Object,required:!1}},t[r.AutoUpdate]={type:Boolean,default:!0},t[r.AutoDestroy]={type:Boolean,default:!0},t[r.DeleteInstanceOnDestroy]={type:Boolean,required:!1,default:!0},t[r.CleanupStylesOnDestroy]={type:Boolean,required:!1,default:!0},t),data:function(){var e;return(e={})[i.SwiperInstance]=null,e},computed:{swiperInstance:{cache:!1,set:function(e){this[i.SwiperInstance]=e},get:function(){return this[i.SwiperInstance]}},swiperOptions:function(){return this.options||this.defaultOptions},wrapperClass:function(){return this.swiperOptions.wrapperClass||l.wrapperClass}},methods:{handleSwiperClick:function(e){p(this.swiperInstance,e,this.$emit.bind(this))},autoReLoopSwiper:function(){var e,t;if(this.swiperInstance&&this.swiperOptions.loop){var n=this.swiperInstance;null===(e=null==n?void 0:n.loopDestroy)||void 0===e||e.call(n),null===(t=null==n?void 0:n.loopCreate)||void 0===t||t.call(n)}},updateSwiper:function(){var e,t,n,i,o,l,a,s;this[r.AutoUpdate]&&this.swiperInstance&&(this.autoReLoopSwiper(),null===(t=null===(e=this.swiperInstance)||void 0===e?void 0:e.update)||void 0===t||t.call(e),null===(i=null===(n=this.swiperInstance.navigation)||void 0===n?void 0:n.update)||void 0===i||i.call(n),null===(l=null===(o=this.swiperInstance.pagination)||void 0===o?void 0:o.render)||void 0===l||l.call(o),null===(s=null===(a=this.swiperInstance.pagination)||void 0===a?void 0:a.update)||void 0===s||s.call(a))},destroySwiper:function(){var e,t;this[r.AutoDestroy]&&this.swiperInstance&&this.swiperInstance.initialized&&(null===(t=null===(e=this.swiperInstance)||void 0===e?void 0:e.destroy)||void 0===t||t.call(e,this[r.DeleteInstanceOnDestroy],this[r.CleanupStylesOnDestroy]))},initSwiper:function(){this.swiperInstance=new e(this.$el,this.swiperOptions),c(this.swiperInstance,this.$emit.bind(this)),this.$emit(o.Ready,this.swiperInstance)}},mounted:function(){this.swiperInstance||this.initSwiper()},activated:function(){this.updateSwiper()},updated:function(){this.updateSwiper()},beforeDestroy:function(){this.$nextTick(this.destroySwiper)},render:function(e){return e("div",{staticClass:l.containerClass,on:{click:this.handleSwiperClick}},[this.$slots[d.ParallaxBg],e("div",{class:this.wrapperClass},this.$slots.default),this.$slots[d.Pagination],this.$slots[d.PrevButton],this.$slots[d.NextButton],this.$slots[d.Scrollbar]])}})}!function(e){e.ParallaxBg="parallax-bg",e.Pagination="pagination",e.Scrollbar="scrollbar",e.PrevButton="button-prev",e.NextButton="button-next"}(d||(d={}));var w=n.extend({name:i.SwiperSlideComponent,computed:{slideClass:function(){var e,t;return(null===(t=null===(e=this.$parent)||void 0===e?void 0:e.swiperOptions)||void 0===t?void 0:t.slideClass)||l.slideClass}},methods:{update:function(){var e,t=this.$parent;t[r.AutoUpdate]&&(null===(e=null==t?void 0:t.swiperInstance)||void 0===e||e.update())}},mounted:function(){this.update()},updated:function(){this.update()},render:function(e){return e("div",{class:this.slideClass},this.$slots.default)}}),S=function(e){var t=function(n,o){if(!t.installed){var r=h(e);o&&(r.options.props.defaultOptions.default=function(){return o}),n.component(i.SwiperComponent,r),n.component(i.SwiperSlideComponent,w),n.directive(i.SwiperDirective,f(e,o)),t.installed=!0}};return t};var y=function(e){var t;return(t={version:"4.1.1",install:S(e),directive:f(e)})[i.SwiperComponent]=h(e),t[i.SwiperSlideComponent]=w,t}(t),m=y.version,C=y.install,g=y.directive,I=y.Swiper,O=y.SwiperSlide;e.Swiper=I,e.SwiperSlide=O,e.default=y,e.directive=g,e.install=C,e.version=m,Object.defineProperty(e,"__esModule",{value:!0})});
+//# sourceMappingURL=/sm/20d7110b3463446defd51923206a17b7ff00b136457c620768cd77a8c5a24bfc.map
\ No newline at end of file
--- a/src/main/webapp/template/1/default/head-file.htm
+++ b/src/main/webapp/template/1/default/head-file.htm
@@ -8,7 +8,7 @@
 <meta name="description" content="{ms:global.descrip/}">
 <script type="text/javascript" src="{ms:global.host/}/static/plugins/vue/2.6.9/vue.min.js"></script>
 <link rel="stylesheet" href="{ms:global.host/}/static/plugins/minireset/0.0.2/minireset.min.css">
-<link rel="stylesheet" href="https://cdn.mingsoft.net/iconfont/iconfont.css">
+<link rel="stylesheet" href="{ms:global.host/}/iconfont/1.0.0/iconfont.css">
 <link rel="stylesheet" href="{ms:global.host/}/static/plugins/animate/4.1.0/animate.min.css">
 <script src="{ms:global.host/}/static/plugins/element-ui/2.15.7/index.min.js"></script>
 <link rel="stylesheet" href="{ms:global.host/}/static/plugins/element-ui/2.15.7/theme-chalk/index.min.css">
@@ -17,12 +17,13 @@
 <script src="{ms:global.host/}/static/plugins/axios/0.18.0/axios.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/2.0/ms.umd.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/swiper@4.5.1/dist/js/swiper.min.js"></script>
+<script src="{ms:global.host/}/static/plugins/swiper/6.4.1/swiper-bundle.js"></script>
+<link rel="stylesheet" href="{ms:global.host/}/static/plugins/swiper/6.4.1/swiper-bundle.css">
 <script>
    SwiperClass = Swiper
 </script>
-<script src="https://cdn.jsdelivr.net/npm/vue-awesome-swiper@4.1.1/dist/vue-awesome-swiper.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/swiper@5.4.5/css/swiper.min.css">
+<script src="{ms:global.host/}/static/plugins/vue-awesome-swiper/4.1.1/vue-awesome-swiper.min.js"></script>
+
 <script>
    Vue.use(VueAwesomeSwiper)
 </script>
@@ -30,9 +31,7 @@
    :root {
    --swiper-theme-color:$ {
        component.config.color.value
-    }
-
-    ;
+    };
    }

 </style>