🎉 4.2.0.RELEASE 重构包名，分类core模块与starter模块

README.md

@@ -1,5 +1,5 @@
  <p align="center">
-      <img src="https://img.shields.io/badge/Release-V4.1.0-green.svg" alt="Downloads">
+      <img src="https://img.shields.io/badge/Release-V4.2.0-green.svg" alt="Downloads">
       <img src="https://img.shields.io/badge/JDK-17+-green.svg" alt="Build Status">
   <img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
    <img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
@@ -33,9 +33,9 @@
 |----------------------|------------|
 | Java                 | 17+        |
 | NodeJS               | 18+        |
-| Spring               | 6.1.10     |
+| Spring               | 6.1.12     |
-| Spring Boot          | 3.2.7      |
+| Spring Boot          | 3.2.9      |
-| Spring Cloud         | 2023.0.2   |
+| Spring Cloud         | 2023.0.3   |
 | Spring Cloud Alibaba | 2023.0.1.0 |
 | Nacos Alibaba        | 2.3.2      |
 | Mybatis Plus         | 3.5.7      |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "saber-admin",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "scripts": {
     "dev": "vite --host",
     "prod": "vite --mode production",

src/api/system/user.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/blade-user/list',
+    url: '/blade-system/user/list',
     method: 'get',
     params: {
       ...params,
@@ -13,7 +13,7 @@ export const getList = (current, size, params) => {
 }
 export const remove = (ids) => {
   return request({
-    url: '/blade-user/remove',
+    url: '/blade-system/user/remove',
     method: 'post',
     params: {
       ids,
@@ -23,7 +23,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/blade-user/submit',
+    url: '/blade-system/user/submit',
     method: 'post',
     data: row
   })
@@ -31,7 +31,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/blade-user/update',
+    url: '/blade-system/user/update',
     method: 'post',
     data: row
   })
@@ -39,7 +39,7 @@ export const update = (row) => {
 
 export const grant = (userIds, roleIds) => {
   return request({
-    url: '/blade-user/grant',
+    url: '/blade-system/user/grant',
     method: 'post',
     params: {
       userIds,
@@ -50,7 +50,7 @@ export const grant = (userIds, roleIds) => {
 
 export const getUser = (id) => {
   return request({
-    url: '/blade-user/detail',
+    url: '/blade-system/user/detail',
     method: 'get',
     params: {
       id,
@@ -60,14 +60,14 @@ export const getUser = (id) => {
 
 export const getUserInfo = () => {
   return request({
-    url: '/blade-user/info',
+    url: '/blade-system/user/info',
     method: 'get',
   })
 }
 
 export const resetPassword = (userIds) => {
   return request({
-    url: '/blade-user/reset-password',
+    url: '/blade-system/user/reset-password',
     method: 'post',
     params: {
       userIds,
@@ -77,7 +77,7 @@ export const resetPassword = (userIds) => {
 
 export const updatePassword = (oldPassword, newPassword, newPassword1) => {
   return request({
-    url: '/blade-user/update-password',
+    url: '/blade-system/user/update-password',
     method: 'post',
     params: {
       oldPassword,

src/api/user.js

@@ -54,7 +54,7 @@ export const refreshToken = (refreshToken) => request({
 })
 
 export const registerGuest = (form, oauthId) => request({
-  url: '/blade-user/register-guest',
+  url: '/blade-system/user/register-guest',
   method: 'post',
   params: {
     tenantId: form.tenantId,

src/views/report/reportlist.vue

@@ -25,7 +25,7 @@
       <template #menu="scope">
         <el-button text
                    type="primary"
-                   icon="el-icon-edit-outline"
+                   icon="el-icon-edit"
                    @click.stop="handleDesign(scope.row.name)">设计
         </el-button>
         <el-button text
@@ -109,11 +109,11 @@ export default {
     }
   },
   methods: {
-    handlePreview (name) {
+    handlePreview(name) {
-      this.$router.push({ path: `/myiframe/urlPath?name=preview-${name}&src=${website.reportUrl}/preview?_u=blade-${name}` });
+      window.open(`${this.website.reportUrl}/preview?_u=blade-${name}`);
     },
-    handleDesign (name) {
+    handleDesign(name) {
-      this.$router.push({ path: `/myiframe/urlPath?name=designer-${name}&src=${website.reportUrl}/designer?_u=blade-${name}` });
+      window.open(`${this.website.reportUrl}/designer?_u=blade-${name}`);
     },
     rowDel (row) {
       this.$confirm("确定将选择数据删除?", {

src/views/system/user.vue

@@ -41,7 +41,7 @@
         <el-button type="success"
                    plain
                    v-if="userInfo.authority.includes('admin')"
-                   icon="el-icon-upload2"
+                   icon="el-icon-upload"
                    @click="handleImport">导入
         </el-button>
         <el-button type="warning"
@@ -353,7 +353,7 @@ export default {
               res: 'data'
             },
             tip: '请上传 .xls,.xlsx 标准格式文件',
-            action: baseUrl + "/blade-user/import-user"
+            action: baseUrl + "/blade-system/user/import-user"
           },
           {
             label: '模板下载',
@@ -547,11 +547,11 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        window.open(`${baseUrl}/blade-user/export-user?blade-auth=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
+        window.open(`${baseUrl}/blade-system/user/export-user?blade-auth=bearer ${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
       });
     },
     handleTemplate () {
-      window.open(`${baseUrl}/blade-user/export-template?blade-auth=${getToken()}`);
+      window.open(`${baseUrl}/blade-system/user/export-template?blade-auth=bearer ${getToken()}`);
     },
     beforeOpen (done, type) {
       if (["edit", "view"].includes(type)) {

src/views/wel/index.vue

@@ -2,7 +2,7 @@
   <basic-container>
     <third-register></third-register>
     <p style="text-align: center;">
-      <img src="https://img.shields.io/badge/Release-V4.1.0-green.svg"
+      <img src="https://img.shields.io/badge/Release-V4.2.0-green.svg"
            alt="Downloads"/>
       <img src="https://img.shields.io/badge/JDK-17+-green.svg"
            alt="Build Status"/>
@@ -156,6 +156,17 @@
           <basic-container>
             <el-collapse v-model="logActiveNames"
                          @change="handleChange">
+              <el-collapse-item title="4.2.0发布 底层架构升级，分类core模块与starter模块"
+                                name="38">
+                <div>1.[升级]SpringBoot 至 3.2.9</div>
+                <div>2.[升级]SpringCloud 至 2023.0.3</div>
+                <div>3.[升级]底层架构升级，分类core模块与starter模块</div>
+                <div>4.[新增]Geo坐标工具</div>
+                <div>5.[新增]JsonUtil新增readListMap方法</div>
+                <div>6.[优化]将user模块合并至system模块，统一api入口</div>
+                <div>7.[修复]vue3版本报表列表跳转路径出错的问题</div>
+                <div>8.[修复]excel导出工具类版本冲突的问题</div>
+              </el-collapse-item>
               <el-collapse-item title="4.1.0发布 登录认证升级为国密算法，数据库password字段内容无需变动"
                                 name="37">
                 <div>1.[升级]SpringBoot 至 3.2.7</div>
@@ -617,7 +628,7 @@ export default {
   data() {
     return {
       activeNames: ['1', '2', '3', '5'],
-      logActiveNames: ['37']
+      logActiveNames: ['38']
     };
   },
   computed: {