diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 4af90e7f..8b4ebb12 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -111,7 +111,7 @@ export const constantRoutes = [
hidden: true,
children: [
{
- path: 'edit',
+ path: 'edit/:tableId(\\d+)',
component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit',
meta: { title: '修改生成配置' }
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index ca6781b7..9585371c 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -211,6 +211,8 @@
+
+
@@ -221,6 +223,8 @@
+
+
@@ -231,6 +235,8 @@
+
+
@@ -254,7 +260,8 @@
-
+
+
@@ -281,6 +288,8 @@
+
+
diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index 9bb5d4a7..334cc115 100644
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -1,7 +1,7 @@
-
+
@@ -67,6 +68,8 @@ export default {
return {
// 是否显示弹出层
open: false,
+ // 是否显示cropper
+ visible: false,
// 弹出层标题
title: "修改头像",
options: {
@@ -84,6 +87,10 @@ export default {
editCropper() {
this.open = true;
},
+ // 打开弹出层结束时的回调
+ modalOpened() {
+ this.visible = true;
+ },
// 覆盖默认的上传行为
requestUpload() {
},
@@ -121,9 +128,10 @@ export default {
if (response.code === 200) {
this.open = false;
this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+ store.commit('SET_AVATAR', this.options.img);
this.msgSuccess("修改成功");
}
- this.$refs.cropper.clearCrop();
+ this.visible = false;
});
});
},
@@ -133,4 +141,4 @@ export default {
}
}
};
-
+
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index 425ffddb..39a8c66e 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -147,8 +147,8 @@ export default {
info: {}
};
},
- beforeCreate() {
- const { tableId } = this.$route.query;
+ created() {
+ const tableId = this.$route.params && this.$route.params.tableId;
if (tableId) {
// 获取表详细信息
getGenTable(tableId).then(res => {
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index c0263294..6e9183fd 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -270,7 +270,7 @@ export default {
/** 修改按钮操作 */
handleEditTable(row) {
const tableId = row.tableId || this.ids[0];
- this.$router.push({ path: "/gen/edit", query: { tableId: tableId } });
+ this.$router.push("/gen/edit/" + tableId);
},
/** 删除按钮操作 */
handleDelete(row) {
@@ -288,4 +288,4 @@ export default {
}
}
};
-
+
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
index 2104fa88..3ae6f96d 100644
--- a/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -14,7 +14,7 @@ public class RuoYiApplication
{
public static void main(String[] args)
{
-// System.setProperty("spring.devtools.restart.enabled", "false");
+ System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ノ゙ 若依启动成功 ლ(´ڡ`ლ)゙");
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
index 54178c14..0559d56e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
@@ -144,9 +144,9 @@ public class GenTableServiceImpl implements IGenTableService
public void importGenTable(List tableList)
{
String operName = SecurityUtils.getUsername();
- for (GenTable table : tableList)
+ try
{
- try
+ for (GenTable table : tableList)
{
String tableName = table.getTableName();
GenUtils.initTable(table, operName);
@@ -162,10 +162,10 @@ public class GenTableServiceImpl implements IGenTableService
}
}
}
- catch (Exception e)
- {
- log.error("表名 " + table.getTableName() + " 导入失败:", e);
- }
+ }
+ catch (Exception e)
+ {
+ throw new CustomException("导入失败:" + e.getMessage());
}
}
diff --git a/ruoyi/src/main/resources/META-INF/spring-devtools.properties b/ruoyi/src/main/resources/META-INF/spring-devtools.properties
new file mode 100644
index 00000000..2b23f85a
--- /dev/null
+++ b/ruoyi/src/main/resources/META-INF/spring-devtools.properties
@@ -0,0 +1 @@
+restart.include.json=/com.alibaba.fastjson.*.jar
\ No newline at end of file