From bcf926f7c7428d7ac8cdcdc4856d4d7927eb7915 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 27 Feb 2023 22:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E7=9A=84=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=87=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/permission/PermissionServiceImpl.java      |  4 ++--
 .../src/views/infra/dataSourceConfig/index.vue         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java
index 1902331da3..0cfed68f6c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java
@@ -76,7 +76,7 @@ public class PermissionServiceImpl implements PermissionService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class) // TODO 芋艿：不能使用 MySQL 事务
     public void assignRoleMenu(Long roleId, Set<Long> menuIds) {
         // 获得角色拥有菜单编号
         Set<Long> dbMenuIds = convertSet(roleMenuMapper.selectListByRoleId(roleId), RoleMenuDO::getMenuId);
@@ -129,7 +129,7 @@ public class PermissionServiceImpl implements PermissionService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    //    @Transactional(rollbackFor = Exception.class) // TODO 芋艿：不能使用 MySQL 事务
     public void assignUserRole(Long userId, Set<Long> roleIds) {
         // 获得角色拥有角色编号
         Set<Long> dbRoleIds = convertSet(userRoleMapper.selectListByUserId(userId),
diff --git a/yudao-ui-admin/src/views/infra/dataSourceConfig/index.vue b/yudao-ui-admin/src/views/infra/dataSourceConfig/index.vue
index 6a8e3da1cd..05ad80b3be 100755
--- a/yudao-ui-admin/src/views/infra/dataSourceConfig/index.vue
+++ b/yudao-ui-admin/src/views/infra/dataSourceConfig/index.vue
@@ -10,16 +10,16 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="主键编号" align="center" prop="id" />
-      <el-table-column label="数据源名称" align="center" prop="name" />
+      <el-table-column label="主键编号" align="center" prop="id" width="100" />
+      <el-table-column label="数据源名称" align="center" prop="name" width="120"/>
       <el-table-column label="数据源连接" align="center" prop="url" />
-      <el-table-column label="用户名" align="center" prop="username" />
+      <el-table-column label="用户名" align="center" prop="username" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['infra:data-source-config:update']">修改</el-button>
@@ -36,7 +36,7 @@
           <el-input v-model="form.name" placeholder="请输入参数名称" />
         </el-form-item>
         <el-form-item label="数据源连接" prop="url">
-          <el-input v-model="form.url" placeholder="请输入数据源连接" />
+          <el-input type="textarea" v-model="form.url" placeholder="请输入数据源连接" :rows="6" />
         </el-form-item>
         <el-form-item label="用户名" prop="username">
           <el-input v-model="form.username" placeholder="请输入用户名" />