From 3a7e87738d2fa157467103fca3bd011dfdf7b1d9 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 14 Sep 2020 20:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0yshop3.1=E6=AD=A3=E5=BC=8F?=
=?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
yshop-admin/pom.xml | 8 ++++----
.../src/main/resources/config/application-prod.yml | 2 +-
yshop-admin/src/main/resources/config/application.yml | 2 +-
yshop-app/pom.xml | 6 +++---
yshop-app/src/main/resources/config/application-prod.yml | 2 +-
yshop-app/src/main/resources/config/application.yml | 2 +-
yshop-common/pom.xml | 4 ++--
yshop-generator/pom.xml | 4 ++--
yshop-logging/pom.xml | 6 +++---
yshop-mall/pom.xml | 6 +++---
yshop-message/pom.xml | 6 +++---
yshop-mproot/pom.xml | 2 +-
yshop-shop/pom.xml | 4 ++--
yshop-tools/pom.xml | 4 ++--
yshop-weixin/pom.xml | 4 ++--
16 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7e297489..4d90153f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
co.yixiang
yshop
pom
- 3.0
+ 3.1
yshop-common
diff --git a/yshop-admin/pom.xml b/yshop-admin/pom.xml
index d31ab886..e76538fc 100644
--- a/yshop-admin/pom.xml
+++ b/yshop-admin/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -21,7 +21,7 @@
co.yixiang
yshop-generator
- 3.0
+ 3.1
co.yixiang
@@ -32,7 +32,7 @@
co.yixiang
yshop-message
- 3.0
+ 3.1
co.yixiang
@@ -43,7 +43,7 @@
co.yixiang
yshop-shop
- 3.0
+ 3.1
org.springframework.boot
diff --git a/yshop-admin/src/main/resources/config/application-prod.yml b/yshop-admin/src/main/resources/config/application-prod.yml
index dc297bf2..be99295e 100644
--- a/yshop-admin/src/main/resources/config/application-prod.yml
+++ b/yshop-admin/src/main/resources/config/application-prod.yml
@@ -8,7 +8,7 @@ spring:
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
- password: xxcs@!2019
+ password:
# 初始化配置
initial-size: 3
diff --git a/yshop-admin/src/main/resources/config/application.yml b/yshop-admin/src/main/resources/config/application.yml
index d750cbb7..133f006c 100644
--- a/yshop-admin/src/main/resources/config/application.yml
+++ b/yshop-admin/src/main/resources/config/application.yml
@@ -47,7 +47,7 @@ smms:
yshop:
# 配置
- version: 3.0
+ version: 3.1
apiUrl: http://127.0.0.1:8009/api
mybatis-plus:
diff --git a/yshop-app/pom.xml b/yshop-app/pom.xml
index 8b2f0cc8..043e13c9 100644
--- a/yshop-app/pom.xml
+++ b/yshop-app/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -21,7 +21,7 @@
co.yixiang
yshop-weixin
- 3.0
+ 3.1
org.springframework.boot
@@ -33,7 +33,7 @@
co.yixiang
yshop-message
- 3.0
+ 3.1
co.yixiang
diff --git a/yshop-app/src/main/resources/config/application-prod.yml b/yshop-app/src/main/resources/config/application-prod.yml
index 5c73b9d5..424ec143 100644
--- a/yshop-app/src/main/resources/config/application-prod.yml
+++ b/yshop-app/src/main/resources/config/application-prod.yml
@@ -7,7 +7,7 @@ spring:
master:
url: jdbc:mysql://localhost:3306/yshopb2c?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: xxcs@!2019
+ password:
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/yshop-app/src/main/resources/config/application.yml b/yshop-app/src/main/resources/config/application.yml
index 6a6805fb..db82e3ea 100644
--- a/yshop-app/src/main/resources/config/application.yml
+++ b/yshop-app/src/main/resources/config/application.yml
@@ -75,7 +75,7 @@ logging:
yshop:
#相关配置
- version: 3.0
+ version: 3.1
# 防止XSS攻击
xss:
diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml
index c0d445a7..bd5b3141 100644
--- a/yshop-common/pom.xml
+++ b/yshop-common/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -55,7 +55,7 @@
co.yixiang
yshop-mproot
- 3.0
+ 3.1
org.apache.httpcomponents
diff --git a/yshop-generator/pom.xml b/yshop-generator/pom.xml
index 90aa7815..f1eec8db 100644
--- a/yshop-generator/pom.xml
+++ b/yshop-generator/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -20,7 +20,7 @@
co.yixiang
yshop-common
- 3.0
+ 3.1
diff --git a/yshop-logging/pom.xml b/yshop-logging/pom.xml
index 52ae3cd2..503781c8 100644
--- a/yshop-logging/pom.xml
+++ b/yshop-logging/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -16,12 +16,12 @@
co.yixiang
yshop-common
- 3.0
+ 3.1
co.yixiang
yshop-mproot
- 3.0
+ 3.1
compile
diff --git a/yshop-mall/pom.xml b/yshop-mall/pom.xml
index 79dfa399..eb865c37 100644
--- a/yshop-mall/pom.xml
+++ b/yshop-mall/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -16,9 +16,9 @@
co.yixiang
yshop-tools
- 3.0
+ 3.1
-
\ No newline at end of file
+
diff --git a/yshop-message/pom.xml b/yshop-message/pom.xml
index 7acf4d2f..1dde14cb 100644
--- a/yshop-message/pom.xml
+++ b/yshop-message/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -16,7 +16,7 @@
co.yixiang
yshop-mall
- 3.0
+ 3.1
org.apache.rocketmq
@@ -26,4 +26,4 @@
-
\ No newline at end of file
+
diff --git a/yshop-mproot/pom.xml b/yshop-mproot/pom.xml
index e7aeb1a1..fa523846 100644
--- a/yshop-mproot/pom.xml
+++ b/yshop-mproot/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
MyBatisPlus模块
diff --git a/yshop-shop/pom.xml b/yshop-shop/pom.xml
index 0f720174..626ff83d 100644
--- a/yshop-shop/pom.xml
+++ b/yshop-shop/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -20,7 +20,7 @@
co.yixiang
yshop-weixin
- 3.0
+ 3.1
diff --git a/yshop-tools/pom.xml b/yshop-tools/pom.xml
index 45851c2d..3252f8d3 100644
--- a/yshop-tools/pom.xml
+++ b/yshop-tools/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -23,7 +23,7 @@
co.yixiang
yshop-logging
- 3.0
+ 3.1
diff --git a/yshop-weixin/pom.xml b/yshop-weixin/pom.xml
index c9515643..f14d1ed7 100644
--- a/yshop-weixin/pom.xml
+++ b/yshop-weixin/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0
+ 3.1
4.0.0
@@ -16,7 +16,7 @@
co.yixiang
yshop-mall
- 3.0
+ 3.1