Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
1a24636197
|
@ -0,0 +1,53 @@
|
||||||
|
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:
|
||||||
|
- .*
|
|
@ -0,0 +1,51 @@
|
||||||
|
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
|
|
@ -0,0 +1,40 @@
|
||||||
|
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
|
|
@ -73,7 +73,7 @@ QQ交流群号: [![加入QQ群](https://img.shields.io/badge/五群-231211521-
|
||||||
建议开发者使用以下环境,这样避免版本带来的问题
|
建议开发者使用以下环境,这样避免版本带来的问题
|
||||||
* Windows、Linux
|
* Windows、Linux
|
||||||
* Eclipse、Idea
|
* Eclipse、Idea
|
||||||
* Mysql≧5.7
|
* Mysql≧5.7 (开启忽略大小写)
|
||||||
* JDK≧8
|
* JDK≧8
|
||||||
* Tomcat≧8
|
* Tomcat≧8
|
||||||
|
|
||||||
|
|
|
@ -23,12 +23,13 @@ ms:
|
||||||
xss:
|
xss:
|
||||||
xssEnable: true #xss过滤器的开关
|
xssEnable: true #xss过滤器的开关
|
||||||
filterUrl: /** #过滤的url,多个用逗号分开
|
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-url: http://store.i.mingsoft.net
|
||||||
# mstore-host: store.i.mingsoft.net
|
# mstore-host: store.i.mingsoft.net
|
||||||
# shiro-key: #16位长度,不填写默认随机生成
|
# shiro-key: #16位长度,不填写默认随机生成
|
||||||
cookie-name: SHIRO_SESSION_ID
|
cookie-name: SHIRO_SESSION_ID
|
||||||
html-dir: html
|
diy:
|
||||||
|
html-dir: html
|
||||||
rand-code:
|
rand-code:
|
||||||
length: 4 #验证码长度
|
length: 4 #验证码长度
|
||||||
circle: 10 #干扰线条数,值越大越不容易辨别
|
circle: 10 #干扰线条数,值越大越不容易辨别
|
||||||
|
|
File diff suppressed because one or more lines are too long
8
src/main/webapp/static/plugins/vue-awesome-swiper/4.1.1/vue-awesome-swiper.min.js
vendored
Normal file
8
src/main/webapp/static/plugins/vue-awesome-swiper/4.1.1/vue-awesome-swiper.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -8,7 +8,7 @@
|
||||||
<meta name="description" content="{ms:global.descrip/}">
|
<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>
|
<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="{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">
|
<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>
|
<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">
|
<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/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/qs/6.6.0/qs.min.js"></script>
|
||||||
<script src="{ms:global.host/}/static/plugins/ms/2.0/ms.umd.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>
|
<script>
|
||||||
SwiperClass = Swiper
|
SwiperClass = Swiper
|
||||||
</script>
|
</script>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/vue-awesome-swiper@4.1.1/dist/vue-awesome-swiper.min.js"></script>
|
<script src="{ms:global.host/}/static/plugins/vue-awesome-swiper/4.1.1/vue-awesome-swiper.min.js"></script>
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/swiper@5.4.5/css/swiper.min.css">
|
|
||||||
<script>
|
<script>
|
||||||
Vue.use(VueAwesomeSwiper)
|
Vue.use(VueAwesomeSwiper)
|
||||||
</script>
|
</script>
|
||||||
|
@ -30,9 +31,7 @@
|
||||||
:root {
|
:root {
|
||||||
--swiper-theme-color:$ {
|
--swiper-theme-color:$ {
|
||||||
component.config.color.value
|
component.config.color.value
|
||||||
}
|
};
|
||||||
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue