Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud

ruoyi-common/ruoyi-common-datasource/pom.xml

@@ -33,8 +33,8 @@
         
         <!-- SpringBoot Seata -->
         <dependency>
-            <groupId>io.seata</groupId>
+            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
 
     </dependencies>

ruoyi-ui/src/components/Editor/index.vue

@@ -26,6 +26,11 @@ export default {
       type: Number,
       default: null,
     },
+    /* 只读 */
+    readOnly: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -51,7 +56,7 @@ export default {
           ],
         },
         placeholder: "请输入内容",
-        readOnly: false,
+        readOnly: this.readOnly,
       },
     };
   },
@@ -192,4 +197,4 @@ export default {
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
   content: "等宽字体";
 }
-</style>
+</style>

ruoyi-ui/src/permission.js

@@ -19,10 +19,8 @@ router.beforeEach((to, from, next) => {
     } else {
       if (store.getters.roles.length === 0) {
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(res => {
+        store.dispatch('GetInfo').then(() => {
-          // 拉取user_info
+          store.dispatch('GenerateRoutes').then(accessRoutes => {
-          const roles = res.roles
-          store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成

ruoyi-ui/src/store/modules/user.js

@@ -55,7 +55,7 @@ const user = {
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        getInfo(state.token).then(res => {
+        getInfo().then(res => {
           const user = res.user
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组