From f23609e5b0b587230836f0b953cc7ab574fb77c6 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sun, 1 May 2022 14:36:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E4=B8=BA3.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
shell/start.sh | 2 +-
shell/stop.sh | 2 +-
yshop-admin/Dockerfile | 4 ++--
yshop-admin/pom.xml | 8 ++++----
yshop-admin/src/main/resources/config/application-dev.yml | 2 +-
.../src/main/resources/config/application-docker.yml | 2 +-
.../src/main/resources/config/application-prod.yml | 4 ++--
yshop-admin/src/main/resources/config/application.yml | 2 +-
yshop-app/Dockerfile | 4 ++--
yshop-app/pom.xml | 6 +++---
yshop-app/src/main/resources/config/application-dev.yml | 2 +-
.../src/main/resources/config/application-docker.yml | 2 +-
yshop-app/src/main/resources/config/application-prod.yml | 4 ++--
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 | 4 ++--
yshop-message/pom.xml | 4 ++--
yshop-mproot/pom.xml | 2 +-
yshop-shop/pom.xml | 4 ++--
yshop-tools/pom.xml | 4 ++--
yshop-weixin/pom.xml | 4 ++--
24 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2703bb62..f453a77d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
co.yixiang
yshop
pom
- 3.2
+ 3.3
yshop-common
diff --git a/shell/start.sh b/shell/start.sh
index 9ed76c25..abaae587 100644
--- a/shell/start.sh
+++ b/shell/start.sh
@@ -1 +1 @@
-nohup java -jar yshop-app-3.2.jar --spring.profiles.active=prod &
+nohup java -jar yshop-app-3.3.jar --spring.profiles.active=prod &
diff --git a/shell/stop.sh b/shell/stop.sh
index 3a823cb8..48a48f00 100644
--- a/shell/stop.sh
+++ b/shell/stop.sh
@@ -1,4 +1,4 @@
-PID=$(ps -ef | grep yshop-app-3.2.jar | grep -v grep | awk '{ print $2 }')
+PID=$(ps -ef | grep yshop-app-3.3.jar | grep -v grep | awk '{ print $2 }')
if [ -z "$PID" ];then
echo Application is already stopped
else
diff --git a/yshop-admin/Dockerfile b/yshop-admin/Dockerfile
index f8c3fa66..97825725 100644
--- a/yshop-admin/Dockerfile
+++ b/yshop-admin/Dockerfile
@@ -13,6 +13,6 @@ WORKDIR /yshop-admin
EXPOSE 8001
-ADD ./target/yshop-admin-3.2.jar ./
+ADD ./target/yshop-admin-3.3.jar ./
-CMD java $JAVA_OPTS -jar yshop-admin-3.2.jar --spring.profiles.active=docker
+CMD java $JAVA_OPTS -jar yshop-admin-3.3.jar --spring.profiles.active=docker
diff --git a/yshop-admin/pom.xml b/yshop-admin/pom.xml
index 36a06716..af2e5320 100644
--- a/yshop-admin/pom.xml
+++ b/yshop-admin/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -21,7 +21,7 @@
co.yixiang
yshop-generator
- 3.2
+ 3.3
co.yixiang
@@ -32,7 +32,7 @@
co.yixiang
yshop-shop
- 3.2
+ 3.3
org.springframework.boot
@@ -71,7 +71,7 @@
co.yixiang
yshop-weixin
- 3.2
+ 3.3
org.springframework.boot
diff --git a/yshop-admin/src/main/resources/config/application-dev.yml b/yshop-admin/src/main/resources/config/application-dev.yml
index de875921..f6abea01 100644
--- a/yshop-admin/src/main/resources/config/application-dev.yml
+++ b/yshop-admin/src/main/resources/config/application-dev.yml
@@ -87,7 +87,7 @@ swagger:
enabled: true
title: yshop商城管理后台API
serverUrl:
- version: 3.2
+ version: 3.3
# 文件存储路径
file:
diff --git a/yshop-admin/src/main/resources/config/application-docker.yml b/yshop-admin/src/main/resources/config/application-docker.yml
index bb1a6824..2e415537 100644
--- a/yshop-admin/src/main/resources/config/application-docker.yml
+++ b/yshop-admin/src/main/resources/config/application-docker.yml
@@ -94,7 +94,7 @@ swagger:
enabled: true
title: yshop商城管理后台API
serverUrl: http://127.0.0.1:8000
- version: 3.2
+ version: 3.3
file:
diff --git a/yshop-admin/src/main/resources/config/application-prod.yml b/yshop-admin/src/main/resources/config/application-prod.yml
index 274878ef..b4219165 100644
--- a/yshop-admin/src/main/resources/config/application-prod.yml
+++ b/yshop-admin/src/main/resources/config/application-prod.yml
@@ -6,7 +6,7 @@ spring:
druid:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3366/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: yshopb2c
password: bkfGfAimifjPZtNE
@@ -94,7 +94,7 @@ swagger:
enabled: false
title: yshop商城管理后台API
serverUrl: http://127.0.0.1:8000
- version: 3.2
+ version: 3.3
file:
diff --git a/yshop-admin/src/main/resources/config/application.yml b/yshop-admin/src/main/resources/config/application.yml
index 3f6e049d..9779b8f3 100644
--- a/yshop-admin/src/main/resources/config/application.yml
+++ b/yshop-admin/src/main/resources/config/application.yml
@@ -49,7 +49,7 @@ smms:
yshop:
# 配置
- version: 3.2
+ version: 3.3
apiUrl: http://127.0.0.1:8009/api
logging:
diff --git a/yshop-app/Dockerfile b/yshop-app/Dockerfile
index 08bcb7f3..87ebc546 100644
--- a/yshop-app/Dockerfile
+++ b/yshop-app/Dockerfile
@@ -13,6 +13,6 @@ WORKDIR /yshop-app
EXPOSE 8008
-ADD ./target/yshop-app-3.2.jar ./
+ADD ./target/yshop-app-3.3.jar ./
-CMD java $JAVA_OPTS -jar yshop-app-3.2.jar --spring.profiles.active=docker
+CMD java $JAVA_OPTS -jar yshop-app-3.3.jar --spring.profiles.active=docker
diff --git a/yshop-app/pom.xml b/yshop-app/pom.xml
index 46d040d2..212654c3 100644
--- a/yshop-app/pom.xml
+++ b/yshop-app/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -21,7 +21,7 @@
co.yixiang
yshop-weixin
- 3.2
+ 3.3
org.springframework.boot
@@ -33,7 +33,7 @@
co.yixiang
yshop-message
- 3.2
+ 3.3
co.yixiang
diff --git a/yshop-app/src/main/resources/config/application-dev.yml b/yshop-app/src/main/resources/config/application-dev.yml
index 8ca258c4..12ad74ee 100644
--- a/yshop-app/src/main/resources/config/application-dev.yml
+++ b/yshop-app/src/main/resources/config/application-dev.yml
@@ -79,7 +79,7 @@ swagger:
enabled: true
title: yshop商城移动端API
serverUrl: http://localhost:8009
- version: 3.2
+ version: 3.3
# 文件存储路径
file:
diff --git a/yshop-app/src/main/resources/config/application-docker.yml b/yshop-app/src/main/resources/config/application-docker.yml
index 693dee42..729df76e 100644
--- a/yshop-app/src/main/resources/config/application-docker.yml
+++ b/yshop-app/src/main/resources/config/application-docker.yml
@@ -86,7 +86,7 @@ swagger:
enabled: true
title: yshop商城移动端API
serverUrl: http://localhost:8009
- version: 3.2
+ version: 3.3
# 文件存储路径
file:
diff --git a/yshop-app/src/main/resources/config/application-prod.yml b/yshop-app/src/main/resources/config/application-prod.yml
index 68eb52e8..fd1f6149 100644
--- a/yshop-app/src/main/resources/config/application-prod.yml
+++ b/yshop-app/src/main/resources/config/application-prod.yml
@@ -5,7 +5,7 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://localhost:3366/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: yshopb2c
password: bkfGfAimifjPZtNE
# 从库数据源
@@ -86,7 +86,7 @@ swagger:
enabled: false
title: yshop商城移动端API
serverUrl: http://localhost:8009
- version: 3.2
+ version: 3.3
# 文件存储路径
file:
diff --git a/yshop-app/src/main/resources/config/application.yml b/yshop-app/src/main/resources/config/application.yml
index 9bd144e5..96ebd4a7 100644
--- a/yshop-app/src/main/resources/config/application.yml
+++ b/yshop-app/src/main/resources/config/application.yml
@@ -73,7 +73,7 @@ logging:
yshop:
#相关配置
- version: 3.2
+ version: 3.3
# 防止XSS攻击
xss:
diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml
index 85b675c4..240736ab 100644
--- a/yshop-common/pom.xml
+++ b/yshop-common/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -55,7 +55,7 @@
co.yixiang
yshop-mproot
- 3.2
+ 3.3
org.apache.httpcomponents
diff --git a/yshop-generator/pom.xml b/yshop-generator/pom.xml
index 56c6ff32..734825b7 100644
--- a/yshop-generator/pom.xml
+++ b/yshop-generator/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -20,7 +20,7 @@
co.yixiang
yshop-common
- 3.2
+ 3.3
diff --git a/yshop-logging/pom.xml b/yshop-logging/pom.xml
index 7b556baf..bb9cfc1a 100644
--- a/yshop-logging/pom.xml
+++ b/yshop-logging/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -16,12 +16,12 @@
co.yixiang
yshop-common
- 3.2
+ 3.3
co.yixiang
yshop-mproot
- 3.2
+ 3.3
compile
diff --git a/yshop-mall/pom.xml b/yshop-mall/pom.xml
index 3b00a342..87c70099 100644
--- a/yshop-mall/pom.xml
+++ b/yshop-mall/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -16,7 +16,7 @@
co.yixiang
yshop-tools
- 3.2
+ 3.3
diff --git a/yshop-message/pom.xml b/yshop-message/pom.xml
index 48d3595a..954a0c18 100644
--- a/yshop-message/pom.xml
+++ b/yshop-message/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -16,7 +16,7 @@
co.yixiang
yshop-mall
- 3.2
+ 3.3
diff --git a/yshop-mproot/pom.xml b/yshop-mproot/pom.xml
index e3401ec9..e82b0d60 100644
--- a/yshop-mproot/pom.xml
+++ b/yshop-mproot/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
MyBatisPlus模块
diff --git a/yshop-shop/pom.xml b/yshop-shop/pom.xml
index f9cba5dc..9d938852 100644
--- a/yshop-shop/pom.xml
+++ b/yshop-shop/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -20,7 +20,7 @@
co.yixiang
yshop-weixin
- 3.2
+ 3.3
diff --git a/yshop-tools/pom.xml b/yshop-tools/pom.xml
index 5ccb3f84..d6c1dac0 100644
--- a/yshop-tools/pom.xml
+++ b/yshop-tools/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -23,7 +23,7 @@
co.yixiang
yshop-logging
- 3.2
+ 3.3
diff --git a/yshop-weixin/pom.xml b/yshop-weixin/pom.xml
index c785d0f9..cdfae60a 100644
--- a/yshop-weixin/pom.xml
+++ b/yshop-weixin/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -21,7 +21,7 @@
co.yixiang
yshop-mall
- 3.2
+ 3.3