From bdbcdac0bf39a063570245559e650535f556dd80 Mon Sep 17 00:00:00 2001 From: 13233904609 <13233904609@163.cm> Date: Tue, 23 Jul 2024 18:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/distributionlog/DistributionLogController.java | 2 +- .../member/controller/app/user/AppMemberUserController.java | 2 +- yudao-ui-admin-vue3-master/index.html | 4 ++-- .../components/DiyEditor/components/mobile/UserCard/index.vue | 2 +- .../bpmnProcessDesigner/package/designer/ProcessDesigner.vue | 2 +- yudao-ui-admin-vue3-master/src/utils/constants.ts | 2 +- yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue | 2 +- .../src/views/Login/components/MobileForm.vue | 2 +- .../src/views/mp/components/wx-material-select/main.vue | 2 +- .../src/views/mp/components/wx-msg/main.vue | 2 +- .../src/views/mp/components/wx-news/main.vue | 2 +- .../src/views/mp/components/wx-reply/main.vue | 2 +- .../src/views/mp/components/wx-video-play/main.vue | 2 +- .../src/views/mp/components/wx-voice-play/main.vue | 2 +- .../src/views/mp/material/components/ImageTable.vue | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java index 28845d3..119a605 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java @@ -84,7 +84,7 @@ public class DistributionLogController { @Operation(summary = "获得分销记录分页") @PreAuthorize("@ss.hasPermission('member:distribution-log:query')") public CommonResult<PageResult<DistributionLogRespVO>> getDistributionLogPage(@Valid DistributionLogPageReqVO pageReqVO) { - pageReqVO.setGameStatus("0"); +// pageReqVO.setGameStatus("0"); PageResult<DistributionLogDO> pageResult = distributionLogService.getDistributionLogPage(pageReqVO); // 拼接结果返回 List<MemberUserDO> users = memberUserService.getUserList( diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java index b193be4..35688ec 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java @@ -43,7 +43,7 @@ public class AppMemberUserController { MemberLevelDO level = levelService.getLevel(user.getLevelId()); AppMemberUserInfoRespVO convert = MemberUserConvert.INSTANCE.convert(user, level); convert.setId(getLoginUserId()+""); - convert.setUrlLink(socialClientApi.getWxUrlInfo(UserTypeEnum.MEMBER.getValue()).toString()); +// convert.setUrlLink(socialClientApi.getWxUrlInfo(UserTypeEnum.MEMBER.getValue()).toString()); return success(convert); } diff --git a/yudao-ui-admin-vue3-master/index.html b/yudao-ui-admin-vue3-master/index.html index 8cfcbef..5deaae0 100644 --- a/yudao-ui-admin-vue3-master/index.html +++ b/yudao-ui-admin-vue3-master/index.html @@ -7,11 +7,11 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="keywords" - content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!" + content="郑大钒水管理系统" /> <meta name="description" - content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!" + content="郑大钒水管理系统" /> <title>%VITE_APP_TITLE%</title> </head> diff --git a/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue b/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue index 14b447c..fb2896d 100644 --- a/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue +++ b/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue @@ -5,7 +5,7 @@ <el-avatar :size="60"> <Icon icon="ep:avatar" :size="60" /> </el-avatar> - <span class="text-18px font-bold">芋道源码</span> + <span class="text-18px font-bold">郑大钒水源码</span> </div> <Icon icon="tdesign:qrcode" :size="20" /> </div> diff --git a/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue index 6cbe11f..4c78ffa 100644 --- a/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue +++ b/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue @@ -664,7 +664,7 @@ const previewProcessJson = () => { previewModelVisible.value = true }) } -/* ------------------------------------------------ 芋道源码 methods ------------------------------------------------------ */ +/* ------------------------------------------------ 郑大钒水源码 methods ------------------------------------------------------ */ const processSave = async () => { // console.log(bpmnModeler, 'bpmnModelerbpmnModelerbpmnModelerbpmnModeler') const { err, xml } = await bpmnModeler.saveXML() diff --git a/yudao-ui-admin-vue3-master/src/utils/constants.ts b/yudao-ui-admin-vue3-master/src/utils/constants.ts index cfa785b..cee1744 100644 --- a/yudao-ui-admin-vue3-master/src/utils/constants.ts +++ b/yudao-ui-admin-vue3-master/src/utils/constants.ts @@ -1,5 +1,5 @@ /** - * Created by 芋道源码 + * Created by 郑大钒水源码 * * 枚举类 */ diff --git a/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue b/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue index eff59ba..40246f1 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue @@ -196,7 +196,7 @@ const loginData = reactive({ captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false', tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', loginForm: { - tenantName: '芋道源码', + tenantName: '郑大钒水', username: 'admin', password: 'admin123', captchaVerification: '', diff --git a/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue b/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue index 7f5d994..74a3f0a 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue @@ -133,7 +133,7 @@ const loginData = reactive({ }, loginForm: { uuid: '', - tenantName: '芋道源码', + tenantName: '郑大钒水', mobileNumber: '', code: '' } diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue index aad25ea..53d021b 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue @@ -1,7 +1,7 @@ <!-- - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com - 芋道源码: + 郑大钒水源码: ① 移除 avue 组件,使用 ElementUI 原生组件 --> <template> diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-msg/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-msg/main.vue index 8b7cc3a..b25ef3c 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-msg/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-msg/main.vue @@ -1,7 +1,7 @@ <!-- - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com - 芋道源码: + 郑大钒水源码: ① 移除暂时用不到的 websocket ② 代码优化,补充注释,提升阅读性 --> diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-news/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-news/main.vue index 154291b..8ef570e 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-news/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-news/main.vue @@ -2,7 +2,7 @@ - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com 【微信消息 - 图文】 - 芋道源码: + 郑大钒水源码: ① 代码优化,补充注释,提升阅读性 --> <template> diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-reply/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-reply/main.vue index 2c9d5f2..d29990a 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-reply/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-reply/main.vue @@ -1,7 +1,7 @@ <!-- - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com - 芋道源码: + 郑大钒水源码: ① 移除多余的 rep 为前缀的变量,让 message 消息更简单 ② 代码优化,补充注释,提升阅读性 ③ 优化消息的临时缓存策略,发送消息时,只清理被发送消息的 tab,不会强制切回到 text 输入 diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-video-play/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-video-play/main.vue index d544bbe..39c0143 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-video-play/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-video-play/main.vue @@ -2,7 +2,7 @@ - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com 【微信消息 - 视频】 - 芋道源码: + 郑大钒水源码: ① bug 修复: 1)joolun 的做法:使用 mediaId 从微信公众号,下载对应的 mp4 素材,从而播放内容; 存在的问题:mediaId 有效期是 3 天,超过时间后无法播放 diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-voice-play/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-voice-play/main.vue index fe7f0ca..b4ce4ce 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-voice-play/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-voice-play/main.vue @@ -2,7 +2,7 @@ - Copyright (C) 2018-2019 - All rights reserved, Designed By www.joolun.com 【微信消息 - 语音】 - 芋道源码: + 郑大钒水源码: ① bug 修复: 1)joolun 的做法:使用 mediaId 从微信公众号,下载对应的 mp4 素材,从而播放内容; 存在的问题:mediaId 有效期是 3 天,超过时间后无法播放 diff --git a/yudao-ui-admin-vue3-master/src/views/mp/material/components/ImageTable.vue b/yudao-ui-admin-vue3-master/src/views/mp/material/components/ImageTable.vue index 52c608f..49c1b34 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/material/components/ImageTable.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/material/components/ImageTable.vue @@ -63,7 +63,7 @@ const emit = defineEmits<{ column-count: 5; margin-top: 10px; - /* 芋道源码:增加 10px,避免顶着上面 */ + /* 郑大钒水源码:增加 10px,避免顶着上面 */ } .waterfall-item {