From 55d6baa680c3c20556d09fbc2ff02de5fdcd5a28 Mon Sep 17 00:00:00 2001 From: 13233904609 <13233904609@163.cm> Date: Mon, 29 Jul 2024 10:06:28 +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 --- .../controller/admin/config/TradeConfigController.java | 2 +- .../trade/service/brokerage/BrokerageUserServiceImpl.java | 2 +- .../module/pay/controller/admin/app/PayAppController.java | 2 +- yudao-ui-admin-vue3-master/.env | 4 ++-- yudao-ui-admin-vue3-master/src/views/Login/Login.vue | 8 ++++---- .../src/views/Login/SocialLogin.vue | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/TradeConfigController.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/TradeConfigController.java index 5e0558f..b69840f 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/TradeConfigController.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/TradeConfigController.java @@ -40,7 +40,7 @@ public class TradeConfigController { @GetMapping("/get") @Operation(summary = "获得交易中心配置") - @PreAuthorize("@ss.hasPermission('trade:config:query')") +// @PreAuthorize("@ss.hasPermission('trade:config:query')") public CommonResult getConfig() { TradeConfigDO config = tradeConfigService.getTradeConfig(); TradeConfigRespVO configVO = TradeConfigConvert.INSTANCE.convert(config); diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java index 0b50509..8794625 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java @@ -250,7 +250,7 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { if (CollUtil.isEmpty(userMap)) { return PageResult.empty(); } - Integer status = BrokerageRecordStatusEnum.SETTLEMENT.getStatus(); + BrokerageRecordStatusEnum.SETTLEMENT.getStatus(); // 2. 分页查询 IPage pageResult = brokerageUserMapper.selectSummaryPageByUserId( MyBatisUtils.buildPage(pageReqVO), BrokerageRecordBizTypeEnum.ORDER.getType(), diff --git a/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java b/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java index ba62069..6ab3230 100644 --- a/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java +++ b/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java @@ -99,7 +99,7 @@ public class PayAppController { @GetMapping("/list") @Operation(summary = "获得应用列表") - @PreAuthorize("@ss.hasPermission('pay:merchant:query')") +// @PreAuthorize("@ss.hasPermission('pay:merchant:query')") public CommonResult> getAppList() { List appListDO = appService.getAppList(); return success(PayAppConvert.INSTANCE.convertList(appListDO)); diff --git a/yudao-ui-admin-vue3-master/.env b/yudao-ui-admin-vue3-master/.env index 416b9b9..d6ca42d 100644 --- a/yudao-ui-admin-vue3-master/.env +++ b/yudao-ui-admin-vue3-master/.env @@ -14,12 +14,12 @@ VITE_APP_TENANT_ENABLE=true VITE_APP_CAPTCHA_ENABLE=true # 文档地址的开关 -VITE_APP_DOCALERT_ENABLE=true +VITE_APP_DOCALERT_ENABLE=false # 百度统计 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc # 默认账户密码 VITE_APP_DEFAULT_LOGIN_TENANT = 郑大钒水 -VITE_APP_DEFAULT_LOGIN_USERNAME = zhengdafanshui +VITE_APP_DEFAULT_LOGIN_USERNAME = zdfs VITE_APP_DEFAULT_LOGIN_PASSWORD = 123456 diff --git a/yudao-ui-admin-vue3-master/src/views/Login/Login.vue b/yudao-ui-admin-vue3-master/src/views/Login/Login.vue index 5d349ce..e5637b9 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/Login.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/Login.vue @@ -49,13 +49,13 @@ - + - + - + - + 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 4a34def..35e9cd6 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue @@ -197,7 +197,7 @@ const loginData = reactive({ tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', loginForm: { tenantName: '郑大钒水', - username: 'zhengdafanshui', + username: 'zdfs', password: '123456', captchaVerification: '', rememberMe: false