diff --git a/litemall-admin-api/pom.xml b/litemall-admin-api/pom.xml
index 5e7f2757dedd12423eec6808773e9b06ea70fec3..d1dc5d08c4686c3f124b4b99bf8c25b27af69312 100644
--- a/litemall-admin-api/pom.xml
+++ b/litemall-admin-api/pom.xml
@@ -44,11 +44,12 @@
             <groupId>com.github.penggle</groupId>
             <artifactId>kaptcha</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.6</version>
-        </dependency>
+        		<dependency>
+	 		 <groupId>com.github.xiaoymin</groupId>
+	 		 <artifactId>knife4j-spring-boot-autoconfigure</artifactId>
+
+		</dependency>
+
     </dependencies>
 
     <build>
@@ -68,4 +69,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/AdminSwagger2Configuration.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/AdminSwagger2Configuration.java
index e16ba1bab60da9d854f84120069a17c83c7c3893..f974fdaa596da2520e83db1dcaf3676d753ebee6 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/AdminSwagger2Configuration.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/AdminSwagger2Configuration.java
@@ -1,13 +1,15 @@
 package org.linlinjava.litemall.admin.config;
 
-import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -22,7 +24,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @Configuration
 @EnableSwagger2
-@EnableSwaggerBootstrapUI
+@EnableKnife4j
 public class AdminSwagger2Configuration {
     @Bean
     public Docket adminDocket() {
@@ -41,7 +43,7 @@ public class AdminSwagger2Configuration {
                 .title("litemall-admin API")
                 .description("litemall管理后台API")
                 .termsOfServiceUrl("https://github.com/linlinjava/litemall")
-                .contact("https://github.com/linlinjava/litemall")
+                .contact(new Contact("litemall", "https://github.com/linlinjava/litemall", "mailpath"))
                 .version("1.0")
                 .build();
     }
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
index eaad1c4a6a084bfbc78db872e8830123d5bcd0a1..4be30ce4da6034e910033749aa84cc669f08f157 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
@@ -14,7 +14,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @RestController
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
index a8bc1b2b4d7fc1259125f729b034c1895ec6bd57..9265a07246e1dde769bfb4d92498c2f1993459b1 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
@@ -19,7 +19,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 import static org.linlinjava.litemall.admin.util.AdminResponseCode.*;
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java
index d8cff59160c795b7873850f5702bccd1c28edc72..e575655ac0ab1e9550067d078f3552f6558371e1 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java
@@ -14,7 +14,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java
index f22cb5c2cff73e1f1ca1012b04121e49bcde7b26..81e3612e89bebeba8e65efba6e956ba38f279581 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java
@@ -13,7 +13,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
index ea7cf706c3aec103132748f53032568e42611b48..465fa97c62f5c1ad97117d4a6eaa4c1d3aa2dd7e 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
@@ -17,7 +17,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @RestController
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
index c0fe6de024976342c2f90da2d45c637cf7decb94..9ae9abe3bef4e139cc154a005c243a4a9d4faf2a 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @RestController
 @RequestMapping("/admin/goods")
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java
index a71c37624cd1c177ccbea82901df907d1a3b7c03..cbd83102f237f075a2e451d5fc591d8be98fa84d 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java
@@ -14,7 +14,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @RestController
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
index 6643c864a1cf428ecbc71d6fccfcf38870ae05da..9f00bba07f09c30759083f5c099c0b45ee9a7c28 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
@@ -14,7 +14,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @RestController
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminNoticeController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminNoticeController.java
index 04531ef5d4f904c95e51a097576015db666a5eab..0123294ff7e34b061f2d7bf8e8eb977d02f442b7 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminNoticeController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminNoticeController.java
@@ -19,7 +19,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
index ce9bb5c37203e4766cc4be91fb787c538f536cf7..52f22807a78c0da766f2d96fd26ee075d6d78680 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
@@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
 
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java
index 6835f24e83cac38291f2106c38b9f62454a30290..6ef164fd3760a0605505c9f22a87f23589569ef6 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java
index 55a0726c54ec7ea996a3bc3a365d8f483c895c2d..0e8ce86c752a32b61a907cca3b398aabb89551a1 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java
@@ -27,7 +27,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.security.Security;
 import java.util.*;
 
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java
index 544fbb6c3fcf3dd8989f251265f4b0096fcdc0db..3ed961ca2769915350c76533896359a52851124c 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java
@@ -16,7 +16,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.List;
 
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java
index 4894444d6eeab24890ac90dc5eb6c0b5b200a987..f7b70280113bd8959e5a640865c53abd4be03a85 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java
@@ -18,7 +18,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java
index 839a83d8397f0c2db3e7af9cb1b5a5bab0c06d1d..59a7a0493f5c63ac11d9a5899f2452a5c1d02e28 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @RestController
 @RequestMapping("/admin/user")
diff --git a/litemall-admin/src/views/mall/category.vue b/litemall-admin/src/views/mall/category.vue
index 0ec8eb778fcb3bdd38ea87250c35d4d9e7ab0eb5..d87e7c78abfbfa5759d42f6c4668e8101ac841c0 100644
--- a/litemall-admin/src/views/mall/category.vue
+++ b/litemall-admin/src/views/mall/category.vue
@@ -9,9 +9,9 @@
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row row-key="id">
 
-      <el-table-column align="center" label="类目ID" prop="id"/>
+      <el-table-column align="center" label="类目ID" prop="id" />
 
-      <el-table-column align="center" label="类目名" prop="name"/>
+      <el-table-column align="center" label="类目名" prop="name" />
 
       <el-table-column align="center" property="iconUrl" label="类目图标">
         <template slot-scope="scope">
@@ -25,9 +25,9 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="关键字" prop="keywords"/>
+      <el-table-column align="center" label="关键字" prop="keywords" />
 
-      <el-table-column align="center" min-width="100" label="简介" prop="desc"/>
+      <el-table-column align="center" min-width="100" label="简介" prop="desc" />
 
       <el-table-column align="center" label="级别" prop="level">
         <template slot-scope="scope">
@@ -47,20 +47,20 @@
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="dataForm" status-icon label-position="left" label-width="100px" style="width: 400px; margin-left:50px;">
         <el-form-item label="类目名称" prop="name">
-          <el-input v-model="dataForm.name"/>
+          <el-input v-model="dataForm.name" />
         </el-form-item>
         <el-form-item label="关键字" prop="keywords">
-          <el-input v-model="dataForm.keywords"/>
+          <el-input v-model="dataForm.keywords" />
         </el-form-item>
         <el-form-item label="级别" prop="level">
           <el-select v-model="dataForm.level" @change="onLevelChange">
-            <el-option label="一级类目" value="L1"/>
-            <el-option label="二级类目" value="L2"/>
+            <el-option label="一级类目" value="L1" />
+            <el-option label="二级类目" value="L2" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="dataForm.level === 'L2'" label="父类目" prop="pid">
           <el-select v-model="dataForm.pid">
-            <el-option v-for="item in catL1" :key="item.value" :label="item.label" :value="item.value"/>
+            <el-option v-for="item in catL1" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="类目图标" prop="iconUrl">
@@ -70,9 +70,10 @@
             :show-file-list="false"
             :on-success="uploadIconUrl"
             class="avatar-uploader"
-            accept=".jpg,.jpeg,.png,.gif">
+            accept=".jpg,.jpeg,.png,.gif"
+          >
             <img v-if="dataForm.iconUrl" :src="dataForm.iconUrl" class="avatar">
-            <i v-else class="el-icon-plus avatar-uploader-icon"/>
+            <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
         </el-form-item>
         <el-form-item label="类目图片" prop="picUrl">
@@ -82,13 +83,14 @@
             :show-file-list="false"
             :on-success="uploadPicUrl"
             class="avatar-uploader"
-            accept=".jpg,.jpeg,.png,.gif">
+            accept=".jpg,.jpeg,.png,.gif"
+          >
             <img v-if="dataForm.picUrl" :src="dataForm.picUrl" class="avatar">
-            <i v-else class="el-icon-plus avatar-uploader-icon"/>
+            <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
         </el-form-item>
         <el-form-item label="类目简介" prop="desc">
-          <el-input v-model="dataForm.desc"/>
+          <el-input v-model="dataForm.desc" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/litemall-admin/src/views/user/user.vue b/litemall-admin/src/views/user/user.vue
index ecfe77f85725391a074acdff36914bbe47a3c44c..3c421fbe1430717dfe7d5f9bde9ceb1878eb8302 100644
--- a/litemall-admin/src/views/user/user.vue
+++ b/litemall-admin/src/views/user/user.vue
@@ -3,18 +3,18 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.username" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户名"/>
-      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户Id"/>
-      <el-input v-model="listQuery.mobile" clearable class="filter-item" style="width: 200px;" placeholder="请输入手机号"/>
+      <el-input v-model="listQuery.username" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户名" />
+      <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 200px;" placeholder="请输入用户Id" />
+      <el-input v-model="listQuery.mobile" clearable class="filter-item" style="width: 200px;" placeholder="请输入手机号" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
 
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
-      <el-table-column align="center" width="100px" label="用户ID" prop="id" sortable/>
+      <el-table-column align="center" width="100px" label="用户ID" prop="id" sortable />
 
-      <el-table-column align="center" label="用户昵称" prop="nickname"/>
+      <el-table-column align="center" label="用户昵称" prop="nickname" />
 
       <el-table-column align="center" label="用户头像" width="80">
         <template slot-scope="scope">
@@ -22,19 +22,19 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="手机号码" prop="mobile"/>
+      <el-table-column align="center" label="手机号码" prop="mobile" />
 
       <el-table-column align="center" label="性别" prop="gender">
         <template slot-scope="scope">
-          <el-tag >{{ genderDic[scope.row.gender] }}</el-tag>
+          <el-tag>{{ genderDic[scope.row.gender] }}</el-tag>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="生日" prop="birthday"/>
+      <el-table-column align="center" label="生日" prop="birthday" />
 
       <el-table-column align="center" label="用户等级" prop="userLevel">
         <template slot-scope="scope">
-          <el-tag >{{ levelDic[scope.row.userLevel] }}</el-tag>
+          <el-tag>{{ levelDic[scope.row.userLevel] }}</el-tag>
         </template>
       </el-table-column>
 
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import { fetchList ,userDetail ,updateUser } from '@/api/user'
+import { fetchList, userDetail, updateUser } from '@/api/user'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 
 export default {
@@ -107,7 +107,7 @@ export default {
       levelDic: ['普通用户', 'VIP用户', '高级VIP用户'],
       statusDic: ['可用', '禁用', '注销'],
       userDialogVisible: false,
-      userDetail:{
+      userDetail: {
       }
     }
   },
@@ -117,14 +117,14 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-      if(this.listQuery.userId){
+      if (this.listQuery.userId) {
         userDetail(this.listQuery.userId).then(response => {
-          this.list = [];
-          if(response.data.data){
+          this.list = []
+          if (response.data.data) {
             this.list.push(response.data.data)
             this.total = 1
             this.listLoading = false
-          }else{
+          } else {
             this.list = []
             this.total = 0
             this.listLoading = false
@@ -134,7 +134,7 @@ export default {
           this.total = 0
           this.listLoading = false
         })
-      }else{
+      } else {
         fetchList(this.listQuery).then(response => {
           this.list = response.data.data.list
           this.total = response.data.data.total
@@ -163,8 +163,8 @@ export default {
       this.userDetail = row
       this.userDialogVisible = true
     },
-    handleUserUpdate(){
-     updateUser(this.userDetail)
+    handleUserUpdate() {
+      updateUser(this.userDetail)
         .then((response) => {
           this.userDialogVisible = false
           this.$notify.success({
diff --git a/litemall-all/pom.xml b/litemall-all/pom.xml
index ca0ad31ad5d69afd0b163ffa3806fdd6397bc10e..e26340d68a611ac4c5707248768ea6627f291840 100644
--- a/litemall-all/pom.xml
+++ b/litemall-all/pom.xml
@@ -35,10 +35,15 @@
     </dependencies>
 
     <build>
-        <plugins>
+      <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                <!-- devtools依赖此配置（否则，devtools不生效）。 -->
+                  <fork>true</fork>
+                </configuration>
+
                 <executions>
                     <execution>
                         <id>repackage</id>
@@ -88,4 +93,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/litemall-all/src/main/java/org/linlinjava/litemall/Application.java b/litemall-all/src/main/java/org/linlinjava/litemall/Application.java
index fe5ef3fdc597052b64a5a649caa57613c81cfae6..da7bc90ed1d35c383f9b533d648eb482019baf27 100644
--- a/litemall-all/src/main/java/org/linlinjava/litemall/Application.java
+++ b/litemall-all/src/main/java/org/linlinjava/litemall/Application.java
@@ -5,7 +5,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
+@EnableWebMvc
 @SpringBootApplication(scanBasePackages = {"org.linlinjava.litemall"})
 @MapperScan("org.linlinjava.litemall.db.dao")
 @EnableTransactionManagement
@@ -16,4 +18,4 @@ public class Application {
         SpringApplication.run(Application.class, args);
     }
 
-}
\ No newline at end of file
+}
diff --git a/litemall-all/src/main/resources/application.yml b/litemall-all/src/main/resources/application.yml
index 6caba81025a772da5e09526fcfbd75b0a0287e71..22e840a8dd593f8e1ecfd4252f0d8b248dd4fc0e 100644
--- a/litemall-all/src/main/resources/application.yml
+++ b/litemall-all/src/main/resources/application.yml
@@ -1,4 +1,8 @@
 spring:
+  devtools:
+    restart:
+      enabled: true
+      exclude: WEB-INF/**,static/**
   profiles:
     active: db, core, admin, wx
   messages:
@@ -19,4 +23,4 @@ logging:
   config: classpath:logback-spring.xml
 
 swagger:
-  production: false
\ No newline at end of file
+  production: false
diff --git a/litemall-core/pom.xml b/litemall-core/pom.xml
index b0e51ad2413f75718a20f60de5d2a8568aeb073b..dcda51fc9821ab68a7f326da9cc72738f2817a2a 100644
--- a/litemall-core/pom.xml
+++ b/litemall-core/pom.xml
@@ -80,6 +80,18 @@
             <groupId>org.linlinjava</groupId>
             <artifactId>litemall-db</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+        <dependency>
+    <groupId>jakarta.el</groupId>
+    <artifactId>jakarta.el-api</artifactId>
+        </dependency>
+        <dependency>
+    <groupId>org.glassfish</groupId>
+    <artifactId>jakarta.el</artifactId>
+</dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/config/CorsConfig.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/CorsConfig.java
index 29f01ea2586d6443b21a68ff3644a3be6755fa44..258d6ce71515d1c0b799492121a9650a0bfd6dc8 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/config/CorsConfig.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/CorsConfig.java
@@ -13,7 +13,7 @@ public class CorsConfig {
 
     private CorsConfiguration buildConfig() {
         CorsConfiguration corsConfiguration = new CorsConfiguration();
-        corsConfiguration.addAllowedOrigin("*"); // 1 设置访问源地址
+        corsConfiguration.addAllowedOriginPattern("*"); // 1 设置访问源地址
         corsConfiguration.addAllowedHeader("*"); // 2 设置访问源请求头
         corsConfiguration.addAllowedMethod("*"); // 3 设置访问源请求方法
         corsConfiguration.setMaxAge(maxAge);
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java
index a14078ef406ed1fde6ff3a64386bc6c294d022a8..47f1ea0edaa3b7b3384ede47e0e0776098719311 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java
@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.ValidationException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ValidationException;
 import java.util.Set;
 
 @ControllerAdvice
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/config/ValidatorConfiguration.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/ValidatorConfiguration.java
index 73cc474310e0113a907a64f3de61c361ff8244c9..5e5e50fb7617051a0bff7d29dc7db7a8ed6de3da 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/config/ValidatorConfiguration.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/ValidatorConfiguration.java
@@ -4,9 +4,10 @@ import org.hibernate.validator.HibernateValidator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+
 
 @Configuration
 public class ValidatorConfiguration {
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxConfig.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxConfig.java
index c97a92e535c14cbc06cb1d16e82a28baf58794a1..a7d7821d03116f58d41caa119b011d0620ab8da2 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxConfig.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxConfig.java
@@ -54,4 +54,4 @@ public class WxConfig {
         wxPayService.setConfig(payConfig);
         return wxPayService;
     }
-}
\ No newline at end of file
+}
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/Order.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/Order.java
index dfbaa2b35c2f94db569632a534172390ae083aba..08a22f8b4dfadf357bfa3e0a0fbf9f6f556f4bff 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/Order.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/Order.java
@@ -1,7 +1,7 @@
 package org.linlinjava.litemall.core.validator;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/OrderValidator.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/OrderValidator.java
index b163a117b2a39fe3ae790f5b279b857548aef2f7..1307b65bf915beeb1e2381bb1acaa3a8fc5e2a69 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/OrderValidator.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/OrderValidator.java
@@ -2,8 +2,8 @@ package org.linlinjava.litemall.core.validator;
 
 import com.google.common.collect.Lists;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import java.util.List;
 
 public class OrderValidator implements ConstraintValidator<Order, String> {
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/Sort.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/Sort.java
index 2568e709926684def3a5e0fd3e69163106f3d365..acb69dcf9af47a1ea7a0274444bb61f07c523981 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/Sort.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/Sort.java
@@ -1,7 +1,7 @@
 package org.linlinjava.litemall.core.validator;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/SortValidator.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/SortValidator.java
index eca179bba568608e20a4cca2a5e2b60cff7a01d7..a573ae28d2f46819b6720f898e4ffb1e7cdd07d3 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/SortValidator.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/validator/SortValidator.java
@@ -2,8 +2,8 @@ package org.linlinjava.litemall.core.validator;
 
 import com.google.common.collect.Lists;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import java.util.List;
 
 public class SortValidator implements ConstraintValidator<Sort, String> {
diff --git a/litemall-db/pom.xml b/litemall-db/pom.xml
index 2b6326a836eeed3b1e86e92b8f00ca5135f53488..43b08a1c679a7a94bb2c341507138f17463d9c17 100644
--- a/litemall-db/pom.xml
+++ b/litemall-db/pom.xml
@@ -57,7 +57,7 @@
                     <dependency>
                         <groupId>mysql</groupId>
                         <artifactId>mysql-connector-java</artifactId>
-                        <version>8.0.16</version>
+                        <version>8.0.28</version>
                     </dependency>
                     <dependency>
                         <groupId>com.itfsw</groupId>
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddress.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddress.java
index abdc49297afe2f0f2e0659c03ac1258db67fdbac..0f69951bb9e903a5cae11d96aaba1cae08e2a2cd 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddress.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddress.java
@@ -835,4 +835,4 @@ public class LitemallAddress {
             return this.getEscapedColumnName();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/litemall-vue/package.json b/litemall-vue/package.json
index c060043cdc26262a256d8fe0ac889f5599b4e3b8..813fb4751812aed3a1cf283c3865889d02820767 100644
--- a/litemall-vue/package.json
+++ b/litemall-vue/package.json
@@ -32,7 +32,7 @@
     "@vue/eslint-config-prettier": "^3.0.5",
     "babel-plugin-import": "^1.9.1",
     "babel-plugin-lodash": "^3.3.4",
-    "node-sass": "^4.9.3",
+    "sass": "^1.49.9",
     "sass-loader": "^7.1.0",
     "vue-template-compiler": "^2.5.17"
   },
diff --git a/litemall-wx-api/pom.xml b/litemall-wx-api/pom.xml
index f9ac53a2431753ae958d6e03ec0290e0e8e5297d..f24844cf0bbf24feff5f274568ec055a72140753 100644
--- a/litemall-wx-api/pom.xml
+++ b/litemall-wx-api/pom.xml
@@ -62,8 +62,9 @@
 		<!--引入ui包-->
 		<dependency>
 	 		 <groupId>com.github.xiaoymin</groupId>
-	 		 <artifactId>swagger-bootstrap-ui</artifactId>
+	 		 <artifactId>knife4j-spring-boot-autoconfigure</artifactId>
 		</dependency>
+
 		<dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -93,4 +94,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxSwagger2Configuration.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxSwagger2Configuration.java
index f7a8b6aaf467e4544acb0aff3e4bc3aef0022a57..f906afad4a3b985b8fa0571f81de9ed582f90d17 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxSwagger2Configuration.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxSwagger2Configuration.java
@@ -1,15 +1,18 @@
 package org.linlinjava.litemall.wx.config;
 
-import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 
 /**
  * swagger在线文档配置<br>
@@ -21,7 +24,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @Configuration
 @EnableSwagger2
-@EnableSwaggerBootstrapUI
+@EnableKnife4j
 public class WxSwagger2Configuration {
     @Bean
     public Docket wxDocket() {
@@ -34,13 +37,13 @@ public class WxSwagger2Configuration {
                 .paths(PathSelectors.any())
                 .build();
     }
-
+    // FIXME: url not correct
     private ApiInfo wxApiInfo() {
         return new ApiInfoBuilder()
                 .title("litemall-wx API")
                 .description("litemall小商场API")
                 .termsOfServiceUrl("https://github.com/linlinjava/litemall")
-                .contact("https://github.com/linlinjava/litemall")
+                .contact(new Contact("litemall", "https://github.com/linlinjava/litemall", "mailpath"))
                 .version("1.0")
                 .build();
     }
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
index 693b5a6e4910bb2a75950aa9282a918878f863b2..ec9fda3d04370f09d0909f519b384eee53730b28 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
@@ -14,7 +14,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -183,4 +183,4 @@ public class WxAddressController extends GetRegionService {
 		addressService.delete(id);
 		return ResponseUtil.ok();
 	}
-}
\ No newline at end of file
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAftersaleController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAftersaleController.java
index ba11bf9c5147e2ba8e2ecbece20ad6f2d3883e32..3ca285ca3650f30d0bae4921be65a9b8d781e849 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAftersaleController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAftersaleController.java
@@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -221,4 +221,4 @@ public class WxAftersaleController {
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java
index 3fdac9f117aea6d5840c2a196fdd3aaacf047558..a45932ea17e402b3bce52c00052002fb08981364 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,4 +62,4 @@ public class WxBrandController {
 
         return ResponseUtil.ok(entity);
     }
-}
\ No newline at end of file
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java
index cc8c7f11e7e3a20688a5e3c0e0ccae58e68adcfc..11be2b852116d432ad644851c9e9a0a89af01855 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java
index 55641b26c9cb7649af7c0e9c1f9e42474d03bd37..94d313a6fa550b0e4aa1d030815ed6d3c22a07ca 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java
@@ -5,7 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.logging.Log;
@@ -130,4 +130,4 @@ public class WxCollectController {
 
         return ResponseUtil.ok();
     }
-}
\ No newline at end of file
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java
index 98902d6e88182ba713301ede6b04596b35bfc335..0d0780f1fec007aacc811b1b21515b53bd187709 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java
@@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -151,4 +151,4 @@ public class WxCommentController {
         }
         return ResponseUtil.okList(commentVoList, commentList);
     }
-}
\ No newline at end of file
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
index ae53efa5ecf087893067eb6328aad4f85c033e85..e5ea3cb1c99228a2c046dcfe31ace9c8f99be4cb 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -326,4 +326,4 @@ public class WxGoodsController {
 		return ResponseUtil.ok(goodsCount);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java
index 57765f56a0e0af8c0d6bde84e436b759f3620988..c491fcc7d9cab6599c471a6e703927cc6e8c0b9c 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
index 66e5d7c7558c2ecd2f8a8ff7ca6f4b6d00e88739..91efe5dda45d82ee35eead6b872881e25afa5d1f 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -193,4 +193,4 @@ public class WxHomeController {
         about.put("latitude", SystemConfig.getMallLatitude());
         return ResponseUtil.ok(about);
     }
-}
\ No newline at end of file
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
index 230a259f978c6373423ca5b84ba499ce175ca06b..468eb8b2af2abd23c3e5493dab42f5a34343e231 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @RestController
 @RequestMapping("/wx/order")
@@ -180,4 +180,4 @@ public class WxOrderController {
         return wxOrderService.comment(userId, body);
     }
 
-}
\ No newline at end of file
+}
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java
index 92be37344114bc0489c529d69e1966aa990b7ebd..5f5335e84bd3e70a1f89f72a02a2817352424606 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
index c009e1be64ddefdf1843dfc9bb7a996c5d0db607..9eca54b44df40cf7d397a3c63e346a0c7ef3ac98 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -96,4 +96,4 @@ public class WxTopicController {
         List<LitemallTopic> topicRelatedList = topicService.queryRelatedList(id, 0, 4);
         return ResponseUtil.okList(topicRelatedList);
     }
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 30981e8c3ed024b51ac72b39647ec62b5471423f..c7d8a47212570ca122f509298521dc0ab8110f1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,13 +9,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.5.RELEASE</version>
+        <version>2.6.6</version>
         <relativePath/>
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
@@ -60,99 +60,116 @@
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>
                 <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>1.3.2</version>
+                <version>2.2.2</version>
             </dependency>
 
             <!-- Spring Boot pagehelper 依赖 -->
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>1.2.5</version>
+                <version>1.4.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-spring-boot-web-starter</artifactId>
-                <version>1.6.0</version>
+                <version>1.9.0</version>
             </dependency>
+<dependency>
+    <groupId>jakarta.validation</groupId>
+    <artifactId>jakarta.validation-api</artifactId>
+    <version>3.0.1</version>
+</dependency>
+<dependency>
+    <groupId>jakarta.el</groupId>
+    <artifactId>jakarta.el-api</artifactId>
+    <version>4.0.0</version>
+</dependency>
+<!-- https://mvnrepository.com/artifact/org.glassfish/jakarta.el -->
+<dependency>
+    <groupId>org.glassfish</groupId>
+    <artifactId>jakarta.el</artifactId>
+    <version>4.0.0</version>
+</dependency>
+
 
             <dependency>
                 <groupId>org.hibernate.validator</groupId>
                 <artifactId>hibernate-validator</artifactId>
-                <version>6.1.5.Final</version>
+                <version>7.0.4.Final</version>
             </dependency>
 
             <!-- MySQL 连接驱动依赖 -->
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>8.0.16</version>
+                <version>8.0.28</version>
             </dependency>
 
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid-spring-boot-starter</artifactId>
-                <version>1.2.1</version>
+                <version>1.2.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.github.binarywang</groupId>
                 <artifactId>weixin-java-pay</artifactId>
-                <version>4.1.0</version>
+                <version>4.2.9.B</version>
             </dependency>
 
             <dependency>
                 <groupId>com.github.binarywang</groupId>
                 <artifactId>weixin-java-miniapp</artifactId>
-                <version>4.1.0</version>
+                <version>4.2.9.B</version>
             </dependency>
 
             <dependency>
                 <groupId>com.github.qcloudsms</groupId>
                 <artifactId>qcloudsms</artifactId>
-                <version>1.0.5</version>
+                <version>1.0.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.qcloud</groupId>
                 <artifactId>cos_api</artifactId>
-                <version>5.6.24</version>
+                <version>5.6.71</version>
             </dependency>
 
             <dependency>
                 <groupId>com.aliyun.oss</groupId>
                 <artifactId>aliyun-sdk-oss</artifactId>
-                <version>2.5.0</version>
+                <version>3.14.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.qiniu</groupId>
                 <artifactId>qiniu-java-sdk</artifactId>
-                <version>[7.2.0, 7.2.99]</version>
+                <version>7.9.5</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-json</artifactId>
-                <version>2.1.5.RELEASE</version>
+                <version>2.6.6</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-mail</artifactId>
-                <version>2.1.5.RELEASE</version>
+                <version>2.6.6</version>
             </dependency>
 
             <dependency>
 		       <groupId>io.springfox</groupId>
 			   <artifactId>springfox-swagger2</artifactId>
-			   <version>2.9.2</version>
+			   <version>3.0.0</version>
 		   </dependency>
 		
 		<dependency>
 			  <groupId>io.springfox</groupId>
 			  <artifactId>springfox-swagger-ui</artifactId>
-			  <version>2.9.2</version>
+			  <version>3.0.0</version>
 		</dependency>
 
         <dependency>
@@ -164,25 +181,25 @@
 		<!--引入ui包-->
 		<dependency>
 	 		 <groupId>com.github.xiaoymin</groupId>
-	 		 <artifactId>swagger-bootstrap-ui</artifactId>
-	 		<version>1.9.6</version>
+	 		 <artifactId>knife4j-spring-boot-autoconfigure</artifactId>
+	 		<version>3.0.3</version>
 		</dependency>
 		<dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.0-jre</version>
+            <version>31.1-jre</version>
         </dependency>
 
             <dependency>
                 <groupId>com.auth0</groupId>
                 <artifactId>java-jwt</artifactId>
-                <version>3.4.1</version>
+                <version>3.19.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.aliyun</groupId>
                 <artifactId>aliyun-java-sdk-core</artifactId>
-                <version>4.0.3</version>
+                <version>4.6.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -212,19 +229,19 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.6</version>
+            <version>1.7.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.6</version>
+            <version>2.0.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>4.4.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -237,8 +254,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>13</source>
+                    <target>13</target>
                 </configuration>
             </plugin>
         </plugins>