升级依赖版本为3.3

pom.xml

@@ -7,7 +7,7 @@
     <groupId>co.yixiang</groupId>
     <artifactId>yshop</artifactId>
     <packaging>pom</packaging>
-    <version>3.2</version>
+    <version>3.3</version>
 
     <modules>
         <module>yshop-common</module>

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 &

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

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

yshop-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-generator</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>co.yixiang</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-shop</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-weixin</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>

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:

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:

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:

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:

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

yshop-app/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-weixin</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-message</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>co.yixiang</groupId>

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:

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:

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:

yshop-app/src/main/resources/config/application.yml

@@ -73,7 +73,7 @@ logging:
 
 yshop:
   #相关配置
-  version: 3.2
+  version: 3.3
 
 # 防止XSS攻击
 xss:

yshop-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-mproot</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

yshop-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-common</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
 
         <!--模板引擎-->

yshop-logging/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,12 +16,12 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-common</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-mproot</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

yshop-mall/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-tools</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
 
     </dependencies>

yshop-message/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-mall</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
     </dependencies>
 

yshop-mproot/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>MyBatisPlus模块</name>

yshop-shop/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-weixin</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
     </dependencies>
 

yshop-tools/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-logging</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
 
         <!--邮件依赖-->

yshop-weixin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yshop</artifactId>
         <groupId>co.yixiang</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-mall</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
         </dependency>
     </dependencies>