From cf41fb285ff90ed6c855f9d5fa1260f588263bc8 Mon Sep 17 00:00:00 2001
From: msgroup <dev@mingsoft.net>
Date: Sat, 29 May 2021 05:46:37 +0800
Subject: [PATCH] =?UTF-8?q?5.2.2=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                            | 13 ++++++++-----
 src/main/resources/application.yml |  8 +++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ef07eb0..4442cf8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>net.mingsoft</groupId>
-        <artifactId>ms-pom</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.13.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.mingsoft</groupId>
     <artifactId>ms-mcms</artifactId>
-    <version>5.2.2-SNAPSHOT</version>
+    <version>5.2.2</version>
     <name>ms-mcms</name>
     <!-- 打包war包 -->
     <!--    <packaging>war</packaging>-->
@@ -43,19 +43,22 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-base</artifactId>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-basic</artifactId>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-mdiy</artifactId>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>store-client</artifactId>
-
+            <version>2.1.1</version>
         </dependency>
 
     </dependencies>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7683608d..912bfdc7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,8 +2,8 @@ server:
   port: 8080
   servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱
 #  ssl: #https证书配置 配置了之后只能通过https访问应用
-#    key-store: ms.pfx 证书文件
-#    key-store-password: 3MU9t9Cz 证书密码
+#    key-store: xxx.pfx 证书文件
+#    key-store-password:  1234 证书密码
 
 logging:
   level:
@@ -12,8 +12,6 @@ logging:
     name: mcms.log #会在项目的根目录下生成对应的mcms.log文件，也可以根据实际情况写绝对路径，例如：d:/mcms.log
     path: log #会在项目的根目录下生成log目录，里面会生成对应的日期目录，日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件，例如：log/2020-01/app-2020-01-03-18.1.log.gz（表示2020年1月3号下午六点的第一个备份），也可以根据实际情况写绝对路径，例如：d:/log
 ms:
-  mstore-url: http://store.i.mingsoft.net
-  mstore-host: store.i.mingsoft.net
   diy:
     html-dir: html
   #  scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题
@@ -22,7 +20,7 @@ ms:
   manager:
     path: /ms #后台访问的路径，如:http://项目/ms/login.do，生产的时候建议修改
     view-path: /WEB-INF/manager #后台视图层路径配置
-    check-code: false #默认开启验证码验证，false验证码不验证
+    check-code: true #默认开启验证码验证，false验证码不验证
 
   upload:
     enable-web: true  #启用web层的上传