正在显示
8 个修改的文件
包含
27 行增加
和
9 行删除
| @@ -72,7 +72,7 @@ public class SysProfileController extends BaseController | @@ -72,7 +72,7 @@ public class SysProfileController extends BaseController | ||
| 72 | && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) | 72 | && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) |
| 73 | { | 73 | { |
| 74 | return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); | 74 | return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); |
| 75 | - } | 75 | + } |
| 76 | user.setUserId(sysUser.getUserId()); | 76 | user.setUserId(sysUser.getUserId()); |
| 77 | user.setPassword(null); | 77 | user.setPassword(null); |
| 78 | if (userService.updateUserProfile(user) > 0) | 78 | if (userService.updateUserProfile(user) > 0) |
| @@ -179,7 +179,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -179,7 +179,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 179 | router.setPath("/inner"); | 179 | router.setPath("/inner"); |
| 180 | List<RouterVo> childrenList = new ArrayList<RouterVo>(); | 180 | List<RouterVo> childrenList = new ArrayList<RouterVo>(); |
| 181 | RouterVo children = new RouterVo(); | 181 | RouterVo children = new RouterVo(); |
| 182 | - String routerPath = StringUtils.replaceEach(menu.getPath(), new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" }); | 182 | + String routerPath = innerLinkReplaceEach(menu.getPath()); |
| 183 | children.setPath(routerPath); | 183 | children.setPath(routerPath); |
| 184 | children.setComponent(UserConstants.INNER_LINK); | 184 | children.setComponent(UserConstants.INNER_LINK); |
| 185 | children.setName(StringUtils.capitalize(routerPath)); | 185 | children.setName(StringUtils.capitalize(routerPath)); |
| @@ -358,7 +358,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -358,7 +358,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 358 | // 内链打开外网方式 | 358 | // 内链打开外网方式 |
| 359 | if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) | 359 | if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) |
| 360 | { | 360 | { |
| 361 | - routerPath = StringUtils.replaceEach(routerPath, new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" }); | 361 | + routerPath = innerLinkReplaceEach(routerPath); |
| 362 | } | 362 | } |
| 363 | // 非外链并且是一级目录(类型为目录) | 363 | // 非外链并且是一级目录(类型为目录) |
| 364 | if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) | 364 | if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) |
| @@ -500,4 +500,15 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -500,4 +500,15 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 500 | { | 500 | { |
| 501 | return getChildList(list, t).size() > 0 ? true : false; | 501 | return getChildList(list, t).size() > 0 ? true : false; |
| 502 | } | 502 | } |
| 503 | + | ||
| 504 | + /** | ||
| 505 | + * 内链域名特殊字符替换 | ||
| 506 | + * | ||
| 507 | + * @return | ||
| 508 | + */ | ||
| 509 | + public String innerLinkReplaceEach(String path) | ||
| 510 | + { | ||
| 511 | + return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS }, | ||
| 512 | + new String[] { "", "" }); | ||
| 513 | + } | ||
| 503 | } | 514 | } |
| @@ -59,6 +59,14 @@ export default { | @@ -59,6 +59,14 @@ export default { | ||
| 59 | type: "warning", | 59 | type: "warning", |
| 60 | }) | 60 | }) |
| 61 | }, | 61 | }, |
| 62 | + // 提交内容 | ||
| 63 | + prompt(content) { | ||
| 64 | + return MessageBox.prompt(content, "系统提示", { | ||
| 65 | + confirmButtonText: '确定', | ||
| 66 | + cancelButtonText: '取消', | ||
| 67 | + type: "warning", | ||
| 68 | + }) | ||
| 69 | + }, | ||
| 62 | // 打开遮罩层 | 70 | // 打开遮罩层 |
| 63 | loading(content) { | 71 | loading(content) { |
| 64 | loadingInstance = Loading.service({ | 72 | loadingInstance = Loading.service({ |
| @@ -111,7 +111,7 @@ export default { | @@ -111,7 +111,7 @@ export default { | ||
| 111 | }, | 111 | }, |
| 112 | /** 强退按钮操作 */ | 112 | /** 强退按钮操作 */ |
| 113 | handleForceLogout(row) { | 113 | handleForceLogout(row) { |
| 114 | - this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的数据项?').then(function() { | 114 | + this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function() { |
| 115 | return forceLogout(row.tokenId); | 115 | return forceLogout(row.tokenId); |
| 116 | }).then(() => { | 116 | }).then(() => { |
| 117 | this.getList(); | 117 | this.getList(); |
| @@ -596,7 +596,7 @@ export default { | @@ -596,7 +596,7 @@ export default { | ||
| 596 | cancelButtonText: "取消", | 596 | cancelButtonText: "取消", |
| 597 | closeOnClickModal: false, | 597 | closeOnClickModal: false, |
| 598 | inputPattern: /^.{5,20}$/, | 598 | inputPattern: /^.{5,20}$/, |
| 599 | - inputErrorMessage: "用户密码长度必须介于 5 和 20 之间", | 599 | + inputErrorMessage: "用户密码长度必须介于 5 和 20 之间" |
| 600 | }).then(({ value }) => { | 600 | }).then(({ value }) => { |
| 601 | resetUserPwd(row.userId, value).then(response => { | 601 | resetUserPwd(row.userId, value).then(response => { |
| 602 | this.$modal.msgSuccess("修改成功,新密码是:" + value); | 602 | this.$modal.msgSuccess("修改成功,新密码是:" + value); |
| @@ -11,7 +11,6 @@ | @@ -11,7 +11,6 @@ | ||
| 11 | <el-input placeholder="请输入" v-model="info.tableComment" /> | 11 | <el-input placeholder="请输入" v-model="info.tableComment" /> |
| 12 | </el-form-item> | 12 | </el-form-item> |
| 13 | </el-col> | 13 | </el-col> |
| 14 | - | ||
| 15 | <el-col :span="12"> | 14 | <el-col :span="12"> |
| 16 | <el-form-item label="实体类名称" prop="className"> | 15 | <el-form-item label="实体类名称" prop="className"> |
| 17 | <el-input placeholder="请输入" v-model="info.className" /> | 16 | <el-input placeholder="请输入" v-model="info.className" /> |
| @@ -30,9 +29,9 @@ | @@ -30,9 +29,9 @@ | ||
| 30 | </el-row> | 29 | </el-row> |
| 31 | </el-form> | 30 | </el-form> |
| 32 | </template> | 31 | </template> |
| 32 | + | ||
| 33 | <script> | 33 | <script> |
| 34 | export default { | 34 | export default { |
| 35 | - name: "BasicInfoForm", | ||
| 36 | props: { | 35 | props: { |
| 37 | info: { | 36 | info: { |
| 38 | type: Object, | 37 | type: Object, |
| @@ -124,6 +124,7 @@ | @@ -124,6 +124,7 @@ | ||
| 124 | </el-form> | 124 | </el-form> |
| 125 | </el-card> | 125 | </el-card> |
| 126 | </template> | 126 | </template> |
| 127 | + | ||
| 127 | <script> | 128 | <script> |
| 128 | import { getGenTable, updateGenTable } from "@/api/tool/gen"; | 129 | import { getGenTable, updateGenTable } from "@/api/tool/gen"; |
| 129 | import { optionselect as getDictOptionselect } from "@/api/system/dict/type"; | 130 | import { optionselect as getDictOptionselect } from "@/api/system/dict/type"; |
| @@ -11,7 +11,6 @@ | @@ -11,7 +11,6 @@ | ||
| 11 | </el-select> | 11 | </el-select> |
| 12 | </el-form-item> | 12 | </el-form-item> |
| 13 | </el-col> | 13 | </el-col> |
| 14 | - | ||
| 15 | <el-col :span="12"> | 14 | <el-col :span="12"> |
| 16 | <el-form-item prop="packageName"> | 15 | <el-form-item prop="packageName"> |
| 17 | <span slot="label"> | 16 | <span slot="label"> |
| @@ -213,12 +212,12 @@ | @@ -213,12 +212,12 @@ | ||
| 213 | </el-row> | 212 | </el-row> |
| 214 | </el-form> | 213 | </el-form> |
| 215 | </template> | 214 | </template> |
| 215 | + | ||
| 216 | <script> | 216 | <script> |
| 217 | import Treeselect from "@riophae/vue-treeselect"; | 217 | import Treeselect from "@riophae/vue-treeselect"; |
| 218 | import "@riophae/vue-treeselect/dist/vue-treeselect.css"; | 218 | import "@riophae/vue-treeselect/dist/vue-treeselect.css"; |
| 219 | 219 | ||
| 220 | export default { | 220 | export default { |
| 221 | - name: "BasicInfoForm", | ||
| 222 | components: { Treeselect }, | 221 | components: { Treeselect }, |
| 223 | props: { | 222 | props: { |
| 224 | info: { | 223 | info: { |
-
请 注册 或 登录 后发表评论