添加相关权限

zainali5120

2020-10-30 53698764f8ae41d7cdf03b2c28247c4582ab89c3

添加相关权限

 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");

//    }

    

    /**

     * 代理关系


 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");

 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);

//    }

    

    /**

     * 轮播图---列表


 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);

 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");
    }

 src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java

File was deleted

 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);
//    }
}

 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);
//    }
}

 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");
//    }
}

 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) {

 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>

 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,