更新3.6.0

ruoyi-api/ruoyi-api-ext/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-api</artifactId>
-        <version>3.5.0</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/DictValidator.java

@@ -1,6 +1,6 @@
 package com.ruoyi.ext.api.validate;
 
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.TypeReference;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;

ruoyi-api/ruoyi-api-system/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-api-ext</artifactId>
-            <version>3.5.0</version>
+            <version>3.6.0</version>
         </dependency>
         
     </dependencies>

ruoyi-common/ruoyi-common-activiti/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.5.0</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtilMTab.java

@@ -525,7 +525,7 @@ public class ExcelUtilMTab
             {
                 // 创建cell
                 cell = row.createCell(column);
-                int align = attr.align().value();
+                int align = attr.align().getCode();
                 cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
 
                 // 用于读取对象中的属性

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java

@@ -2,9 +2,10 @@ package com.ruoyi.common.core.web.domain;
 
 import java.util.HashMap;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 import java.util.Objects;
+
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.utils.StringUtils;
 

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/AmountUtils.java

@@ -1,7 +1,7 @@
 package com.ruoyi.common.security.utils;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;

ruoyi-modules/mz-business/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.5.0</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/mz-datasync/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-modules</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.5.0</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/mz-organization/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.5.0</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/mz-portal/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.5.0</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/mz-search/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-modules</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.5.0</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-ui/package.json

@@ -1,96 +1,96 @@
-{
-    "name": "ruoyi",
-    "version": "3.5.0",
-    "description": "若依管理系统",
-    "author": "若依",
-    "license": "MIT",
-    "scripts": {
-        "dev": "vue-cli-service serve",
-        "build:prod": "vue-cli-service build",
-        "build:stage": "vue-cli-service build --mode staging",
-        "preview": "node build/index.js --preview",
-        "lint": "eslint --ext .js,.vue src"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "lint-staged"
-        }
-    },
-    "lint-staged": {
-        "src/**/*.{js,vue}": [
-            "eslint --fix",
-            "git add"
-        ]
-    },
-    "keywords": [
-        "vue",
-        "admin",
-        "dashboard",
-        "element-ui",
-        "boilerplate",
-        "admin-template",
-        "management-system"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://gitee.com/y_project/RuoYi-Cloud.git"
-    },
-    "dependencies": {
-        "@amap/amap-jsapi-loader": "^1.0.1",
-        "@riophae/vue-treeselect": "0.4.0",
-        "axios": "^0.24.0",
-        "clipboard": "2.0.8",
-        "core-js": "3.19.1",
-        "dayjs": "^1.11.1",
-        "echarts": "4.9.0",
-        "echarts-liquidfill": "^2.0.6",
-        "element-ui": "2.15.8",
-        "file-saver": "2.0.5",
-        "fuse.js": "6.4.3",
-        "highlight.js": "9.18.5",
-        "html2canvas": "^1.4.1",
-        "js-beautify": "1.13.0",
-        "js-cookie": "3.0.1",
-        "jsencrypt": "3.0.0-rc.1",
-        "jspdf": "^2.5.1",
-        "nprogress": "0.2.0",
-        "quill": "1.3.7",
-        "screenfull": "5.0.2",
-        "sortablejs": "1.10.2",
-        "vue": "2.6.12",
-        "vue-count-to": "1.0.13",
-        "vue-cropper": "0.5.5",
-        "vue-meta": "2.4.0",
-        "vue-router": "3.4.9",
-        "vuedraggable": "2.24.3",
-        "vuex": "3.6.0"
-    },
-    "devDependencies": {
-        "@vue/cli-plugin-babel": "4.4.6",
-        "@vue/cli-plugin-eslint": "4.4.6",
-        "@vue/cli-service": "4.4.6",
-        "babel-eslint": "10.1.0",
-        "babel-plugin-dynamic-import-node": "2.3.3",
-        "chalk": "4.1.0",
-        "compression-webpack-plugin": "5.0.2",
-        "connect": "3.6.6",
-        "crypto-js": "^4.1.1",
-        "eslint": "7.15.0",
-        "eslint-plugin-vue": "7.2.0",
-        "lint-staged": "10.5.3",
-        "runjs": "4.4.2",
-        "sass": "1.32.13",
-        "sass-loader": "10.1.1",
-        "script-ext-html-webpack-plugin": "2.1.5",
-        "svg-sprite-loader": "5.1.1",
-        "vue-template-compiler": "2.6.12"
-    },
-    "engines": {
-        "node": ">=8.9",
-        "npm": ">= 3.0.0"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions"
-    ]
-}
+{
+    "name": "ruoyi",
+    "version": "3.6.0",
+    "description": "若依管理系统",
+    "author": "若依",
+    "license": "MIT",
+    "scripts": {
+        "dev": "vue-cli-service serve",
+        "build:prod": "vue-cli-service build",
+        "build:stage": "vue-cli-service build --mode staging",
+        "preview": "node build/index.js --preview",
+        "lint": "eslint --ext .js,.vue src"
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "lint-staged"
+        }
+    },
+    "lint-staged": {
+        "src/**/*.{js,vue}": [
+            "eslint --fix",
+            "git add"
+        ]
+    },
+    "keywords": [
+        "vue",
+        "admin",
+        "dashboard",
+        "element-ui",
+        "boilerplate",
+        "admin-template",
+        "management-system"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://gitee.com/y_project/RuoYi-Cloud.git"
+    },
+    "dependencies": {
+        "@amap/amap-jsapi-loader": "^1.0.1",
+        "@riophae/vue-treeselect": "0.4.0",
+        "axios": "^0.24.0",
+        "clipboard": "2.0.8",
+        "core-js": "3.19.1",
+        "dayjs": "^1.11.1",
+        "echarts": "4.9.0",
+        "echarts-liquidfill": "^2.0.6",
+        "element-ui": "2.15.8",
+        "file-saver": "2.0.5",
+        "fuse.js": "6.4.3",
+        "highlight.js": "9.18.5",
+        "html2canvas": "^1.4.1",
+        "js-beautify": "1.13.0",
+        "js-cookie": "3.0.1",
+        "jsencrypt": "3.0.0-rc.1",
+        "jspdf": "^2.5.1",
+        "nprogress": "0.2.0",
+        "quill": "1.3.7",
+        "screenfull": "5.0.2",
+        "sortablejs": "1.10.2",
+        "vue": "2.6.12",
+        "vue-count-to": "1.0.13",
+        "vue-cropper": "0.5.5",
+        "vue-meta": "2.4.0",
+        "vue-router": "3.4.9",
+        "vuedraggable": "2.24.3",
+        "vuex": "3.6.0"
+    },
+    "devDependencies": {
+        "@vue/cli-plugin-babel": "4.4.6",
+        "@vue/cli-plugin-eslint": "4.4.6",
+        "@vue/cli-service": "4.4.6",
+        "babel-eslint": "10.1.0",
+        "babel-plugin-dynamic-import-node": "2.3.3",
+        "chalk": "4.1.0",
+        "compression-webpack-plugin": "5.0.2",
+        "connect": "3.6.6",
+        "crypto-js": "^4.1.1",
+        "eslint": "7.15.0",
+        "eslint-plugin-vue": "7.2.0",
+        "lint-staged": "10.5.3",
+        "runjs": "4.4.2",
+        "sass": "1.32.13",
+        "sass-loader": "10.1.1",
+        "script-ext-html-webpack-plugin": "2.1.5",
+        "svg-sprite-loader": "5.1.1",
+        "vue-template-compiler": "2.6.12"
+    },
+    "engines": {
+        "node": ">=8.9",
+        "npm": ">= 3.0.0"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions"
+    ]
+}