From 53698764f8ae41d7cdf03b2c28247c4582ab89c3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Fri, 30 Oct 2020 22:08:28 +0800
Subject: [PATCH] 添加相关权限
---
src/main/java/com/xcong/excoin/modules/systemSetting/controller/SystemSettingController.java | 40 ++--
/dev/null | 153 -------------------
src/main/java/com/xcong/excoin/monitor/controller/LoginLogController.java | 30 +-
src/main/java/com/xcong/excoin/monitor/controller/ViewController.java | 68 ++++----
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 14
src/main/resources/templates/febs/views/modules/member/member.html | 11 -
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 64 ++++----
src/main/java/com/xcong/excoin/system/controller/LoginController.java | 22 +-
src/main/java/com/xcong/excoin/monitor/controller/LogController.java | 30 +-
src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinViewController.java | 1
src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java | 2
src/main/resources/templates/febs/views/login.html | 40 -----
12 files changed, 137 insertions(+), 338 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index 42e3164..061f8aa 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -28,13 +28,13 @@
private final IMemberService memberService;
- @GetMapping("addCoin/{id}")
- @RequiresPermissions("addCoin:update")
- public String addCoin(@PathVariable long id, Model model) {
- MemberEntity data = memberService.selectMemberByid(id);
- model.addAttribute("member", data);
- return FebsUtil.view("modules/member/addCoin");
- }
+// @GetMapping("addCoin/{id}")
+// @RequiresPermissions("addCoin:update")
+// public String addCoin(@PathVariable long id, Model model) {
+// MemberEntity data = memberService.selectMemberByid(id);
+// model.addAttribute("member", data);
+// return FebsUtil.view("modules/member/addCoin");
+// }
/**
* 代理关系
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index db09fde..8cd4618 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -733,38 +733,38 @@
@Override
public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {
- Long memberId = memberEntity.getId();
- String walletCode = "USDT";
- BigDecimal amountUsdt = memberEntity.getCoinNumber();
-
- MemberEntity selectById = this.baseMapper.selectById(memberId);
- if(ObjectUtils.isEmpty(selectById)) {
- return new FebsResponse().message("用户已不存在");
- }
- //获取币币钱包
- MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId,walletCode);
- BigDecimal availableBalance = memberWalletCoinEntity.getAvailableBalance();
- BigDecimal totalBalance = memberWalletCoinEntity.getTotalBalance();
-
- memberWalletCoinEntity.setAvailableBalance(availableBalance.add(amountUsdt));
- memberWalletCoinEntity.setTotalBalance(totalBalance.add(amountUsdt));
- // 更新
- memberWalletCoinMapper.updateById(memberWalletCoinEntity);
-
- //添加币币资金划转历史记录
- MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
- memberAccountMoneyChangeEntity.setContent("充值");
- memberAccountMoneyChangeEntity.setMemberId(memberId);
- memberAccountMoneyChangeEntity.setAmount(amountUsdt);
- memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
- memberAccountMoneyChangeEntity.setSymbol("USDT");
- memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
- memberAccountMoneyChangeEntity.setCreateBy(selectById.getCreateBy());
- memberAccountMoneyChangeEntity.setCreateTime(new Date());
- memberAccountMoneyChangeEntity.setUpdateBy(selectById.getCreateBy());
- memberAccountMoneyChangeEntity.setUpdateTime(new Date());
-
- memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
+// Long memberId = memberEntity.getId();
+// String walletCode = "USDT";
+// BigDecimal amountUsdt = memberEntity.getCoinNumber();
+//
+// MemberEntity selectById = this.baseMapper.selectById(memberId);
+// if(ObjectUtils.isEmpty(selectById)) {
+// return new FebsResponse().message("用户已不存在");
+// }
+// //获取币币钱包
+// MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId,walletCode);
+// BigDecimal availableBalance = memberWalletCoinEntity.getAvailableBalance();
+// BigDecimal totalBalance = memberWalletCoinEntity.getTotalBalance();
+//
+// memberWalletCoinEntity.setAvailableBalance(availableBalance.add(amountUsdt));
+// memberWalletCoinEntity.setTotalBalance(totalBalance.add(amountUsdt));
+// // 更新
+// memberWalletCoinMapper.updateById(memberWalletCoinEntity);
+//
+// //添加币币资金划转历史记录
+// MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
+// memberAccountMoneyChangeEntity.setContent("充值");
+// memberAccountMoneyChangeEntity.setMemberId(memberId);
+// memberAccountMoneyChangeEntity.setAmount(amountUsdt);
+// memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
+// memberAccountMoneyChangeEntity.setSymbol("USDT");
+// memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
+// memberAccountMoneyChangeEntity.setCreateBy(selectById.getCreateBy());
+// memberAccountMoneyChangeEntity.setCreateTime(new Date());
+// memberAccountMoneyChangeEntity.setUpdateBy(selectById.getCreateBy());
+// memberAccountMoneyChangeEntity.setUpdateTime(new Date());
+//
+// memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
/**
* todo
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
diff --git a/src/main/java/com/xcong/excoin/modules/systemSetting/controller/SystemSettingController.java b/src/main/java/com/xcong/excoin/modules/systemSetting/controller/SystemSettingController.java
index f54d64c..0760971 100644
--- a/src/main/java/com/xcong/excoin/modules/systemSetting/controller/SystemSettingController.java
+++ b/src/main/java/com/xcong/excoin/modules/systemSetting/controller/SystemSettingController.java
@@ -36,40 +36,40 @@
/**
* 交易设置---列表
*/
- @GetMapping("platformTradeSetting")
- public FebsResponse platformTradeSetting(PlatformTradeSettingEntity platformTradeSettingEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(systemSettingService.findPlatformTradeSettingInPage(platformTradeSettingEntity, request));
- return new FebsResponse().success().data(data);
- }
+// @GetMapping("platformTradeSetting")
+// public FebsResponse platformTradeSetting(PlatformTradeSettingEntity platformTradeSettingEntity, QueryRequest request) {
+// Map<String, Object> data = getDataTable(systemSettingService.findPlatformTradeSettingInPage(platformTradeSettingEntity, request));
+// return new FebsResponse().success().data(data);
+// }
/**
*交易设置---确认
* @return
*/
- @PostMapping("platformTradeSettingConfirm")
- @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")
- public FebsResponse platformTradeSettingConfirm(@Valid PlatformTradeSettingEntity platformTradeSettingEntity) {
- return systemSettingService.platformTradeSettingConfirm(platformTradeSettingEntity);
- }
+// @PostMapping("platformTradeSettingConfirm")
+// @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")
+// public FebsResponse platformTradeSettingConfirm(@Valid PlatformTradeSettingEntity platformTradeSettingEntity) {
+// return systemSettingService.platformTradeSettingConfirm(platformTradeSettingEntity);
+// }
/**
* 币种规格---列表
*/
- @GetMapping("platformSymbolsSku")
- public FebsResponse platformSymbolsSku(PlatformSymbolsSkuEntity platformSymbolsSkuEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(systemSettingService.findPlatformSymbolsSkuInPage(platformSymbolsSkuEntity, request));
- return new FebsResponse().success().data(data);
- }
+// @GetMapping("platformSymbolsSku")
+// public FebsResponse platformSymbolsSku(PlatformSymbolsSkuEntity platformSymbolsSkuEntity, QueryRequest request) {
+// Map<String, Object> data = getDataTable(systemSettingService.findPlatformSymbolsSkuInPage(platformSymbolsSkuEntity, request));
+// return new FebsResponse().success().data(data);
+// }
/**
* 币种规格---确认
* @return
*/
- @PostMapping("platformSymbolsSkuConfirm")
- @ControllerEndpoint(operation = "币种规格---确认", exceptionMessage = "设置失败")
- public FebsResponse platformSymbolsSkuConfirm(@Valid PlatformSymbolsSkuEntity platformSymbolsSkuEntity) {
- return systemSettingService.platformSymbolsSkuConfirm(platformSymbolsSkuEntity);
- }
+// @PostMapping("platformSymbolsSkuConfirm")
+// @ControllerEndpoint(operation = "币种规格---确认", exceptionMessage = "设置失败")
+// public FebsResponse platformSymbolsSkuConfirm(@Valid PlatformSymbolsSkuEntity platformSymbolsSkuEntity) {
+// return systemSettingService.platformSymbolsSkuConfirm(platformSymbolsSkuEntity);
+// }
/**
* 轮播图---列表
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java
index eac4f33..4b88a5a 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java
@@ -7,6 +7,7 @@
import com.xcong.excoin.modules.trademanage.entity.OrderCoinsDealEntity;
import com.xcong.excoin.modules.trademanage.service.OrderCoinDealService;
import lombok.RequiredArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +25,7 @@
private final OrderCoinDealService orderCoinDealService;
@GetMapping("/page")
+ @RequiresPermissions("orderCoins:view")
public FebsResponse getList(OrderCoinsDealEntity contractHoldOrderEntity, QueryRequest request) {
Map<String, Object> data = getDataTable(orderCoinDealService.findOrderCoinsDealListInPage(contractHoldOrderEntity, request));
return new FebsResponse().success().data(data);
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinViewController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinViewController.java
index 6db982b..492aee5 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinViewController.java
@@ -14,6 +14,7 @@
* 当前持仓
*/
@GetMapping("/page")
+ @RequiresPermissions("orderCoins:view")
public String contractHoldOrder() {
return FebsUtil.view("modules/orderCoin/orderCoin");
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
deleted file mode 100644
index 3acd726..0000000
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.xcong.excoin.modules.trademanage.controller;
-
-import java.util.Map;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.xcong.excoin.common.controller.BaseController;
-import com.xcong.excoin.common.entity.FebsResponse;
-import com.xcong.excoin.common.entity.QueryRequest;
-import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
-import com.xcong.excoin.modules.trademanage.entity.AgentReturnEntity;
-import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
-import com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity;
-import com.xcong.excoin.modules.trademanage.service.TradeManageService;
-
-import lombok.RequiredArgsConstructor;
-
-@Validated
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/tradeManage")
-public class TradeManageController extends BaseController{
-
- private final TradeManageService tradeManageService;
-
- /**
- * 当前持仓---列表
- */
- @GetMapping("contractHoldOrder")
- public FebsResponse getList(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderListInPage(contractHoldOrderEntity, request));
- return new FebsResponse().success().data(data);
- }
- /**
- * 当前持仓---列表alone
- */
- @GetMapping("contractHoldOrderAlone")
- public FebsResponse contractHoldOrderAlone(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneInPage(contractHoldOrderEntity, request));
- return new FebsResponse().success().data(data);
- }
- /**
- * 当前持仓---列表Test
- */
- @GetMapping("contractHoldOrderAloneTest")
- public FebsResponse contractHoldOrderAloneTest(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneTestInPage(contractHoldOrderEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 账户信息---列表
- */
- @GetMapping("memberAccountInfo")
- public FebsResponse memberAccountInfo(MemberEntity memberEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findMemberAccountInfoListInPage(memberEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 账户信息---列表alone
- */
- @GetMapping("memberAccountInfoAlone")
- public FebsResponse memberAccountInfoAlone(MemberEntity memberEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findmemberAccountInfoAloneListInPage(memberEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 账户信息---列表Test
- */
- @GetMapping("memberAccountInfoAloneTest")
- public FebsResponse memberAccountInfoAloneTest(MemberEntity memberEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findmemberAccountInfoAloneTestListInPage(memberEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 返佣明细---列表
- */
- @GetMapping("memberAgentReturnInfo")
- public FebsResponse memberAgentReturnInfo(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoInPage(memberAccountMoneyChangeEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 返佣明细---alone
- */
- @GetMapping("memberAgentReturnInfoAlone")
- public FebsResponse memberAgentReturnInfoAlone(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneInPage(memberAccountMoneyChangeEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 返佣明细---Test
- */
- @GetMapping("memberAgentReturnInfoAloneTest")
- public FebsResponse memberAgentReturnInfoAloneTest(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneTestInPage(memberAccountMoneyChangeEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 返佣总明细---列表
- */
- @GetMapping("memberAgentReturnInfos")
- public FebsResponse memberAgentReturnInfos(AgentReturnEntity agentReturnEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfosInPage(agentReturnEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 历史委托明细---列表
- */
- @GetMapping("historyOrderInfo")
- public FebsResponse historyOrderInfo(ContractOrderEntity contractOrderEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findMemberHistoryOrderInfoInPage(contractOrderEntity, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 全部历史委托明细---列表
- */
- @GetMapping("historyOrderInfoAll")
- public FebsResponse historyOrderInfoAll(ContractOrderEntity contractOrderEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findMemberHistoryOrderAllInfoInPage(contractOrderEntity, request));
- return new FebsResponse().success().data(data);
- }
- /**
- * 历史委托明细---alone
- */
- @GetMapping("historyOrderInfoAlone")
- public FebsResponse historyOrderInfoAlone(ContractOrderEntity contractOrderEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneInfoInPage(contractOrderEntity, request));
- return new FebsResponse().success().data(data);
- }
- /**
- * 历史委托明细---Test
- */
- @GetMapping("historyOrderInfoAloneTest")
- public FebsResponse historyOrderInfoAloneTest(ContractOrderEntity contractOrderEntity, QueryRequest request) {
- Map<String, Object> data = getDataTable(tradeManageService.findhistoryOrderInfoAloneTestInfoInPage(contractOrderEntity, request));
- return new FebsResponse().success().data(data);
- }
-
-
-}
diff --git a/src/main/java/com/xcong/excoin/monitor/controller/LogController.java b/src/main/java/com/xcong/excoin/monitor/controller/LogController.java
index b6bea9b..dca8c26 100644
--- a/src/main/java/com/xcong/excoin/monitor/controller/LogController.java
+++ b/src/main/java/com/xcong/excoin/monitor/controller/LogController.java
@@ -39,20 +39,20 @@
return new FebsResponse().success().data(dataTable);
}
- @GetMapping("delete/{ids}")
- @RequiresPermissions("log:delete")
- @ControllerEndpoint(exceptionMessage = "删除日志失败")
- public FebsResponse deleteLogs(@NotBlank(message = "{required}") @PathVariable String ids) {
- String[] logIds = ids.split(StringPool.COMMA);
- this.logService.deleteLogs(logIds);
- return new FebsResponse().success();
- }
+// @GetMapping("delete/{ids}")
+// @RequiresPermissions("log:delete")
+// @ControllerEndpoint(exceptionMessage = "删除日志失败")
+// public FebsResponse deleteLogs(@NotBlank(message = "{required}") @PathVariable String ids) {
+// String[] logIds = ids.split(StringPool.COMMA);
+// this.logService.deleteLogs(logIds);
+// return new FebsResponse().success();
+// }
- @GetMapping("excel")
- @RequiresPermissions("log:export")
- @ControllerEndpoint(exceptionMessage = "导出Excel失败")
- public void export(QueryRequest request, SystemLog lg, HttpServletResponse response) {
- List<SystemLog> logs = this.logService.findLogs(lg, request).getRecords();
- ExcelKit.$Export(SystemLog.class, response).downXlsx(logs, false);
- }
+// @GetMapping("excel")
+// @RequiresPermissions("log:export")
+// @ControllerEndpoint(exceptionMessage = "导出Excel失败")
+// public void export(QueryRequest request, SystemLog lg, HttpServletResponse response) {
+// List<SystemLog> logs = this.logService.findLogs(lg, request).getRecords();
+// ExcelKit.$Export(SystemLog.class, response).downXlsx(logs, false);
+// }
}
diff --git a/src/main/java/com/xcong/excoin/monitor/controller/LoginLogController.java b/src/main/java/com/xcong/excoin/monitor/controller/LoginLogController.java
index 70c8c4a..23c045e 100644
--- a/src/main/java/com/xcong/excoin/monitor/controller/LoginLogController.java
+++ b/src/main/java/com/xcong/excoin/monitor/controller/LoginLogController.java
@@ -39,20 +39,20 @@
return new FebsResponse().success().data(dataTable);
}
- @GetMapping("delete/{ids}")
- @RequiresPermissions("loginlog:delete")
- @ControllerEndpoint(exceptionMessage = "删除日志失败")
- public FebsResponse deleteLogss(@NotBlank(message = "{required}") @PathVariable String ids) {
- String[] loginLogIds = ids.split(StringPool.COMMA);
- this.loginLogService.deleteLoginLogs(loginLogIds);
- return new FebsResponse().success();
- }
+// @GetMapping("delete/{ids}")
+// @RequiresPermissions("loginlog:delete")
+// @ControllerEndpoint(exceptionMessage = "删除日志失败")
+// public FebsResponse deleteLogss(@NotBlank(message = "{required}") @PathVariable String ids) {
+// String[] loginLogIds = ids.split(StringPool.COMMA);
+// this.loginLogService.deleteLoginLogs(loginLogIds);
+// return new FebsResponse().success();
+// }
- @GetMapping("excel")
- @RequiresPermissions("loginlog:export")
- @ControllerEndpoint(exceptionMessage = "导出Excel失败")
- public void export(QueryRequest request, LoginLog loginLog, HttpServletResponse response) {
- List<LoginLog> loginLogs = this.loginLogService.findLoginLogs(loginLog, request).getRecords();
- ExcelKit.$Export(LoginLog.class, response).downXlsx(loginLogs, false);
- }
+// @GetMapping("excel")
+// @RequiresPermissions("loginlog:export")
+// @ControllerEndpoint(exceptionMessage = "导出Excel失败")
+// public void export(QueryRequest request, LoginLog loginLog, HttpServletResponse response) {
+// List<LoginLog> loginLogs = this.loginLogService.findLoginLogs(loginLog, request).getRecords();
+// ExcelKit.$Export(LoginLog.class, response).downXlsx(loginLogs, false);
+// }
}
diff --git a/src/main/java/com/xcong/excoin/monitor/controller/ViewController.java b/src/main/java/com/xcong/excoin/monitor/controller/ViewController.java
index 08036e7..48b40b6 100644
--- a/src/main/java/com/xcong/excoin/monitor/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/monitor/controller/ViewController.java
@@ -51,38 +51,38 @@
return FebsUtil.view("monitor/httpTrace");
}
- @GetMapping("jvm")
- @RequiresPermissions("jvm:view")
- public String jvmInfo(Model model) {
- List<FebsMetricResponse> jvm = actuatorHelper.getMetricResponseByType("jvm");
- JvmInfo jvmInfo = actuatorHelper.getJvmInfoFromMetricData(jvm);
- model.addAttribute("jvm", jvmInfo);
- return FebsUtil.view("monitor/jvmInfo");
- }
-
- @GetMapping("tomcat")
- @RequiresPermissions("tomcat:view")
- public String tomcatInfo(Model model) {
- List<FebsMetricResponse> tomcat = actuatorHelper.getMetricResponseByType("tomcat");
- TomcatInfo tomcatInfo = actuatorHelper.getTomcatInfoFromMetricData(tomcat);
- model.addAttribute("tomcat", tomcatInfo);
- return FebsUtil.view("monitor/tomcatInfo");
- }
-
- @GetMapping("server")
- @RequiresPermissions("server:view")
- public String serverInfo(Model model) {
- List<FebsMetricResponse> jdbcInfo = actuatorHelper.getMetricResponseByType("jdbc");
- List<FebsMetricResponse> systemInfo = actuatorHelper.getMetricResponseByType("system");
- List<FebsMetricResponse> processInfo = actuatorHelper.getMetricResponseByType("process");
-
- ServerInfo serverInfo = actuatorHelper.getServerInfoFromMetricData(jdbcInfo, systemInfo, processInfo);
- model.addAttribute("server", serverInfo);
- return FebsUtil.view("monitor/serverInfo");
- }
-
- @GetMapping("swagger")
- public String swagger() {
- return FebsUtil.view("monitor/swagger");
- }
+// @GetMapping("jvm")
+// @RequiresPermissions("jvm:view")
+// public String jvmInfo(Model model) {
+// List<FebsMetricResponse> jvm = actuatorHelper.getMetricResponseByType("jvm");
+// JvmInfo jvmInfo = actuatorHelper.getJvmInfoFromMetricData(jvm);
+// model.addAttribute("jvm", jvmInfo);
+// return FebsUtil.view("monitor/jvmInfo");
+// }
+//
+// @GetMapping("tomcat")
+// @RequiresPermissions("tomcat:view")
+// public String tomcatInfo(Model model) {
+// List<FebsMetricResponse> tomcat = actuatorHelper.getMetricResponseByType("tomcat");
+// TomcatInfo tomcatInfo = actuatorHelper.getTomcatInfoFromMetricData(tomcat);
+// model.addAttribute("tomcat", tomcatInfo);
+// return FebsUtil.view("monitor/tomcatInfo");
+// }
+//
+// @GetMapping("server")
+// @RequiresPermissions("server:view")
+// public String serverInfo(Model model) {
+// List<FebsMetricResponse> jdbcInfo = actuatorHelper.getMetricResponseByType("jdbc");
+// List<FebsMetricResponse> systemInfo = actuatorHelper.getMetricResponseByType("system");
+// List<FebsMetricResponse> processInfo = actuatorHelper.getMetricResponseByType("process");
+//
+// ServerInfo serverInfo = actuatorHelper.getServerInfoFromMetricData(jdbcInfo, systemInfo, processInfo);
+// model.addAttribute("server", serverInfo);
+// return FebsUtil.view("monitor/serverInfo");
+// }
+//
+// @GetMapping("swagger")
+// public String swagger() {
+// return FebsUtil.view("monitor/swagger");
+// }
}
diff --git a/src/main/java/com/xcong/excoin/system/controller/LoginController.java b/src/main/java/com/xcong/excoin/system/controller/LoginController.java
index 1cab219..829406d 100644
--- a/src/main/java/com/xcong/excoin/system/controller/LoginController.java
+++ b/src/main/java/com/xcong/excoin/system/controller/LoginController.java
@@ -60,17 +60,17 @@
return new FebsResponse().success();
}
- @PostMapping("regist")
- public FebsResponse regist(
- @NotBlank(message = "{required}") String username,
- @NotBlank(message = "{required}") String password) throws FebsException {
- User user = userService.findByName(username);
- if (user != null) {
- throw new FebsException("该用户名已存在");
- }
- this.userService.regist(username, password);
- return new FebsResponse().success();
- }
+// @PostMapping("regist")
+// public FebsResponse regist(
+// @NotBlank(message = "{required}") String username,
+// @NotBlank(message = "{required}") String password) throws FebsException {
+// User user = userService.findByName(username);
+// if (user != null) {
+// throw new FebsException("该用户名已存在");
+// }
+// this.userService.regist(username, password);
+// return new FebsResponse().success();
+// }
@GetMapping("index/{username}")
public FebsResponse index(@NotBlank(message = "{required}") @PathVariable String username) {
diff --git a/src/main/resources/templates/febs/views/login.html b/src/main/resources/templates/febs/views/login.html
index 4b73ada..b2ffc42 100644
--- a/src/main/resources/templates/febs/views/login.html
+++ b/src/main/resources/templates/febs/views/login.html
@@ -62,47 +62,7 @@
</button>
</div>
</div>
-<!-- <div class="layui-form-item febs-tr">-->
-<!-- <a id="regist-href">注册账号</a>-->
-<!-- </div>-->
- </div>
- </div>
- </div>
- <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-hide" id="regist-div">
- <div class="layui-form" lay-filter="regist-form">
- <div class="layui-anim layui-anim-upbit">
- <ul class="login-type-tab">
- <li class="active">账号注册</li>
- </ul>
- <div class="normal-login-form">
- <div class="layui-form-item">
- <label class="layui-icon label-icon layui-icon-username"></label>
- <input type="text" name="username" minlength="2" maxlength="10" lay-verify="range"
- placeholder="用户名" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-form-item password-block">
- <label class="layui-icon label-icon layui-icon-password"></label>
- <input type="password" name="password" minlength="6" lay-verify="range"
- placeholder="密码" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-form-item password-block">
- <label class="layui-icon label-icon layui-icon-password"></label>
- <input type="password" name="passwordB" lay-verify="required"
- placeholder="密码确认" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-form-item">
- <button class="layui-btn layui-btn-normal layui-btn-fluid" lay-submit
- lay-filter="regist-submit" id="regist">
- <i style="display: none"
- class="layui-icon layui-icon-loading layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i>
- 立即注册
- </button>
- </div>
- </div>
- </div>
- <div class="layui-form-item febs-tr">
- <a id="login-href">已有账号？马上登录</a>
</div>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index 120b39f..6044bcc 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -90,17 +90,6 @@
maxmin: true,
});
}
- if (layEvent === 'addCoin') {
- febs.modal.open( '拨币', 'modules/member/addCoin/' + data.id, {
- btn: ['提交', '取消'],
- yes: function (index, layero) {
- $('#user-update').find('#submit').trigger('click');
- },
- btn2: function () {
- layer.closeAll();
- }
- });
- }
if (layEvent === 'examine') {
febs.modal.open( '个人数据详情', 'modules/member/memberDetailInfo/' + data.inviteId, {
maxmin: true,
--
Gitblit v1.9.1