From 4bc92d49a14b648818228684bd5a77f3c2c3e7c1 Mon Sep 17 00:00:00 2001 From: From-wh Date: Wed, 17 May 2023 18:32:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?style:=20border=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/setting/systemMenus/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue index 8f069c541..9a108fa5f 100644 --- a/template/admin/src/pages/setting/systemMenus/index.vue +++ b/template/admin/src/pages/setting/systemMenus/index.vue @@ -482,11 +482,14 @@ export default { > .vxe-table--header-wrapper { background: #fff !important; } + .icon { font-size: 20px; } } - +/deep/ .vxe-table--render-default .vxe-table--border-line { + z-index: 2 !important; +} .rule { display: flex; flex-wrap: wrap; From e7b144d15dd6b7c5f99b496bd6bcb8470e4c8f61 Mon Sep 17 00:00:00 2001 From: From-wh Date: Thu, 18 May 2023 09:03:39 +0800 Subject: [PATCH 2/6] =?UTF-8?q?improve:=20=E5=8F=96=E6=B6=88=E5=8A=A0?= =?UTF-8?q?=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/main.js | 1 - template/admin/src/pages/account/login/index.vue | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/template/admin/src/main.js b/template/admin/src/main.js index 6d1370a9f..1a2ab3dac 100644 --- a/template/admin/src/main.js +++ b/template/admin/src/main.js @@ -196,7 +196,6 @@ new Vue({ } }); } - console.log(to.name); if ( [ 'product_productAdd', diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue index d62b1ff9e..4ab6816dd 100644 --- a/template/admin/src/pages/account/login/index.vue +++ b/template/admin/src/pages/account/login/index.vue @@ -75,7 +75,6 @@ import '@/assets/js/canvas-nest.min'; import Verify from '@/components/verifition/Verify'; import { PrevLoading } from '@/utils/loading.js'; import { formatFlatteningRoutes, findFirstNonNullChildren } from '@/libs/system'; -import { encryptWithKey } from '@/utils/ase.js'; export default { components: { @@ -108,7 +107,6 @@ export default { key: '', copyright: '', version: '', - publicKey: '', }; }, created() { @@ -172,7 +170,6 @@ export default { this.swiperList = data.slide.length ? data.slide : [{ slide: this.defaultSwiperList }]; this.key = data.key; this.copyright = data.copyright; - this.publicKey = data.publicKey; this.version = data.version; this.login_captcha = data.login_captcha; }) @@ -196,7 +193,7 @@ export default { this.loading = true; AccountLogin({ account: this.formInline.username, - pwd: encryptWithKey(this.formInline.password, this.publicKey), + pwd: this.formInline.password, key: this.key, captchaType: 'blockPuzzle', captchaVerification: params ? params.captchaVerification : '', From c1b6fb2720ded0aaaa5f19ea567c35f1a5e31e74 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 18 May 2023 09:09:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8E=89=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/Login.php | 13 +------------ .../services/system/admin/SystemAdminServices.php | 4 +--- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/crmeb/app/adminapi/controller/Login.php b/crmeb/app/adminapi/controller/Login.php index e3e9d877a..4ad5aa78a 100644 --- a/crmeb/app/adminapi/controller/Login.php +++ b/crmeb/app/adminapi/controller/Login.php @@ -11,11 +11,9 @@ namespace app\adminapi\controller; use crmeb\services\CacheService; -use crmeb\utils\Rsa; use think\facade\App; use crmeb\utils\Captcha; use app\services\system\admin\SystemAdminServices; -use think\facade\Cache; /** * 后台登陆 @@ -85,7 +83,7 @@ class Login extends AuthController * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function login(Rsa $rsa) + public function login() { [$account, $password, $key, $captchaVerification, $captchaType] = $this->request->postMore([ 'account', @@ -104,15 +102,6 @@ class Login extends AuthController } } - try { - if (strlen(trim($password)) > 500) { - return app('json')->fail(400762); - } - $password = $rsa->privateDecrypt($password); - } catch (\Throwable $e) { - return app('json')->fail($e->getMessage()); - } - if (strlen(trim($password)) < 6 || strlen(trim($password)) > 32) { return app('json')->fail(400762); } diff --git a/crmeb/app/services/system/admin/SystemAdminServices.php b/crmeb/app/services/system/admin/SystemAdminServices.php index de07b3bcd..0cacdc8bc 100644 --- a/crmeb/app/services/system/admin/SystemAdminServices.php +++ b/crmeb/app/services/system/admin/SystemAdminServices.php @@ -23,7 +23,6 @@ use app\services\system\SystemMenusServices; use crmeb\services\CacheService; use crmeb\services\FormBuilder; use crmeb\services\workerman\ChannelService; -use crmeb\utils\Rsa; use think\facade\Config; use think\facade\Event; use think\Model; @@ -168,8 +167,7 @@ class SystemAdminServices extends BaseServices 'copyright' => sys_config('nncnL_crmeb_copyright', ''), 'version' => get_crmeb_version(), 'key' => $key, - 'login_captcha' => 0, - 'publicKey' => app()->make(Rsa::class)->getPublicKey() + 'login_captcha' => 0 ]; if (CacheService::get('login_captcha', 1) > 1) { $data['login_captcha'] = 1; From e1ca702aad7a296f7feddddacb6cf28cf179aef5 Mon Sep 17 00:00:00 2001 From: From-wh Date: Thu, 18 May 2023 09:53:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?improve;=20=E8=8F=9C=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=BC=96=E8=BE=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemMenus/components/menusFrom.vue | 2 +- .../src/pages/setting/systemMenus/index.vue | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue index 20eed5668..e70528d3f 100644 --- a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue +++ b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue @@ -356,7 +356,7 @@ export default { .then(async (res) => { this.$Message.success(res.msg); this.modals = false; - this.$emit('changeMenu'); + this.$emit('changeMenu', this.formValidate); this.getAddFrom(); // this.$store.dispatch('menus/getMenusNavList'); }) diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue index 9a108fa5f..570e580a8 100644 --- a/template/admin/src/pages/setting/systemMenus/index.vue +++ b/template/admin/src/pages/setting/systemMenus/index.vue @@ -198,6 +198,7 @@ export default { seletRouteIds: [], // 选中id menusId: 0, // 选中分类id nodeKey: 0, // 选中节点 + openId: '', }; }, components: { menusFrom, formCreate: formCreate.$form() }, @@ -397,6 +398,7 @@ export default { }, // 编辑 edit(row, title, index) { + this.openId = row.id; this.formValidate = {}; this.menusDetails(row.id); this.titleFrom = title; @@ -439,10 +441,24 @@ export default { this.$Message.error(res.msg); }); }, - changeMenu() { - // this.getData(1); + changeMenu(data) { + console.log(data) + this.changeData(this.tableData, data); this.getMenusUnique(); }, + changeData(arr, data) { + let arrKey = Object.keys(data); + arr.map((e) => { + if (e.id == this.openId) { + arrKey.map((el) => { + e[el] = data[el]; + }); + console.log(e); + } else if (e.children) { + this.changeData(e.children, data); + } + }); + }, getMenusUnique() { getMenusUnique().then((res) => { let data = res.data; From b23d7d5a277848221eeed9678279aaa2ce710ace Mon Sep 17 00:00:00 2001 From: From-wh Date: Thu, 18 May 2023 14:47:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?improve:=20=E6=9D=83=E9=99=90=E8=A7=84?= =?UTF-8?q?=E5=88=99=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/system/systemMenus/components/menusFrom.vue | 4 ++-- template/admin/vue.config.js | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/template/admin/src/pages/system/systemMenus/components/menusFrom.vue b/template/admin/src/pages/system/systemMenus/components/menusFrom.vue index 153b0dc08..8f4eb2575 100644 --- a/template/admin/src/pages/system/systemMenus/components/menusFrom.vue +++ b/template/admin/src/pages/system/systemMenus/components/menusFrom.vue @@ -12,7 +12,7 @@ @on-visible-change="visible" >
- + diff --git a/template/admin/vue.config.js b/template/admin/vue.config.js index 14dc7ac7f..efbd653fa 100644 --- a/template/admin/vue.config.js +++ b/template/admin/vue.config.js @@ -98,12 +98,6 @@ module.exports = { config.resolve.alias.set('@api', resolve('src/api')); // node config.node.set('__dirname', true).set('__filename', true); - // 判断是否需要加入模拟数据 - const entry = config.entry('app'); - if (Setting.isMock) { - entry.add('@/mock').end(); - } - config.plugin('monaco').use(new MonacoWebpackPlugin()); }, // 设为false打包时不生成.map文件 From 3388a80aaafd4a64051db72fbadb2e17058c15ad Mon Sep 17 00:00:00 2001 From: From-wh Date: Thu, 18 May 2023 14:50:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?improve:=20=E8=A7=84=E5=88=99=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemMenus/components/menusFrom.vue | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/template/admin/src/pages/system/systemMenus/components/menusFrom.vue b/template/admin/src/pages/system/systemMenus/components/menusFrom.vue index 8f4eb2575..62e078162 100644 --- a/template/admin/src/pages/system/systemMenus/components/menusFrom.vue +++ b/template/admin/src/pages/system/systemMenus/components/menusFrom.vue @@ -12,18 +12,6 @@ @on-visible-change="visible" > - - - - - - - {{ item.label }} - - - - - @@ -95,6 +83,16 @@ --> + + + + + + {{ item.label }} + + + +