diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 5a0b447bc..e69de29bb 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-custom: http://doc.ruoyi.vip/ruoyi/other/donate.html
diff --git a/LICENSE b/LICENSE
index bc23291c0..bd0c0a2d7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 RuoYi
+Copyright (c) 2024
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
index 09a4f7492..e69de29bb 100644
--- a/README.md
+++ b/README.md
@@ -1,102 +0,0 @@
-<p align="center">
-	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-dd77653d7c9f197dd9d93684f3c8dcfbab6.png">
-</p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v4.7.8</h1>
-<h4 align="center">基于SpringBoot开发的轻量级Java快速开发框架</h4>
-<p align="center">
-	<a href="https://gitee.com/y_project/RuoYi/stargazers"><img src="https://gitee.com/y_project/RuoYi/badge/star.svg?theme=gvp"></a>
-	<a href="https://gitee.com/y_project/RuoYi"><img src="https://img.shields.io/badge/RuoYi-v4.7.8-brightgreen.svg"></a>
-	<a href="https://gitee.com/y_project/RuoYi/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
-</p>
-
-## 平台简介
-
-一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适的。于是利用空闲休息时间开始自己写了一套后台系统。如此有了若依。她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-
-性别男，若依是给女儿取的名字（寓意：你若不离不弃，我必生死相依）
-
-若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
-
-* 前后端分离版本，请移步[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
-* 感谢 [hplus](https://gitee.com/hplus_admin/hplus) 后台主题 UI 框架。
-* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
-* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
-
-## 内置功能
-
-1.  用户管理：用户是系统操作者，该功能主要完成系统用户配置。
-2.  部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。
-3.  岗位管理：配置系统用户所属担任职务。
-4.  菜单管理：配置系统菜单，操作权限，按钮权限标识等。
-5.  角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。
-6.  字典管理：对系统中经常使用的一些较为固定的数据进行维护。
-7.  参数管理：对系统动态配置常用参数。
-8.  通知公告：系统通知公告信息发布维护。
-9.  操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。
-10. 登录日志：系统登录日志记录查询包含登录异常。
-11. 在线用户：当前系统中活跃用户状态监控。
-12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。
-13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。
-14. 系统接口：根据业务代码自动生成相关的api接口文档。
-15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。
-16. 缓存监控：对系统的缓存查询，删除、清空等操作。
-17. 在线构建器：拖动表单元素生成相应的HTML代码。
-18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。
-
-## 在线体验
-
-- admin/admin123  
-- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
-
-演示地址：http://ruoyi.vip  
-文档地址：http://doc.ruoyi.vip
-
-## 演示图
-
-<table>
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-42e518aa72a24d228427a1261cb3679f395.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-7f20dd0edba25e5187c5c4dd3ec7d3d9797.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-2dae3d87f6a8ca05057db059cd9a411d51d.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-ea4d98423471e55fba784694e45d12bd4bb.png"/></td>
-    </tr>
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-7f6c6e9f5873efca09bd2870ee8468b8fce.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-c708b65f2c382a03f69fe1efa8d341e6cff.png"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-9ab586c47dd5c7b92bca0d727962c90e3b8.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-ef954122a2080e02013112db21754b955c6.png"/></td>
-    </tr>	 
-    <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-088edb4d531e122415a1e2342bccb1a9691.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-f886fe19bd820c0efae82f680223cac196c.png"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-c7a2eb71fa65d6e660294b4bccca613d638.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-e60137fb0787defe613bd83331dc4755a70.png"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-7c51c1b5758f0a0f92ed3c60469b7526f9f.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-15181aed45bb2461aa97b594cbf2f86ea5f.png"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-83326ad52ea63f67233d126226738054d98.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-3bd6d31e913b70df00107db51d64ef81df7.png"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-70a2225836bc82042a6785edf6299e2586a.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-0184d6ab01fdc6667a14327fcaf8b46345d.png"/></td>
-    </tr>
-	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-64d8086dc2c02c8f71170290482f7640098.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
-    </tr>
-</table>
-
-
-## 若依交流群
-
-QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN)  [![加入QQ群](https://img.shields.io/badge/已满-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW)  [![加入QQ群](https://img.shields.io/badge/已满-1529866-blue.svg)](https://jq.qq.com/?_wv=1027&k=53R0L5Z)  [![加入QQ群](https://img.shields.io/badge/已满-1772718-blue.svg)](https://jq.qq.com/?_wv=1027&k=5g75dCU)  [![加入QQ群](https://img.shields.io/badge/已满-1366522-blue.svg)](https://jq.qq.com/?_wv=1027&k=58cPoHA)  [![加入QQ群](https://img.shields.io/badge/已满-1382251-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Ofd4Pb)  [![加入QQ群](https://img.shields.io/badge/已满-1145125-blue.svg)](https://jq.qq.com/?_wv=1027&k=5yugASz)  [![加入QQ群](https://img.shields.io/badge/已满-86752435-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Rf3d2P)  [![加入QQ群](https://img.shields.io/badge/已满-134072510-blue.svg)](https://jq.qq.com/?_wv=1027&k=5ZIjaeP)  [![加入QQ群](https://img.shields.io/badge/已满-210336300-blue.svg)](https://jq.qq.com/?_wv=1027&k=5CJw1jY)  [![加入QQ群](https://img.shields.io/badge/已满-339522636-blue.svg)](https://jq.qq.com/?_wv=1027&k=5omzbKc)  [![加入QQ群](https://img.shields.io/badge/已满-130035985-blue.svg)](https://jq.qq.com/?_wv=1027&k=qPIKBb7s)  [![加入QQ群](https://img.shields.io/badge/已满-143151071-blue.svg)](https://jq.qq.com/?_wv=1027&k=4NsjKbtU)  [![加入QQ群](https://img.shields.io/badge/已满-158781320-blue.svg)](https://jq.qq.com/?_wv=1027&k=VD2pkz2G)  [![加入QQ群](https://img.shields.io/badge/已满-201531282-blue.svg)](https://jq.qq.com/?_wv=1027&k=HlshFwkJ)  [![加入QQ群](https://img.shields.io/badge/已满-101526938-blue.svg)](https://jq.qq.com/?_wv=1027&k=0ARRrO9V)  [![加入QQ群](https://img.shields.io/badge/已满-264355400-blue.svg)](https://jq.qq.com/?_wv=1027&k=up9k3ZXJ)  [![加入QQ群](https://img.shields.io/badge/已满-298522656-blue.svg)](https://jq.qq.com/?_wv=1027&k=540WfdEr)  [![加入QQ群](https://img.shields.io/badge/已满-139845794-blue.svg)](https://jq.qq.com/?_wv=1027&k=ss91fC4t)  [![加入QQ群](https://img.shields.io/badge/已满-185760789-blue.svg)](https://jq.qq.com/?_wv=1027&k=Cqd66IKe) [![加入QQ群](https://img.shields.io/badge/已满-175104288-blue.svg)](https://jq.qq.com/?_wv=1027&k=7FplYUnR) [![加入QQ群](https://img.shields.io/badge/174942938-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lqMHu_5Fskm7H2S1vNAQTtzAUokVydwc&authKey=ptw0Fpch5pbNocML3CIJKKqZBaq2DI7cusKuzIgfMNiY3t9Pvd9hP%2BA8WYx3yaY1&noverify=0&group_code=174942938)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 61994cff1..377320203 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,8 @@
     <version>4.7.8</version>
 
     <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
+    <!--<url>http://www.ruoyi.vip</url>-->
+    <description>后端管理系统</description>
     
     <properties>
         <ruoyi.version>4.7.8</ruoyi.version>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 2e28443e9..9e975bb47 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -77,6 +77,12 @@
                 <version>2.5.15</version>
                 <configuration>
                     <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
                 </configuration>
                 <executions>
                     <execution>
@@ -129,6 +135,17 @@
             </plugin> -->
         </plugins>
         <finalName>${project.artifactId}</finalName>
+<!--            <resources>
+                <resource>
+                    <directory>src/main/resources</directory>
+                    <excludes>
+                        <exclude>*.yml</exclude>
+                        <exclude>*.xml</exclude>
+                    </excludes>
+                </resource>
+            </resources>-->
     </build>
 
+
+
 </project>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index a0e726bd4..2ecb34adf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,5 +1,6 @@
 package com.ruoyi;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ruoyi
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@MapperScan("com.ruoyi.system.mapper")
 public class RuoYiApplication
 {
     public static void main(String[] args)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/AccountAddressInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/AccountAddressInfoController.java
new file mode 100644
index 000000000..773e69418
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/AccountAddressInfoController.java
@@ -0,0 +1,122 @@
+package com.ruoyi.web.controller.account;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.AccountAddressInfo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.IAccountAddressInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 出账账户Controller
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Controller
+@RequestMapping("/account/transfer")
+public class AccountAddressInfoController extends BaseController
+{
+    private String prefix = "account/transfer";
+
+    @Autowired
+    private IAccountAddressInfoService accountAddressInfoService;
+
+    @RequiresPermissions("account:transfer:view")
+    @GetMapping()
+    public String transfer()
+    {
+        return prefix + "/transfer";
+    }
+
+    /**
+     * 查询出账账户列表
+     */
+    @RequiresPermissions("account:transfer:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(AccountAddressInfo accountAddressInfo) throws Exception {
+        startPage();
+        List<AccountAddressInfo> list = accountAddressInfoService.selectAccountAddressInfoListByResouce(accountAddressInfo);
+
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出出账账户列表
+     */
+    @RequiresPermissions("account:transfer:export")
+    @Log(title = "出账账户", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(AccountAddressInfo accountAddressInfo) throws Exception {
+        List<AccountAddressInfo> list = accountAddressInfoService.selectAccountAddressInfoListByResouce(accountAddressInfo);
+        ExcelUtil<AccountAddressInfo> util = new ExcelUtil<AccountAddressInfo>(AccountAddressInfo.class);
+        return util.exportExcel(list, "出账账户数据");
+    }
+
+    /**
+     * 新增出账账户
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存出账账户
+     */
+    @RequiresPermissions("account:transfer:add")
+    @Log(title = "出账账户", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(AccountAddressInfo accountAddressInfo) throws Exception {
+        return toAjax(accountAddressInfoService.insertAccountAddressInfo(accountAddressInfo));
+    }
+
+    /**
+     * 修改出账账户
+     */
+    @RequiresPermissions("account:transfer:edit")
+    @GetMapping("/edit/{idAccoutAddressInfo}")
+    public String edit(@PathVariable("idAccoutAddressInfo") Long idAccoutAddressInfo, ModelMap mmap)
+    {
+        AccountAddressInfo accountAddressInfo = accountAddressInfoService.selectAccountAddressInfoByIdAccoutAddressInfo(idAccoutAddressInfo);
+        mmap.put("accountAddressInfo", accountAddressInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存出账账户
+     */
+    @RequiresPermissions("account:transfer:edit")
+    @Log(title = "出账账户", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(AccountAddressInfo accountAddressInfo) throws Exception {
+        return toAjax(accountAddressInfoService.updateAccountAddressInfo(accountAddressInfo));
+    }
+
+    /**
+     * 删除出账账户
+     */
+    @RequiresPermissions("account:transfer:remove")
+    @Log(title = "出账账户", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(accountAddressInfoService.deleteAccountAddressInfoByIdAccoutAddressInfos(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/FreezeBalanceInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/FreezeBalanceInfoController.java
new file mode 100644
index 000000000..789c4a05e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/FreezeBalanceInfoController.java
@@ -0,0 +1,128 @@
+package com.ruoyi.web.controller.account;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.FreezeBalanceInfo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.IAccountAddressInfoService;
+import com.ruoyi.system.service.IFreezeBalanceInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 抵押流水记录Controller
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Controller
+@RequestMapping("/account/freeze")
+public class FreezeBalanceInfoController extends BaseController
+{
+    private String prefix = "account/freeze";
+
+    @Autowired
+    private IFreezeBalanceInfoService freezeBalanceInfoService;
+
+    @Autowired
+    private IAccountAddressInfoService accountAddressInfoService;
+
+    @RequiresPermissions("account:freeze:view")
+    @GetMapping()
+    public String freeze()
+    {
+        return prefix + "/freeze";
+    }
+
+    /**
+     * 查询抵押流水记录列表
+     */
+    @RequiresPermissions("account:freeze:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(FreezeBalanceInfo freezeBalanceInfo)
+    {
+        startPage();
+        List<FreezeBalanceInfo> list = freezeBalanceInfoService.selectFreezeBalanceInfoList(freezeBalanceInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出抵押流水记录列表
+     */
+    @RequiresPermissions("account:freeze:export")
+    @Log(title = "抵押流水记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(FreezeBalanceInfo freezeBalanceInfo)
+    {
+        List<FreezeBalanceInfo> list = freezeBalanceInfoService.selectFreezeBalanceInfoList(freezeBalanceInfo);
+        ExcelUtil<FreezeBalanceInfo> util = new ExcelUtil<FreezeBalanceInfo>(FreezeBalanceInfo.class);
+        return util.exportExcel(list, "抵押流水记录数据");
+    }
+
+    /**
+     * 新增抵押流水记录
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+        mmap.put("accountAddressList", accountAddressInfoService.selectAccountAddressInfoAll());
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存抵押流水记录
+     */
+    @RequiresPermissions("account:freeze:add")
+    @Log(title = "抵押流水记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(FreezeBalanceInfo freezeBalanceInfo) throws Exception {
+        return toAjax(freezeBalanceInfoService.insertFreezeBalanceInfo(freezeBalanceInfo));
+    }
+
+    /**
+     * 修改抵押流水记录
+     */
+    @RequiresPermissions("account:freeze:edit")
+    @GetMapping("/edit/{idFreezeBalanceInfo}")
+    public String edit(@PathVariable("idFreezeBalanceInfo") Long idFreezeBalanceInfo, ModelMap mmap)
+    {
+        FreezeBalanceInfo freezeBalanceInfo = freezeBalanceInfoService.selectFreezeBalanceInfoByIdFreezeBalanceInfo(idFreezeBalanceInfo);
+        mmap.put("freezeBalanceInfo", freezeBalanceInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存抵押流水记录
+     */
+    @RequiresPermissions("account:freeze:edit")
+    @Log(title = "抵押流水记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(FreezeBalanceInfo freezeBalanceInfo)
+    {
+        return toAjax(freezeBalanceInfoService.updateFreezeBalanceInfo(freezeBalanceInfo));
+    }
+
+    /**
+     * 删除抵押流水记录
+     */
+    @RequiresPermissions("account:freeze:remove")
+    @Log(title = "抵押流水记录", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(freezeBalanceInfoService.deleteFreezeBalanceInfoByIdFreezeBalanceInfos(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/MonitorAddressInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/MonitorAddressInfoController.java
new file mode 100644
index 000000000..d75d6f9c6
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/MonitorAddressInfoController.java
@@ -0,0 +1,129 @@
+package com.ruoyi.web.controller.account;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.MonitorAddressInfo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.IAccountAddressInfoService;
+import com.ruoyi.system.service.IMonitorAddressInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 监听账户入账Controller
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Controller
+@RequestMapping("/account/monitor")
+public class MonitorAddressInfoController extends BaseController
+{
+    private String prefix = "account/monitor";
+
+    @Autowired
+    private IMonitorAddressInfoService monitorAddressInfoService;
+    @Autowired
+    private IAccountAddressInfoService accountAddressInfoService;
+
+    @RequiresPermissions("account:monitor:view")
+    @GetMapping()
+    public String monitor()
+    {
+        return prefix + "/monitor";
+    }
+
+    /**
+     * 查询监听账户入账列表
+     */
+    @RequiresPermissions("account:monitor:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(MonitorAddressInfo monitorAddressInfo)
+    {
+        startPage();
+        List<MonitorAddressInfo> list = monitorAddressInfoService.selectMonitorAddressInfoList(monitorAddressInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出监听账户入账列表
+     */
+    @RequiresPermissions("account:monitor:export")
+    @Log(title = "监听账户入账", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(MonitorAddressInfo monitorAddressInfo)
+    {
+        List<MonitorAddressInfo> list = monitorAddressInfoService.selectMonitorAddressInfoList(monitorAddressInfo);
+        ExcelUtil<MonitorAddressInfo> util = new ExcelUtil<MonitorAddressInfo>(MonitorAddressInfo.class);
+        return util.exportExcel(list, "监听账户入账数据");
+    }
+
+    /**
+     * 新增监听账户入账
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+        mmap.put("accountAddressList", accountAddressInfoService.selectAccountAddressInfoAll());
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存监听账户入账
+     */
+    @RequiresPermissions("account:monitor:add")
+    @Log(title = "监听账户入账", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(MonitorAddressInfo monitorAddressInfo)
+    {
+        return toAjax(monitorAddressInfoService.insertMonitorAddressInfo(monitorAddressInfo));
+    }
+
+    /**
+     * 修改监听账户入账
+     */
+    @RequiresPermissions("account:monitor:edit")
+    @GetMapping("/edit/{idMonitorAddress}")
+    public String edit(@PathVariable("idMonitorAddress") Long idMonitorAddress, ModelMap mmap)
+    {
+        MonitorAddressInfo monitorAddressInfo = monitorAddressInfoService.selectMonitorAddressInfoByIdMonitorAddress(idMonitorAddress);
+        mmap.put("monitorAddressInfo", monitorAddressInfo);
+        mmap.put("accountAddressList", accountAddressInfoService.selectAccountAddressInfoAll());
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存监听账户入账
+     */
+    @RequiresPermissions("account:monitor:edit")
+    @Log(title = "监听账户入账", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(MonitorAddressInfo monitorAddressInfo)
+    {
+        return toAjax(monitorAddressInfoService.updateMonitorAddressInfo(monitorAddressInfo));
+    }
+
+    /**
+     * 删除监听账户入账
+     */
+    @RequiresPermissions("account:monitor:remove")
+    @Log(title = "监听账户入账", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(monitorAddressInfoService.deleteMonitorAddressInfoByIdMonitorAddresss(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/TenantInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/TenantInfoController.java
new file mode 100644
index 000000000..66c9a9dd7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/account/TenantInfoController.java
@@ -0,0 +1,142 @@
+package com.ruoyi.web.controller.account;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.MonitorAddressInfo;
+import com.ruoyi.common.core.domain.entity.TenantInfo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.IMonitorAddressInfoService;
+import com.ruoyi.system.service.ITenantInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 租户Controller
+ * 
+ * @author dorion
+ * @date 2024-04-14
+ */
+@Controller
+@RequestMapping("/account/tenant")
+public class TenantInfoController extends BaseController
+{
+    private String prefix = "account/tenant";
+
+    @Autowired
+    private ITenantInfoService tenantInfoService;
+    @Autowired
+    private IMonitorAddressInfoService monitorAddressInfoService;
+
+    @RequiresPermissions("account:tenant:view")
+    @GetMapping()
+    public String tenant()
+    {
+        return prefix + "/tenant";
+    }
+
+    /**
+     * 查询租户列表
+     */
+    @RequiresPermissions("account:tenant:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TenantInfo tenantInfo)
+    {
+        startPage();
+        List<TenantInfo> list = tenantInfoService.selectTenantInfoList(tenantInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出租户列表
+     */
+    @RequiresPermissions("account:tenant:export")
+    @Log(title = "租户", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TenantInfo tenantInfo)
+    {
+        List<TenantInfo> list = tenantInfoService.selectTenantInfoList(tenantInfo);
+        ExcelUtil<TenantInfo> util = new ExcelUtil<TenantInfo>(TenantInfo.class);
+        return util.exportExcel(list, "租户数据");
+    }
+
+    /**
+     * 新增租户
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    {
+
+        List<MonitorAddressInfo> monitorAddressAccountList = monitorAddressInfoService.selectAllValidMonitorAddressAccount();
+        mmap.put("monitorAddressInfoList", monitorAddressAccountList);
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存租户
+     */
+    @RequiresPermissions("account:tenant:add")
+    @Log(title = "租户", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TenantInfo tenantInfo)
+    {
+        return toAjax(tenantInfoService.insertTenantInfo(tenantInfo));
+    }
+
+    /**
+     * 修改租户
+     */
+    @RequiresPermissions("account:tenant:edit")
+    @GetMapping("/edit/{idTenantInfo}")
+    public String edit(@PathVariable("idTenantInfo") Long idTenantInfo, ModelMap mmap)
+    {
+        TenantInfo tenantInfo = tenantInfoService.selectTenantInfoByIdTenantInfo(idTenantInfo);
+        mmap.put("tenantInfo", tenantInfo);
+
+        List<MonitorAddressInfo> monitorAddressInfoList = monitorAddressInfoService.selectAllValidMonitorAddressAccount();
+        mmap.put("monitorAddressInfoList", monitorAddressInfoList);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存租户
+     */
+    @RequiresPermissions("account:tenant:edit")
+    @Log(title = "租户", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TenantInfo tenantInfo)
+    {
+        return toAjax(tenantInfoService.updateTenantInfo(tenantInfo));
+    }
+
+    /**
+     * 删除租户
+     */
+    @RequiresPermissions("account:tenant:remove")
+    @Log(title = "租户", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tenantInfoService.deleteTenantInfoByIdTenantInfos(ids));
+    }
+
+    @RequiresPermissions("account:tenant:add")
+    @Log(title = "租户", businessType = BusinessType.ACTIVE_DATA)
+    @PostMapping( "/activeData")
+    @ResponseBody
+    public AjaxResult activeData(String ids) throws Exception {
+        return toAjax(tenantInfoService.activeDataTenantInfoByIdTenantInfos(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exchange/TrxExchangeInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exchange/TrxExchangeInfoController.java
new file mode 100644
index 000000000..f6e463bcc
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exchange/TrxExchangeInfoController.java
@@ -0,0 +1,128 @@
+package com.ruoyi.web.controller.exchange;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.TrxExchangeInfo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.TrxExchange;
+import com.ruoyi.system.service.IAccountAddressInfoService;
+import com.ruoyi.system.service.ITrxExchangeInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * trx兑能量记录Controller
+ *
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Controller
+@RequestMapping("/exchange/trx")
+public class TrxExchangeInfoController extends BaseController
+{
+    private String prefix = "exchange/trx";
+
+    @Autowired
+    private ITrxExchangeInfoService trxExchangeInfoService;
+
+    @Autowired
+    private IAccountAddressInfoService accountAddressInfoService;
+
+    @RequiresPermissions("exchange:trx:view")
+    @GetMapping()
+    public String trx()
+    {
+        return prefix + "/trx";
+    }
+
+    /**
+     * 查询trx兑能量记录列表
+     */
+    @RequiresPermissions("exchange:trx:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TrxExchangeInfo trxExchangeInfo)
+    {
+        startPage();
+        List<TrxExchangeInfo> list = trxExchangeInfoService.selectTrxExchangeInfoList(trxExchangeInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出trx兑能量记录列表
+     */
+    @RequiresPermissions("exchange:trx:export")
+    @Log(title = "trx兑能量记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TrxExchangeInfo trxExchangeInfo)
+    {
+        List<TrxExchangeInfo> list = trxExchangeInfoService.selectTrxExchangeInfoList(trxExchangeInfo);
+        ExcelUtil<TrxExchangeInfo> util = new ExcelUtil<TrxExchangeInfo>(TrxExchangeInfo.class);
+        return util.exportExcel(list, "trx兑能量记录数据");
+    }
+
+    /**
+     * 新增trx兑能量记录
+     */
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
+    { mmap.put("accountAddressList", accountAddressInfoService.selectAccountAddressInfoAll());
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存trx兑能量记录
+     */
+    @RequiresPermissions("exchange:trx:add")
+    @Log(title = "trx兑能量记录", businessType = BusinessType.INSERT)
+    @PostMapping("/delegate")
+    @ResponseBody
+    public AjaxResult delegate(TrxExchange trxExchange) throws Exception {
+        return toAjax(trxExchangeInfoService.delegate(trxExchange,false));
+    }
+
+    /**
+     * 修改trx兑能量记录
+     */
+    @RequiresPermissions("exchange:trx:edit")
+    @GetMapping("/edit/{idTrxExchangeInfo}")
+    public String edit(@PathVariable("idTrxExchangeInfo") Long idTrxExchangeInfo, ModelMap mmap)
+    {
+        TrxExchangeInfo trxExchangeInfo = trxExchangeInfoService.selectTrxExchangeInfoByIdTrxExchangeInfo(idTrxExchangeInfo);
+        mmap.put("trxExchangeInfo", trxExchangeInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存trx兑能量记录
+     */
+    @RequiresPermissions("exchange:trx:edit")
+    @Log(title = "trx兑能量记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TrxExchangeInfo trxExchangeInfo)
+    {
+        return toAjax(trxExchangeInfoService.updateTrxExchangeInfo(trxExchangeInfo));
+    }
+
+    /**
+     * 删除trx兑能量记录
+     */
+    @RequiresPermissions("exchange:trx:remove")
+    @Log(title = "trx兑能量记录", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(trxExchangeInfoService.deleteTrxExchangeInfoByIdTrxExchangeInfos(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ErrorLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ErrorLogController.java
new file mode 100644
index 000000000..0d515c466
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ErrorLogController.java
@@ -0,0 +1,124 @@
+package com.ruoyi.web.controller.monitor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.ErrorLog;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.IErrorLogService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 错误日志Controller
+ *
+ * @author dorion
+ * @date 2024-04-14
+ */
+@Controller
+@RequestMapping("/monitor/err")
+public class ErrorLogController extends BaseController
+{
+    private String prefix = "monitor/err";
+
+    @Autowired
+    private IErrorLogService errorLogService;
+
+    @RequiresPermissions("monitor:err:view")
+    @GetMapping()
+    public String err()
+    {
+        return prefix + "/err";
+    }
+
+    /**
+     * 查询错误日志列表
+     */
+    @RequiresPermissions("monitor:err:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ErrorLog errorLog)
+    {
+        startPage();
+        List<ErrorLog> list = errorLogService.selectErrorLogList(errorLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出错误日志列表
+     */
+    @RequiresPermissions("monitor:err:export")
+    @Log(title = "错误日志", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(ErrorLog errorLog)
+    {
+        List<ErrorLog> list = errorLogService.selectErrorLogList(errorLog);
+        ExcelUtil<ErrorLog> util = new ExcelUtil<ErrorLog>(ErrorLog.class);
+        return util.exportExcel(list, "错误日志数据");
+    }
+
+    /**
+     * 新增错误日志
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存错误日志
+     */
+    @RequiresPermissions("monitor:err:add")
+    @Log(title = "错误日志", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ErrorLog errorLog)
+    {
+        return toAjax(errorLogService.insertErrorLog(errorLog));
+    }
+
+    /**
+     * 修改错误日志
+     */
+    @RequiresPermissions("monitor:err:edit")
+    @GetMapping("/edit/{idErrorLog}")
+    public String edit(@PathVariable("idErrorLog") Long idErrorLog, ModelMap mmap)
+    {
+        ErrorLog errorLog = errorLogService.selectErrorLogByIdErrorLog(idErrorLog);
+        mmap.put("errorLog", errorLog);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存错误日志
+     */
+    @RequiresPermissions("monitor:err:edit")
+    @Log(title = "错误日志", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ErrorLog errorLog)
+    {
+        return toAjax(errorLogService.updateErrorLog(errorLog));
+    }
+
+    /**
+     * 删除错误日志
+     */
+    @RequiresPermissions("monitor:err:remove")
+    @Log(title = "错误日志", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(errorLogService.deleteErrorLogByIdErrorLogs(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/RedisConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/RedisConfig.java
new file mode 100644
index 000000000..f03b7c903
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/RedisConfig.java
@@ -0,0 +1,105 @@
+package com.ruoyi.web.core.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * redis配置
+ *
+ * @author pangjianhui
+ */
+@Configuration
+@EnableCaching
+public class RedisConfig extends CachingConfigurerSupport {
+
+    @Bean
+    RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory,
+                                            MessageListenerAdapter listenerAdapter) {
+
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+        container.addMessageListener(listenerAdapter, new PatternTopic("chat"));
+
+        return container;
+    }
+
+
+    @Bean
+    MessageListenerAdapter listenerAdapter(Receiver receiver) {
+        return new MessageListenerAdapter(receiver, "receiveMessage");
+    }
+
+    @Bean
+    Receiver receiver(CountDownLatch latch) {
+        return new Receiver(latch);
+    }
+
+    @Bean
+    CountDownLatch latch() {
+        return new CountDownLatch(1);
+    }
+
+    @Bean
+    StringRedisTemplate template(RedisConnectionFactory connectionFactory) {
+
+        return new StringRedisTemplate(connectionFactory);
+    }
+
+
+    @Bean
+    @SuppressWarnings("all")
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+        RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
+        template.setConnectionFactory(factory);
+        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+        ObjectMapper om = new ObjectMapper();
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        jackson2JsonRedisSerializer.setObjectMapper(om);
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+        // key采用String的序列化方式
+        template.setKeySerializer(stringRedisSerializer);
+        // hash的key也采用String的序列化方式
+        template.setHashKeySerializer(stringRedisSerializer);
+        // value序列化方式采用jackson
+        template.setValueSerializer(jackson2JsonRedisSerializer);
+        // hash的value序列化方式采用jackson
+        template.setHashValueSerializer(jackson2JsonRedisSerializer);
+        template.afterPropertiesSet();
+        return template;
+    }
+
+
+    public class Receiver {
+
+
+        private CountDownLatch latch;
+
+        @Autowired
+        public Receiver(CountDownLatch latch) {
+            this.latch = latch;
+        }
+
+        public void receiveMessage(String message) {
+            latch.countDown();
+        }
+    }
+
+
+}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index a69d8feb2..3f033387a 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/tg_trx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0dc885f68..7ee7d7a00 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 80
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /
@@ -73,6 +73,28 @@ spring:
       # 热部署开关
       enabled: true
 
+  redis:
+    # Redis数据库索引（默认为0）
+    database: 4
+    # Redis服务器地址
+    host: 127.0.0.1
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: myredis
+    jedis:
+      pool:
+        # 连接池最大连接数（使用负值表示没有限制）
+        max-active: 8
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池中的最小空闲连接
+        min-idle: 0
+    # 连接超时时间（毫秒）
+    timeout: 2000
+
 # MyBatis
 mybatis:
   # 搜索指定包别名
@@ -81,6 +103,8 @@ mybatis:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
+  configuration:
+    map-underscore-to-camel-case: true
 
 # PageHelper分页插件
 pagehelper:
@@ -140,3 +164,5 @@ xss:
 swagger:
   # 是否开启swagger
   enabled: true
+
+
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 6c6d0216a..44f47baa3 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -1103,6 +1103,19 @@ var table = {
                 }
                 return url;
             },
+            //触发
+            activeData: function(id) {
+                table.set();
+                $.modal.confirm("确定手动发起" + table.options.modalName + "交易吗？", function() {
+                    var url = $.common.isEmpty(id) ? table.options.activeDataUrl : table.options.activeDataUrl.replace("{id}", id);
+                    if (table.options.type == table_type.bootstrapTreeTable) {
+                        $.operate.get(url);
+                    } else {
+                        var data = { "ids": id };
+                        $.operate.submit(url, "post", "json", data);
+                    }
+                });
+            },
             // 删除信息
             remove: function(id) {
                 table.set();
diff --git a/ruoyi-admin/src/main/resources/templates/account/freeze/add.html b/ruoyi-admin/src/main/resources/templates/account/freeze/add.html
new file mode 100644
index 000000000..a3bd6e806
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/freeze/add.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增抵押流水记录')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-freeze-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">账户地址：</label>
+                <div class="col-sm-8">
+<!--                    <input name="address" class="form-control" type="text">-->
+                    <select id="address"  name="address" class="form-control " >
+                        <option th:each="accountAddress:${accountAddressList}" th:value="${accountAddress.address}" th:text="${accountAddress.address}" ></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">抵押金额TRX：</label>
+                <div class="col-sm-8">
+                    <input name="freezeTrxAmount" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">交换资源：</label>
+                <div class="col-sm-8">
+                    <select class="form-control" name="exchangeResourceType" th:with="type=${@dict.getType('sys_trx_exchange')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+
+
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "account/freeze"
+        $("#form-freeze-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-freeze-add').serialize());
+            }
+        }
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/freeze/edit.html b/ruoyi-admin/src/main/resources/templates/account/freeze/edit.html
new file mode 100644
index 000000000..861262522
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/freeze/edit.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改抵押流水记录')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-freeze-edit" th:object="${freezeBalanceInfo}">
+            <input name="idFreezeBalanceInfo" th:field="*{idFreezeBalanceInfo}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">账户地址：</label>
+                <div class="col-sm-8">
+                    <input name="address" th:field="*{address}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">抵押金额trx：</label>
+                <div class="col-sm-8">
+                    <input name="freezeTrxAmount" th:field="*{freezeTrxAmount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">交易id：</label>
+                <div class="col-sm-8">
+                    <input name="txId" th:field="*{txId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="fcd" th:value="${#dates.format(freezeBalanceInfo.fcd, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="lcd" th:value="${#dates.format(freezeBalanceInfo.lcd, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "account/freeze";
+        $("#form-freeze-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-freeze-edit').serialize());
+            }
+        }
+
+        $("input[name='fcd']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='lcd']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/freeze/freeze.html b/ruoyi-admin/src/main/resources/templates/account/freeze/freeze.html
new file mode 100644
index 000000000..4e31262e7
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/freeze/freeze.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('抵押流水记录列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>账户地址：</label>
+                                <input type="text" name="address"/>
+                            </li>
+
+                            <li>
+                                <label>交易id：</label>
+                                <input type="text" name="txId"/>
+                            </li>
+                            <li>
+                                <label>交换资源：</label>
+                                <select class="form-control" name="exchangeResourceType" th:with="type=${@dict.getType('sys_trx_exchange')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>创建时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择创建时间" name="fcd"/>
+                            </li>
+
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="account:freeze:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+              <!--  <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="account:freeze:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="account:freeze:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>-->
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="account:freeze:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('account:freeze:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('account:freeze:remove')}]];
+        var prefix = ctx + "account/freeze";
+        var datas = [[${@dict.getType('sys_trx_exchange')}]];
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "抵押流水记录",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'idFreezeBalanceInfo',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'address',
+                    title: '账户地址'
+                },
+                {
+                    field: 'freezeTrxAmount',
+                    title: '抵押金额TRX'
+                },
+                {
+                    field: 'exchangeResourceType',
+                    title: '交换资源',
+                    formatter: function(value, item, index) {
+                        return $.table.selectDictLabel(datas, item.exchangeResourceType);
+                    }
+                },
+                {
+                    field: 'txId',
+                    title: '交易id'
+                },
+                    {
+                        field: 'fcd',
+                        title: '创建时间'
+                    },
+                    {
+                        field: 'fcu',
+                        title: '创建用户'
+                    },
+                    {
+                        field: 'lcd',
+                        title: '更新时间'
+                    },
+                    {
+                        field: 'lcu',
+                        title: '更新用户'
+                    },
+
+                    {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        /*actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.idFreezeBalanceInfo + '\')"><i class="fa fa-edit"></i>编辑</a> ');*/
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.idFreezeBalanceInfo + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/monitor/add.html b/ruoyi-admin/src/main/resources/templates/account/monitor/add.html
new file mode 100644
index 000000000..dceb18328
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/monitor/add.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('新增监听账户入账')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-monitor-add">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">监听地址：</label>
+            <div class="col-sm-8">
+                <input name="monitorAddress" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">出账地址：</label>
+            <div class="col-sm-8">
+               <!-- <input name="accountAddress" class="form-control" type="text">-->
+                <select id="accountAddress"  name="accountAddress" class="form-control " >
+                    <option th:each="accountAddress:${accountAddressList}" th:value="${accountAddress.address}" th:text="${accountAddress.address}" ></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">单价：</label>
+            <div class="col-sm-8">
+                <input name="price" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">监听类型：</label>
+            <div class="col-sm-8">
+                <select class="form-control" name="monitorType" th:with="type=${@dict.getType('sys_monitor_type')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label">API_KEY：</label>
+            <div class="col-sm-8">
+                <select name="apiKey" class="form-control m-b" th:with="type=${@dict.getType('sys_tron_api_key')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<script th:inline="javascript">
+    var prefix = ctx + "account/monitor"
+    $("#form-monitor-add").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/add", $('#form-monitor-add').serialize());
+        }
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/monitor/edit.html b/ruoyi-admin/src/main/resources/templates/account/monitor/edit.html
new file mode 100644
index 000000000..1dc951030
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/monitor/edit.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改监听账户入账')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-monitor-edit" th:object="${monitorAddressInfo}">
+            <input name="idMonitorAddress" th:field="*{idMonitorAddress}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">监听地址：</label>
+                <div class="col-sm-8">
+                    <input name="monitorAddress" th:field="*{monitorAddress}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出账地址：</label>
+                <div class="col-sm-8">
+                   <!-- <input name="accountAddress" th:field="*{accountAddress}" class="form-control" type="text">-->
+                    <select id="accountAddress"  name="accountAddress" class="form-control " >
+                        <option th:each="accountAddressInfo:${accountAddressList}" th:value="${accountAddressInfo.address}" th:text="${accountAddressInfo.address}" th:field="*{accountAddress}"></option>
+                    </select>
+
+
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">单价：</label>
+                <div class="col-sm-8">
+                    <input name="price" th:field="*{price}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否有效：</label>
+                <div class="col-sm-8">
+                    <select class="form-control" name="isValid" th:with="type=${@dict.getType('sys_yes_no')}">
+                        <option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isValid}"></option>
+                    </select>
+                </div>
+
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">监听类型：</label>
+                <div class="col-sm-8">
+                    <select class="form-control" name="monitorType" th:with="type=${@dict.getType('sys_monitor_type')}">
+                        <option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{monitorType}"></option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label">API_KEY：</label>
+                <div class="col-sm-8">
+                    <select name="apiKey" class="form-control m-b" th:with="type=${@dict.getType('sys_tron_api_key')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{apiKey}"></option>
+                    </select>
+                </div>
+            </div>
+
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "account/monitor";
+        $("#form-monitor-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-monitor-edit').serialize());
+            }
+        }
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/monitor/monitor.html b/ruoyi-admin/src/main/resources/templates/account/monitor/monitor.html
new file mode 100644
index 000000000..090217906
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/monitor/monitor.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('监听账户入账列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>监听地址：</label>
+                                <input type="text" name="monitorAddress"/>
+                            </li>
+                            <li>
+                                <label>出账地址：</label>
+                                <input type="text" name="accountAddress"/>
+                            </li>
+                           <!-- <li>
+                                <label>单位：</label>
+                                <input type="text" name="price"/>
+                            </li>-->
+                            <li>
+                                <label>是否有效：</label>
+                                <select class="form-control" name="isValid" th:with="type=${@dict.getType('sys_yes_no')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>监听类型：</label>
+                                <select class="form-control" name="monitorType" th:with="type=${@dict.getType('sys_monitor_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>创建时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择创建时间" name="fcd"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="account:monitor:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="account:monitor:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="account:monitor:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="account:monitor:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('account:monitor:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('account:monitor:remove')}]];
+        var prefix = ctx + "account/monitor";
+        var datas = [[${@dict.getType('sys_yes_no')}]];
+        var monitorTypeDatas = [[${@dict.getType('sys_monitor_type')}]];
+        var apiKeyDatas = [[${@dict.getType('sys_tron_api_key')}]];
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "监听账户入账",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'idMonitorAddress',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'monitorAddress',
+                    title: '监听地址'
+                },
+                {
+                    field: 'accountAddress',
+                    title: '出账地址'
+                },
+                {
+                    field: 'price',
+                    title: '单价'
+                },
+                {
+                    field: 'monitorType',
+                    title: '监听类型',
+                    formatter: function(value, item, index) {
+                        return $.table.selectDictLabel(monitorTypeDatas, item.monitorType);
+                    }
+                },
+                    {
+                        field: 'apiKey',
+                        title: 'API_KEY',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(apiKeyDatas, value);
+                        }
+                    },
+                {
+                    field: 'isValid',
+                    title: '是否有效',
+                    formatter: function(value, item, index) {
+                        return $.table.selectDictLabel(datas, item.isValid);
+                    }
+                },
+                    {
+                        field: 'fcd',
+                        title: '创建时间'
+                    },
+                    {
+                        field: 'fcu',
+                        title: '创建用户'
+                    },
+                    {
+                        field: 'lcd',
+                        title: '更新时间'
+                    },
+                    {
+                        field: 'lcu',
+                        title: '更新用户'
+                    },
+
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.idMonitorAddress + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.idMonitorAddress + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/tenant/add.html b/ruoyi-admin/src/main/resources/templates/account/tenant/add.html
new file mode 100644
index 000000000..5500dfbc6
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/tenant/add.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增租户')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-tenant-add">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">接收能量地址：</label>
+            <div class="col-sm-8">
+                <input name="receiverAddress" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">监控入账地址：</label>
+            <div class="col-sm-8">
+           <!--     <input name="accountAddress" class="form-control" type="text">-->
+                <select id="monitorAddress"  name="monitorAddress" class="form-control " >
+                    <option th:each="monitorAddressInfo:${monitorAddressInfoList}" th:value="${monitorAddressInfo.monitorAddress}" th:text="${monitorAddressInfo.monitorAddress}" ></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">单价：</label>
+            <div class="col-sm-8">
+                <input name="price" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">笔数：</label>
+            <div class="col-sm-8">
+                <select name="transferCount" class="form-control m-b" th:with="type=${@dict.getType('sys_transfer_number')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">交易单位：</label>
+            <div class="col-sm-8">
+                <select name="exchangeUnit" class="form-control m-b" th:with="type=${@dict.getType('sys_monitor_type')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">租期：</label>
+            <div class="col-sm-8">
+                <select name="period" class="form-control m-b" th:with="type=${@dict.getType('sys_lock_period_day')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
+
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "account/tenant"
+    $("#form-tenant-add").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/add", $('#form-tenant-add').serialize());
+        }
+    }
+
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/tenant/edit.html b/ruoyi-admin/src/main/resources/templates/account/tenant/edit.html
new file mode 100644
index 000000000..0be523564
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/tenant/edit.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改租户')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-tenant-edit" th:object="${tenantInfo}">
+        <input name="idTenantInfo" th:field="*{idTenantInfo}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">接收能量地址：</label>
+            <div class="col-sm-8">
+                <input name="receiverAddress" th:field="*{receiverAddress}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">监控入账地址：</label>
+            <div class="col-sm-8">
+               <!-- <input name="accountAddress" th:field="*{accountAddress}" class="form-control" type="text">-->
+                <select id="monitorAddress"  name="monitorAddress" class="form-control " >
+                    <option th:each="monitorAddressInfo:${monitorAddressInfoList}" th:value="${monitorAddressInfo.monitorAddress}" th:text="${monitorAddressInfo.monitorAddress}" th:field="*{monitorAddress}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">单价：</label>
+            <div class="col-sm-8">
+                <input name="price" th:field="*{price}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">笔数：</label>
+            <div class="col-sm-8">
+                <select name="transferCount" class="form-control m-b" th:with="type=${@dict.getType('sys_transfer_number')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{transferCount}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">交易单位：</label>
+            <div class="col-sm-8">
+                <select name="exchangeUnit" class="form-control m-b" th:with="type=${@dict.getType('sys_monitor_type')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{exchangeUnit}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">交易总额：</label>
+            <div class="col-sm-8">
+                <input name="exchangeAmount" th:field="*{exchangeAmount}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">是否到账：</label>
+            <div class="col-sm-8">
+                <select name="isPaid" class="form-control m-b" th:with="type=${@dict.getType('sys_is_paid')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isPaid}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">租期：</label>
+            <div class="col-sm-8">
+                <select name="period" class="form-control m-b" th:with="type=${@dict.getType('sys_lock_period_day')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{period}"></option>
+                </select>
+            </div>
+        </div>
+
+        <input name="fcd" th:value="${#dates.format(tenantInfo.fcd, 'yyyy-MM-dd HH:mm:ss')}"  type="hidden">
+
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "account/tenant";
+    $("#form-tenant-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-tenant-edit').serialize());
+        }
+    }
+
+    $("input[name='finishTransferTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='fcd']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='lcd']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/tenant/tenant.html b/ruoyi-admin/src/main/resources/templates/account/tenant/tenant.html
new file mode 100644
index 000000000..1add315ef
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/tenant/tenant.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('租户列表')" />
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>接收能量地址：</label>
+                            <input type="text" name="receiverAddress"/>
+                        </li>
+                        <li>
+                            <label>出账账户地址：</label>
+                            <input type="text" name="accountAddress"/>
+                        </li>
+                        <li>
+                            <label>交易单位：</label>
+                            <select name="exchangeUnit" th:with="type=${@dict.getType('sys_monitor_type')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>创建时间：</label>
+                            <input type="text" class="time-input" placeholder="请选择创建时间" name="fcd"/>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="account:tenant:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="account:tenant:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="account:tenant:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="account:tenant:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('account:tenant:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('account:tenant:remove')}]];
+    var transferCountDatas = [[${@dict.getType('sys_transfer_number')}]];
+    var exchangeUnitDatas = [[${@dict.getType('sys_monitor_type')}]];
+    var isPaidDatas = [[${@dict.getType('sys_is_paid')}]];
+    var periodDatas = [[${@dict.getType('sys_lock_period_day')}]];
+    var prefix = ctx + "account/tenant";
+
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            activeDataUrl: prefix + "/activeData",
+            exportUrl: prefix + "/export",
+            modalName: "租户能量",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'idTenantInfo',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'receiverAddress',
+                    title: '接收能量地址'
+                },
+                {
+                    field: 'monitorAddress',
+                    title: '监控入账地址'
+                },
+                {
+                    field: 'price',
+                    title: '单价'
+                },
+                {
+                    field: 'transferCount',
+                    title: '笔数',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(transferCountDatas, value);
+                    }
+                },
+                {
+                    field: 'exchangeUnit',
+                    title: '交易单位',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(exchangeUnitDatas, value);
+                    }
+                },
+                {
+                    field: 'exchangeAmount',
+                    title: '交易总额'
+                },
+                {
+                    field: 'isPaid',
+                    title: '是否到账',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(isPaidDatas, value);
+                    }
+                },
+                {
+                    field: 'period',
+                    title: '租期',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(periodDatas, value);
+                    }
+                },
+                {
+                    field: 'finishTransferTime',
+                    title: '最终到期日期'
+                },
+                {
+                    field: 'fcd',
+                    title: '创建时间'
+                },
+                {
+                    field: 'fcu',
+                    title: '创建用户'
+                },
+                {
+                    field: 'lcd',
+                    title: '更新时间'
+                },
+                {
+                    field: 'lcu',
+                    title: '更新用户'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.idTenantInfo + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.idTenantInfo + '\')"><i class="fa fa-remove"></i>删除</a>&nbsp;');
+                        actions.push('<a class="btn btn-warning btn-xs' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.activeData(\'' + row.idTenantInfo + '\')"><i class="fa fa-remove"></i>发起</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/transfer/add.html b/ruoyi-admin/src/main/resources/templates/account/transfer/add.html
new file mode 100644
index 000000000..f6e0cc30c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/transfer/add.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增出账账户')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-transfer-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">地址：</label>
+                <div class="col-sm-8">
+                    <input name="address" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">秘钥：</label>
+                <div class="col-sm-8">
+                    <input name="encryptPrivateKey" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "account/transfer"
+        $("#form-transfer-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-transfer-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/transfer/edit.html b/ruoyi-admin/src/main/resources/templates/account/transfer/edit.html
new file mode 100644
index 000000000..3bddc7fa5
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/transfer/edit.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改出账账户')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-transfer-edit" th:object="${accountAddressInfo}">
+            <input name="idAccoutAddressInfo" th:field="*{idAccoutAddressInfo}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">地址：</label>
+                <div class="col-sm-8">
+                    <input name="address" th:field="*{address}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">秘钥：</label>
+                <div class="col-sm-8">
+                    <input name="encryptPrivateKey"  class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "account/transfer";
+        $("#form-transfer-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-transfer-edit').serialize());
+            }
+        }
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/account/transfer/transfer.html b/ruoyi-admin/src/main/resources/templates/account/transfer/transfer.html
new file mode 100644
index 000000000..17022ed60
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/account/transfer/transfer.html
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('出账账户列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>地址：</label>
+                                <input type="text" name="address"/>
+                            </li>
+                            <!--    <li>
+                                    <label>加密之后的账户秘钥：</label>
+                                    <input type="text" name="encryptPrivateKey"/>
+                                </li>
+                                <li>
+                                    <label>用于解密加密之后的账户秘钥的秘钥：</label>
+                                    <input type="text" name="encryptKey"/>
+                                </li>
+                                <li>
+                                    <label>是否有效,用于逻辑删除：</label>
+                                    <input type="text" name="isValid"/>
+                                </li>-->
+                            <li>
+                                <label>创建时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择创建时间" name="fcd"/>
+                            </li>
+                            <!--   <li>
+                                  <label>更新时间：</label>
+                                  <input type="text" class="time-input" placeholder="请选择更新时间" name="lcd"/>
+                              </li>-->
+                              <li>
+                                  <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                  <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                              </li>
+                          </ul>
+                      </div>
+                  </form>
+              </div>
+
+              <div class="btn-group-sm" id="toolbar" role="group">
+                  <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="account:transfer:add">
+                      <i class="fa fa-plus"></i> 添加
+                  </a>
+                  <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="account:transfer:edit">
+                      <i class="fa fa-edit"></i> 修改
+                  </a>
+                  <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="account:transfer:remove">
+                      <i class="fa fa-remove"></i> 删除
+                  </a>
+              <!--    <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="account:transfer:export">
+                      <i class="fa fa-download"></i> 导出
+                  </a>-->
+              </div>
+              <div class="col-sm-12 select-table table-striped">
+                  <table id="bootstrap-table"></table>
+              </div>
+          </div>
+      </div>
+      <th:block th:include="include :: footer" />
+      <script th:inline="javascript">
+          var editFlag = [[${@permission.hasPermi('account:transfer:edit')}]];
+          var removeFlag = [[${@permission.hasPermi('account:transfer:remove')}]];
+          var prefix = ctx + "account/transfer";
+          var datas = [[${@dict.getType('sys_yes_no')}]];
+          $(function() {
+              var options = {
+                  url: prefix + "/list",
+                  createUrl: prefix + "/add",
+                  updateUrl: prefix + "/edit/{id}",
+                  removeUrl: prefix + "/remove",
+                  exportUrl: prefix + "/export",
+                  modalName: "出账账户",
+                  columns: [{
+                      checkbox: true
+                  },
+                  {
+                      field: 'idAccoutAddressInfo',
+                      title: '主键',
+                      visible: false
+                  },
+                  {
+                      field: 'address',
+                      title: '地址'
+                  },
+/*                  {
+                      field: 'encryptPrivateKey',
+                      title: '秘钥'
+                  },*/
+                  {
+                      field: 'isValid',
+                      title: '是否有效',
+                      formatter: function(value, item, index) {
+                          return $.table.selectDictLabel(datas, item.isValid);
+                      }
+                  },{
+                          field: 'netResource',
+                          title: '带宽资源',
+                      },{
+                          field: 'energyResource',
+                          title: '能量资源',
+                      },{
+                          field: 'totalFrozen',
+                          title: '抵押资产TRX',
+                      },{
+                          field: 'trxBalance',
+                          title: 'TRX余额',
+                      },
+                      {
+                          field: 'fcd',
+                          title: '创建时间'
+                      },/*
+                      {
+                          field: 'fcu',
+                          title: '创建用户'
+                      },
+                      {
+                          field: 'lcd',
+                          title: '更新时间'
+                      },
+                      {
+                          field: 'lcu',
+                          title: '更新用户'
+                      },*/
+                      {
+                      title: '操作',
+                      align: 'center',
+                      formatter: function(value, row, index) {
+                          var actions = [];
+                          actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.idAccoutAddressInfo + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                          actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.idAccoutAddressInfo + '\')"><i class="fa fa-remove"></i>删除</a>');
+                          return actions.join('');
+                      }
+                  }]
+              };
+              $.table.init(options);
+          });
+      </script>
+  </body>
+  </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/duallistbox.html b/ruoyi-admin/src/main/resources/templates/demo/form/duallistbox.html
index ef80a3dec..b4ec32000 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/form/duallistbox.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/form/duallistbox.html
@@ -19,18 +19,18 @@
 
                         <form id="form" action="#" class="wizard-big">
                             <select class="form-control dual_select" multiple>
-                                <option value="1">若依1</option>
-                                <option value="2">若依2</option>
-                                <option value="3">若依3</option>
-                                <option selected value="4">若依4</option>
-                                <option selected value="5">若依5</option>
-                                <option value="6">若依6</option>
-                                <option value="7">若依7</option>
-                                <option value="8">若依8</option>
-                                <option value="9">若依9</option>
-                                <option value="10">若依10</option>
-                                <option value="11">若依11</option>
-                                <option value="12">若依12</option>
+                                <option value="1">feeen1</option>
+                                <option value="2">feeen2</option>
+                                <option value="3">feeen3</option>
+                                <option selected value="4">feeen4</option>
+                                <option selected value="5">feeen5</option>
+                                <option value="6">feeen6</option>
+                                <option value="7">feeen7</option>
+                                <option value="8">feeen8</option>
+                                <option value="9">feeen9</option>
+                                <option value="10">feeen10</option>
+                                <option value="11">feeen11</option>
+                                <option value="12">feeen12</option>
                             </select>
                         </form>
                         <hr>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html b/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
index a14b04319..b61192e7e 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
@@ -14,7 +14,7 @@
                     </div>
                     <div class="ibox-content no-padding">
                         <div class="summernote">
-                            <h2>若依后台管理系统</h2>
+                            <h2>feeen后台管理系统</h2>
                             <p>ruoyi是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
                             <p>
                                 <b>当前版本：</b>v4.7.8
@@ -53,7 +53,7 @@
                     <div class="ibox-content" id="eg">
 
                         <div class="click2edit wrapper">
-                            <h3>你好，若依 </h3>
+                            <h3>你好，feeen </h3>
                             <p>H+是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
                             <p>
                                 <b>当前版本：</b>v4.7.8
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html b/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html
index 1dc924fa6..65d986ff5 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html
@@ -259,7 +259,7 @@
 	    
 	    $("#button-open-16").click(function(){
             var json = {
-            		"title": "若依相册", //相册标题
+            		"title": "feeen相册", //相册标题
             		"id": 123, //相册id
             		"start": 0, //初始显示的图片序号，默认0
             		"data": [   //相册包含的图片，数组格式
diff --git a/ruoyi-admin/src/main/resources/templates/exchange/trx/add.html b/ruoyi-admin/src/main/resources/templates/exchange/trx/add.html
new file mode 100644
index 000000000..0eca8729e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/exchange/trx/add.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增trx兑能量记录')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-trx-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">交易账户：</label>
+                <div class="col-sm-8">
+                    <input name="fromAddress" class="form-control" type="text">
+                </div>
+            </div>
+         <!--   <div class="form-group">
+                <label class="col-sm-3 control-label">转入账户：</label>
+                <div class="col-sm-8">
+                    <input name="toAddress" class="form-control" type="text">
+                </div>
+            </div>-->
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">实际出账账户：</label>
+                <div class="col-sm-8">
+                  <!--  <input name="accountAddress" class="form-control" type="text">-->
+                    <select id="address"  name="accountAddress" class="form-control " >
+                        <option th:each="accountAddress:${accountAddressList}" th:value="${accountAddress.address}" th:text="${accountAddress.address}" ></option>
+                    </select>
+                </div>
+            </div>
+       <!--     <div class="form-group">
+                <label class="col-sm-3 control-label">单位：</label>
+                <div class="col-sm-8">
+                    <input name="price" class="form-control" type="text">
+                </div>
+            </div>-->
+          <!--  <div class="form-group">
+                <label class="col-sm-3 control-label">订单hash：</label>
+                <div class="col-sm-8">
+                    <input name="trxTxId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">转入金额：</label>
+                <div class="col-sm-8">
+                    <input name="trxAmount" class="form-control" type="text">
+                </div>
+            </div>-->
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">笔数：</label>
+                <div class="col-sm-8">
+                    <select class="form-control" name="transferNumber" th:with="type=${@dict.getType('sys_transfer_number')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+           <!-- <div class="form-group">
+                <label class="col-sm-3 control-label">能量交易订单hash：</label>
+                <div class="col-sm-8">
+                    <input name="delegateTxId" class="form-control" type="text">
+                </div>
+            </div>-->
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">锁定周期：</label>
+          <!--      <div class="col-sm-8">
+                    <input name="lockPeriod" class="form-control" type="text">
+                </div>-->
+                <div class="col-sm-8">
+                <select class="form-control" name="lockNum" th:with="type=${@dict.getType('sys_lock_period')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+                </div>
+            </div>
+          <!--  <div class="form-group">
+                <label class="col-sm-3 control-label">回收资源交易id：</label>
+                <div class="col-sm-8">
+                    <input name="unDelegateTxId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="fcd" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建用户：</label>
+                <div class="col-sm-8">
+                    <input name="fcu" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="lcd" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新用户：</label>
+                <div class="col-sm-8">
+                    <input name="lcu" class="form-control" type="text">
+                </div>
+            </div>-->
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "exchange/trx"
+        $("#form-trx-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/delegate", $('#form-trx-add').serialize());
+            }
+        }
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/exchange/trx/edit.html b/ruoyi-admin/src/main/resources/templates/exchange/trx/edit.html
new file mode 100644
index 000000000..662f3923f
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/exchange/trx/edit.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改trx兑能量记录')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-trx-edit" th:object="${trxExchangeInfo}">
+            <input name="idTrxExchangeInfo" th:field="*{idTrxExchangeInfo}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">资源委托状态：</label>
+                <div class="col-sm-8">
+                  <!--  <input name="fromAddress" th:field="*{fromAddress}" class="form-control" type="text">-->
+                    <select class="form-control" name="delegateStatus" th:with="type=${@dict.getType('sys_delegate_status')}">
+                        <option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{delegateStatus}"></option>
+                    </select>
+                </div>
+            </div>
+
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "exchange/trx";
+        $("#form-trx-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-trx-edit').serialize());
+            }
+        }
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/exchange/trx/trx.html b/ruoyi-admin/src/main/resources/templates/exchange/trx/trx.html
new file mode 100644
index 000000000..f3ccb93ef
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/exchange/trx/trx.html
@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('trx兑能量记录列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>交易账户：</label>
+                                <input type="text" name="fromAddress"/>
+                            </li>
+                            <li>
+                                <label>转入账户：</label>
+                                <input type="text" name="toAddress"/>
+                            </li>
+                            <li>
+                                <label>实际出账账户：</label>
+                                <input type="text" name="accountAddress"/>
+                            </li>
+
+                            <li>
+                                <label>TRX订单：</label>
+                                <input type="text" name="trxTxId"/>
+                            </li>
+                            <br/> <br/> <br/>
+                           <!-- <li>
+                                <label>能量交易订单：</label>
+                                <input type="text" name="delegateTxId"/>
+                            </li>-->
+                            <li>
+                                <label>资源委托状态：</label>
+                                <select class="form-control" name="delegateStatus" th:with="type=${@dict.getType('sys_delegate_status')}">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
+                                </select>
+                            </li>
+<!--
+                            <li>
+                                <label>回收资源交易：</label>
+                                <input type="text" name="unDelegateTxId"/>
+                            </li>-->
+                            <li>
+                                <label>创建时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择创建时间" name="fcd"/>
+                            </li>
+
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="exchange:trx:add">
+                    <i class="fa fa-plus"></i> 手动委托资源
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="exchange:trx:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="exchange:trx:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="exchange:trx:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('exchange:trx:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('exchange:trx:remove')}]];
+        var prefix = ctx + "exchange/trx";
+        var datas = [[${@dict.getType('sys_delegate_status')}]];
+        var tranferCountDatas = [[${@dict.getType('sys_transfer_number')}]];
+        var busiTypeDatas = [[${@dict.getType('sys_busi_type')}]];
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "trx兑能量记录",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'idTrxExchangeInfo',
+                    title: 'trx进账表',
+                    visible: false
+                },
+                {
+                    field: 'fromAddress',
+                    title: '交易账户'
+                },
+                {
+                    field: 'toAddress',
+                    title: '转入账户'
+                },
+                {
+                    field: 'accountAddress',
+                    title: '实际出账账户'
+                },
+                {
+                    field: 'price',
+                    title: '单价'
+                },
+                {
+                    field: 'trxTxId',
+                    title: 'TRX订单'
+                },
+                    {
+                        field: 'tranferCount',
+                        title: '笔数',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(tranferCountDatas, value);
+                        }
+                    },
+                    {
+                        field: 'busiType',
+                        title: '业务类型',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(busiTypeDatas, value);
+                        }
+                    },
+                {
+                    field: 'trxAmount',
+                    title: '转入金额TRX'
+                },
+                {
+                    field: 'delegateAmountTrx',
+                    title: '兑换支出TRX'
+                },
+                {
+                    field: 'delegateTxId',
+                    title: '能量交易订单'
+                },
+                {
+                    field: 'lockPeriod',
+                    title: '锁定周期(*3s)'
+                },
+                {
+                    field: 'delegateStatus',
+                    title: '资源委托状态',
+                    formatter: function(value, item, index) {
+                        return $.table.selectDictLabel(datas, item.delegateStatus);
+                    }
+                },
+                {
+                    field: 'unDelegateTxId',
+                    title: '回收资源交易'
+                },
+                {
+                    field: 'fcd',
+                    title: '创建时间'
+                },
+               /* {
+                    field: 'fcu',
+                    title: '创建用户'
+                },*/
+                {
+                    field: 'lcd',
+                    title: '更新时间'
+                },
+                /*{
+                    field: 'lcu',
+                    title: '更新用户'
+                },*/
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.idTrxExchangeInfo + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.idTrxExchangeInfo + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html
index 2d99720de..5584f8060 100644
--- a/ruoyi-admin/src/main/resources/templates/index-topnav.html
+++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>若依系统首页</title>
+    <title>feeen系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link th:href="@{favicon.ico}" rel="shortcut icon"/>
@@ -27,7 +27,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs">
-                <span class="logo-lg">RuoYi</span>
+                <span class="logo-lg"></span>
             </li>
          </a>
         <div class="sidebar-collapse tab-content" id="side-menu">
@@ -237,16 +237,15 @@
                       </a>
                     </li>
                     
-                    <li role="presentation" id="tab_demo" th:if="${demoEnabled}">
+               <!--     <li role="presentation" id="tab_demo" th:if="${demoEnabled}">
                       <a data-toggle="tab" href="#demo">
                         <i class="fa fa-desktop"></i> <span>实例演示</span>
                       </a>
-                    </li>
+                    </li>-->
 				  </ul>
 				</div>
                 <!-- 右侧栏 -->
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>
                     <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="javascript:;" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
 	                <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
                 
@@ -305,7 +304,7 @@
         </div>
         
         <div th:if="${footer}" class="footer">
-            <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
+            <div class="pull-right">© [[${copyrightYear}]]  Copyright </div>
         </div>
     </div>
     <!--右侧部分结束-->
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 22377fd7b..b1d9e562a 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>若依系统首页</title>
+    <title>feeen系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link th:href="@{favicon.ico}" rel="shortcut icon"/>
@@ -26,7 +26,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs">
-                <span class="logo-lg">RuoYi</span>
+                <span class="logo-lg">后台管理</span>
             </li>
          </a>
         <div class="sidebar-collapse">
@@ -71,113 +71,6 @@
 						</li>
 					</ul>
                 </li>
-                <li th:if="${demoEnabled}">
-                    <a href="javascript:;"><i class="fa fa-desktop"></i><span class="nav-label">实例演示</span><span class="fa arrow"></span></a>
-                    <ul class="nav nav-second-level collapse">
-                        <li> <a>表单<span class="fa arrow"></span></a>
-                            <ul class="nav nav-third-level">
-								<li><a class="menuItem" th:href="@{/demo/form/button}">按钮</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/grid}">栅格</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/select}">下拉框</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/timeline}">时间轴</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/progress_bars}">进度条</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/basic}">基本表单</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/cards}">卡片列表</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/jasny}">功能扩展</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/sortable}">拖动排序</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/invoice}">单据打印</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/labels_tips}">标签 & 提示</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/tabs_panels}">选项卡 & 面板</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/validate}">表单校验</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/wizard}">表单向导</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/upload}">文件上传</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/datetime}">日期和时间</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/summernote}">富文本编辑器</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/duallistbox}">左右互选组件</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/autocomplete}">搜索自动补全</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/cxselect}">多级联动下拉</a></li>
-								<li><a class="menuItem" th:href="@{/demo/form/localrefresh}">Ajax局部刷新</a></li>
-							</ul>
-                        </li>
-                        <li> <a>表格<span class="fa arrow"></span></a>
-                            <ul class="nav nav-third-level">
-								<li><a class="menuItem" th:href="@{/demo/table/search}">查询条件</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/footer}">数据汇总</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/groupHeader}">组合表头</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/export}">表格导出</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/exportSelected}">导出选择列</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/remember}">翻页记住选择</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/pageGo}">跳转至指定页</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/params}">自定义查询参数</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/multi}">初始多表格</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/button}">点击按钮加载表格</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/data}">直接加载表格数据</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/fixedColumns}">表格冻结列</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/event}">自定义触发事件</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/headerStyle}">表格标题格式化</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/detail}">表格细节视图</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/child}">表格父子视图</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/image}">表格图片预览</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/curd}">动态增删改查</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/reorderRows}">表格行拖拽操作</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/reorderColumns}">表格列拖拽操作</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/resizable}">表格列宽拖动</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/editable}">表格行内编辑</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/subdata}">主子表提交</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/refresh}">表格自动刷新</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/print}">表格打印配置</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/dynamicColumns}">表格动态列</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/customView}">自定义视图分页</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/asynTree}">异步加载表格树</a></li>
-								<li><a class="menuItem" th:href="@{/demo/table/other}">表格其他操作</a></li>
-							</ul>
-                        </li>
-                        <li> <a>弹框<span class="fa arrow"></span></a>
-                            <ul class="nav nav-third-level">
-								<li><a class="menuItem" th:href="@{/demo/modal/dialog}">模态窗口</a></li>
-								<li><a class="menuItem" th:href="@{/demo/modal/layer}">弹层组件</a></li>
-								<li><a class="menuItem" th:href="@{/demo/modal/table}">弹层表格</a></li>
-							</ul>
-                        </li>
-                        <li> <a>操作<span class="fa arrow"></span></a>
-                            <ul class="nav nav-third-level">
-								<li><a class="menuItem" th:href="@{/demo/operate/table}">表格</a></li>
-								<li><a class="menuItem" th:href="@{/demo/operate/other}">其他</a></li>
-							</ul>
-                        </li>
-                        <li> <a>报表<span class="fa arrow"></span></a>
-                            <ul class="nav nav-third-level">
-								<li><a class="menuItem" th:href="@{/demo/report/echarts}">百度ECharts</a></li>
-								<li><a class="menuItem" th:href="@{/demo/report/peity}">peity</a></li>
-								<li><a class="menuItem" th:href="@{/demo/report/sparkline}">sparkline</a></li>
-								<li><a class="menuItem" th:href="@{/demo/report/metrics}">图表组合</a></li>
-							</ul>
-                        </li>
-                        <li> <a>图标<span class="fa arrow"></span></a>
-                            <ul class="nav nav-third-level">
-								<li><a class="menuItem" th:href="@{/demo/icon/fontawesome}">Font Awesome</a></li>
-								<li><a class="menuItem" th:href="@{/demo/icon/glyphicons}">Glyphicons</a></li>
-							</ul>
-                        </li>
-                        <li>
-	                        <a href="javascript:;"><i class="fa fa-sitemap"></i>四层菜单<span class="fa arrow"></span></a>
-	                        <ul class="nav nav-third-level collapse">
-	                            <li>
-	                                <a href="javascript:;" id="damian">三级菜单1<span class="fa arrow"></span></a>
-	                                <ul class="nav nav-third-level">
-	                                    <li>
-	                                        <a href="javascript:;">四级菜单1</a>
-	                                    </li>
-	                                    <li>
-	                                        <a href="javascript:;">四级菜单2</a>
-	                                    </li>
-	                                </ul>
-	                            </li>
-	                            <li><a href="javascript:;">三级菜单2</a></li>
-	                        </ul>
-	                    </li>
-                    </ul>
-                </li>
             </ul>
         </div>
     </nav>
@@ -193,7 +86,6 @@
                     </a>
                 </div>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>
                     <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="javascript:;" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
 	                <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
                     <li class="dropdown user-menu">
@@ -251,7 +143,7 @@
         </div>
 
         <div th:if="${footer}" class="footer">
-            <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
+            <div class="pull-right">© [[${copyrightYear}]] Copyright </div>
         </div>
     </div>
     <!--右侧部分结束-->
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 6614e55a4..dd4dbf7a0 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -3,8 +3,8 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <title>登录若依系统</title>
-    <meta name="description" content="若依后台管理框架">
+    <title>登录feeen系统</title>
+    <meta name="description" content="feeen后台管理框架">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
@@ -25,11 +25,11 @@
         <div class="row">
             <div class="col-sm-7">
                 <div class="signin-info">
-                    <div class="logopanel m-b">
-                        <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
+                   <!-- <div class="logopanel m-b">
+                        <h1><img alt="[ feeen ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
                     </div>
-                    <div class="m-b"></div>
-                    <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>
+                    <div class="m-b"></div>-->
+                   <!-- <h4>欢迎使用 <strong>feeen 后台管理系统</strong></h4>
                     <ul class="m-b">
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>
@@ -37,15 +37,15 @@
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>
                     </ul>
-                    <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
+                    <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>-->
                 </div>
             </div>
             <div class="col-sm-5">
                 <form id="signupForm" autocomplete="off">
                     <h4 class="no-margins">登录：</h4>
-                    <p class="m-t-md">你若不离不弃，我必生死相依</p>
-                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
-                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
+<!--                    <p class="m-t-md">你若不离不弃，我必生死相依</p>-->
+                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value=""    />
+                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="" />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
 						<div class="col-xs-6">
 						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
@@ -63,11 +63,11 @@
                 </form>
             </div>
         </div>
-        <div class="signup-footer">
+<!--        <div class="signup-footer">
             <div class="pull-left">
                 Copyright © 2018-2024 ruoyi.vip All Rights Reserved. <br>
             </div>
-        </div>
+        </div>-->
     </div>
 <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; var captchaEnabled = [[${captchaEnabled}]];</script>
 <!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html
index 4f26eb75a..ddbe6d77e 100644
--- a/ruoyi-admin/src/main/resources/templates/main.html
+++ b/ruoyi-admin/src/main/resources/templates/main.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!--360浏览器优先以webkit内核解析-->
-    <title>若依介绍</title>
+    <title>feeen介绍</title>
     <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@@ -12,1701 +12,6 @@
 </head>
 
 <body class="gray-bg">
-    <div class="row border-bottom white-bg dashboard-header">
-        <div class="col-sm-12">
-            <blockquote class="text-warning" style="font-size:14px">
-                                           领取阿里云通用云产品1888优惠券
-                <br><a target="_blank" href="https://www.aliyun.com/minisite/goods?userCode=brki8iof">https://www.aliyun.com/minisite/goods?userCode=brki8iof</a><br>
-                                           领取腾讯云通用云产品2860优惠券
-                <br><a target="_blank" href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console">https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</a><br>
-                                           阿里云服务器折扣区 <a target="_blank" href="http://aly.ruoyi.vip">☛☛点我进入☚☚</a> &nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区 <a target="_blank" href="http://txy.ruoyi.vip">☛☛点我进入☚☚</a><br>
-                <h4 class="text-danger">云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)</h4>
-            </blockquote>
 
-            <hr>
-        </div>
-        <div class="col-sm-3">
-            <h2>Hello,Guest</h2>
-            <small>移动设备访问请扫描以下二维码：</small>
-            <br>
-            <br>
-            <img th:src="@{/img/qr_code.png}" width="100%" style="max-width:264px;">
-            <br>
-        </div>
-        <div class="col-sm-5">
-            <h2>若依后台管理框架</h2>
-            <p>一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统。，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。</p>
-            <p>
-                <b>当前版本：</b><span>v[[${version}]]</span>
-            </p>
-            <p>
-                <span class="label label-warning">&yen;免费开源</span>
-            </p>
-            <br>
-            <p>
-                <a class="btn btn-success btn-outline" href="https://gitee.com/y_project/RuoYi" target="_blank">
-                    <i class="fa fa-cloud"> </i> 访问码云
-                </a>
-                <a class="btn btn-white btn-bitbucket" href="http://ruoyi.vip" target="_blank">
-                    <i class="fa fa-home"></i> 访问主页
-                </a>
-            </p>
-        </div>
-        <div class="col-sm-4">
-            <h4>技术选型：</h4>
-            <ol>
-                <li>核心框架：Spring Boot。</li>
-                <li>安全框架：Apache Shiro。</li>
-                <li>模板引擎：Thymeleaf。</li>
-                <li>持久层框架：MyBatis。</li>
-				<li>定时任务:Quartz。</li>
-                <li>数据库连接池：Druid。</li>
-                <li>工具类：Fastjson。</li>
-                <li>更多……</li>
-            </ol>
-        </div>
-
-    </div>
-    <div class="wrapper wrapper-content">
-        <div class="row">
-            <div class="col-sm-4">
-
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>联系信息</h5>
-
-                    </div>
-                    <div class="ibox-content">
-                        <p><i class="fa fa-send-o"></i> 官网：<a href="http://www.ruoyi.vip" target="_blank">http://www.ruoyi.vip</a>
-                        </p>
-                        <p><i class="fa fa-qq"></i> QQ群：<s>满1389287</s> <s>满1679294</s> <s>满1529866</s> <s>满1772718</s> <s>满1366522</s> <s>满1382251</s> <s>满1145125</s> <s>满86752435</s> <s>满134072510</s> <s>满210336300</s> <s>满339522636</s> <s>满130035985</s> <s>满143151071</s> <s>满158781320</s> <s>满201531282</s> <s>满101526938</s> <s>满264355400</s> <s>满298522656</s> <s>满139845794</s>  <s>满185760789</s> <s>满175104288</s> <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lqMHu_5Fskm7H2S1vNAQTtzAUokVydwc&authKey=ptw0Fpch5pbNocML3CIJKKqZBaq2DI7cusKuzIgfMNiY3t9Pvd9hP%2BA8WYx3yaY1&noverify=0&group_code=174942938" target="_blank">174942938 </a>
-                        </p>
-                        <p><i class="fa fa-weixin"></i> 微信：<a href="javascript:;">/ *若依</a>
-                        </p>
-                        <p><i class="fa fa-credit-card"></i> 支付宝：<a href="javascript:;" class="支付宝信息">/ *若依</a>
-                        </p>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>更新日志</h5>
-                    </div>
-                    <div class="ibox-content no-padding">
-                        <div class="panel-body">
-                            <div class="panel-group" id="version">
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v478">v4.7.8</a><code class="pull-right">2023.11.23</code>
-								   </h5>
-								</div>
-								<div id="v478" class="panel-collapse collapse in">
-									<div class="panel-body">
-									   <ol>
-									        <li>用户列表新增抽屉效果详细信息</li>
-									        <li>操作日志列表新增IP地址查询</li>
-									        <li>定时任务新增页去除状态选项</li>
-									        <li>系统管理角色列表显示数据权限</li>
-									        <li>通用排序属性orderBy参数限制长度</li>
-									        <li>新增isScrollToTop页签切换滚动到顶部</li>
-									        <li>Excel自定义数据处理器增加单元格/工作簿对象</li>
-									        <li>新增表格参数（数据值为空时显示的内容undefinedText）</li>
-									        <li>升级oshi到最新版本6.4.7</li>
-									        <li>升级shiro到最新版本1.13.0</li>
-									        <li>升级druid到最新版本1.2.20</li>
-									        <li>升级pagehelper到最新版1.4.7</li>
-									        <li>升级spring-boot到最新版本2.5.15</li>
-									        <li>升级jquery到最新版v3.7.1</li>
-									        <li>升级layer到最新版本v3.7.0</li>
-									        <li>升级layui到最新版本v2.8.18</li>
-									        <li>升级x-editable到最新版本1.5.3</li>
-									        <li>修复自定义字典样式不生效的问题</li>
-									        <li>修复弹窗按钮启用禁用方法无效问题</li>
-									        <li>修复横向菜单关闭最后一个页签状态问题</li>
-									        <li>修复Excel导入数据临时文件无法删除问题</li>
-									        <li>修复表格行内编辑启用翻页记住选择无效问题</li>
-									        <li>修复Excels导入时无法获取到dictType字典值问题</li>
-									        <li>优化重置密码鼠标按下显示密码</li>
-									        <li>优化参数键值文本框改为文本域</li>
-									        <li>优化表格重置默认返回到第一页</li>
-									        <li>优化菜单管理类型为按钮状态可选</li>
-									        <li>优化数字金额大写转换精度丢失问题</li>
-									        <li>优化树表查询无数据时清除分页信息</li>
-									        <li>优化通用detail详细信息弹窗不显示按钮</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v477">v4.7.7</a><code class="pull-right">2023.04.14</code>
-								   </h5>
-								</div>
-								<div id="v477" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>操作日志新增消耗时间属性</li>
-									        <li>日志管理使用索引提升查询性能</li>
-									        <li>日志注解支持排除指定的请求参数</li>
-									        <li>新增监控页面图标显示</li>
-									        <li>新增支持登录IP黑名单限制</li>
-									        <li>更新fontawesome图标示例</li>
-									        <li>屏蔽定时任务bean违规的字符</li>
-									        <li>支持自定义隐藏属性列过滤子对象</li>
-									        <li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
-									        <li>升级jquery到最新版v3.6.3</li>
-									        <li>升级layui到最新版本2.7.6</li>
-									        <li>升级jasny-bootstrap到最新版4.0.0</li>
-									        <li>升级oshi到最新版本6.4.1</li>
-									        <li>升级druid到最新版本1.2.16</li>
-									        <li>修复异步表格树子项排序问题</li>
-									        <li>修复冻结列不支持IE浏览器的问题</li>
-									        <li>修复主子表使用suggest插件无法新增问题</li>
-									        <li>修复菜单栏快速点击导致展开折叠样式问题</li>
-									        <li>修复用户多角色数据权限可能出现权限抬升的情况</li>
-									        <li>修复异步加载表格树重置列表父节点展开异常问题</li>
-									        <li>修复页签属性refresh为undefined时页面被刷新问题</li>
-									        <li>移除apache/commons-fileupload依赖</li>
-									        <li>优化前端属性提醒说明</li>
-									        <li>优化用户导入更新时需获取用户编号问题</li>
-									        <li>优化主子表根据序号删除方法加入表格ID参数</li>
-									        <li>优化导出Excel时设置dictType属性重复查缓存问题</li>
-									        <li>优化在线用户服务缓存改为从Bean容器获取不使用自动装配</li>
-									        <li>优化表格示例行拖拽后列表底部总记录条数变成了undefined问题</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v476">v4.7.6</a><code class="pull-right">2022.12.16</code>
-								   </h5>
-								</div>
-								<div id="v476" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>定时任务违规的字符</li>
-									        <li>忽略不必要的属性数据返回</li>
-									        <li>导入更新用户数据前校验数据权限</li>
-									        <li>修改参数键名时移除前缓存配置</li>
-									        <li>修改用户登录账号进行重复验证</li>
-									        <li>兼容Excel下拉框内容过多无法显示</li>
-									        <li>升级oshi到最新版本6.4.0</li>
-									        <li>升级kaptcha到最新版2.3.3</li>
-									        <li>升级druid到最新版本1.2.15</li>
-									        <li>升级shiro到最新版本1.10.1</li>
-									        <li>升级pagehelper到最新版1.4.6</li>
-									        <li>升级bootstrap-fileinput到最新版本5.5.2</li>
-									        <li>修复sheet超出最大行数异常问题</li>
-									        <li>修复关闭父页签后提交无法跳转的问题</li>
-									        <li>修复操作日志类型多选导出不生效问题</li>
-									        <li>修复导出包含空子列表数据异常的问题</li>
-									        <li>优化树形表格层级显示</li>
-									        <li>优化SQL关键字检查防止注入</li>
-									        <li>优化用户管理重置时取消部门选择</li>
-									        <li>优化代码生成同步后字典值NULL问题</li>
-									        <li>优化导出对象的子列表为空会出现[]问题</li>
-									        <li>优化select2搜索下拉后校验必填样式问题</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v475">v4.7.5</a><code class="pull-right">2022.09.05</code>
-								   </h5>
-								</div>
-								<div id="v475" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>Excel支持导出对象的子列表方法</li>
-									        <li>数据逻辑删除不进行唯一验证</li>
-									        <li>优化多角色数据权限匹配规则</li>
-									        <li>新增主子表提交校验示例</li>
-									        <li>支持自定义隐藏Excel属性列</li>
-									        <li>Excel注解支持backgroundColor属性设置背景颜色</li>
-									        <li>菜单配置刷新时Tab页签切换时刷新</li>
-									        <li>增加对AjaxResult消息结果类型的判断</li>
-									        <li>新增示例（进度条）</li>
-									        <li>新增内容编码/解码方便插件集成使用</li>
-									        <li>升级jquery到最新版3.6.1</li>
-									        <li>升级layui到最新版本2.7.5</li>
-									        <li>升级shiro到最新版本1.9.1</li>
-									        <li>升级druid到最新版本1.2.11</li>
-									        <li>升级pagehelper到最新版1.4.3</li>
-									        <li>升级oshi到最新版本6.2.2</li>
-									        <li>修复树表onLoadSuccess不生效的问题</li>
-											<li>修复用户分配角色大于默认页数丢失问题</li>
-									        <li>定时任务支持执行父类方法</li>
-									        <li>自动设置切换多个树表格实例配置</li>
-									        <li>页签创建标题优先data-title属性</li>
-									        <li>优化任务过期不执行调度</li>
-									        <li>优化横向菜单下激活菜单样式</li>
-									        <li>优化按钮打开窗口后按回车反复弹出</li>
-									        <li>优化excel/scale属性导出单元格数值类型</li>
-									        <li>优化druid开启wall过滤器出现的异常问题</li>
-									        <li>优化多个相同角色数据导致权限SQL重复问题</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v474">v4.7.4</a><code class="pull-right">2022.06.01</code>
-								   </h5>
-								</div>
-								<div id="v474" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>用户头像上传图片格式限制</li>
-									        <li>Excel注解支持color属性设置字体颜色</li>
-									        <li>设置分页参数默认值</li>
-									        <li>主子表操作列新增单个删除</li>
-									        <li>定时任务检查Bean包名是否为白名单配置</li>
-									        <li>升级spring-boot到最新版本2.5.14</li>
-									        <li>升级shiro到最新版本1.9.0</li>
-									        <li>升级oshi到最新版本6.1.6</li>
-									        <li>升级fastjson到最新版1.2.83 安全修复版本</li>
-									        <li>文件上传兼容Weblogic环境</li>
-									        <li>新增清理分页的线程变量方法</li>
-									        <li>新增获取不带后缀文件名称方法</li>
-									        <li>用户缓存信息添加部门ancestors祖级列表</li>
-									        <li>自定义ShiroFilterFactoryBean防止中文请求被拦截</li>
-									        <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
-									        <li>优化IP地址获取到多个的问题</li>
-									        <li>优化表格冻结列阴影效果显示</li>
-									        <li>优化菜单侧边栏滚动条尺寸及颜色</li>
-									        <li>优化显示顺序orderNum类型为整型</li>
-									        <li>优化接口使用泛型使其看到响应属性字段</li>
-									        <li>优化导出数据LocalDateTime类型无数据问题</li>
-									        <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
-									        <li>优化导出excel单元格验证,包含变更为开头.防止正常内容被替换</li>
-									        <li>修复URL类型回退键被禁止问题</li>
-									        <li>修复表格客户端分页序号显示错误问题</li>
-									        <li>修复代码生成拖拽多次出现的排序不正确问题</li>
-									        <li>修复表格打印组件不识别多层对象属性值问题</li>
-									        <li>修复操作日志查询类型条件为0时会查到所有数据</li>
-									        <li>修复Excel注解prompt/combo同时使用不生效问题</li>
-									        <li>修复初始化多表格处理回调函数时获取的表格配置不一致问题</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v473">v4.7.3</a><code class="pull-right">2022.03.01</code>
-								   </h5>
-								</div>
-								<div id="v473" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>表格树支持分页/异步加载</li>
-									        <li>代码生成预览支持复制内容</li>
-									        <li>定时任务默认保存到内存中执行</li>
-									        <li>代码生成同步保留必填/类型选项</li>
-									        <li>页面若未匹配到字典标签则返回原字典值</li>
-									        <li>用户访问控制时校验数据权限，防止越权</li>
-									        <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
-									        <li>升级spring-boot到最新版本2.5.10</li>
-									        <li>升级spring-boot-mybatis到最新版2.2.2</li>
-									        <li>升级pagehelper到最新版1.4.1</li>
-									        <li>升级oshi到最新版本6.1.2</li>
-									        <li>升级bootstrap-table到最新版本1.19.1</li>
-									        <li>服务监控新增运行参数信息显示</li>
-									        <li>定时任务目标字符串验证包名白名单</li>
-									        <li>文件上传接口新增原/新文件名返回参数</li>
-									        <li>定时任务屏蔽违规的字符</li>
-									        <li>分页数据新增分页参数合理化参数</li>
-									        <li>表格父子视图添加点击事件打开示例</li>
-									        <li>优化上传文件名称命名规则</li>
-									        <li>优化加载字典缓存数据</li>
-									        <li>优化任务队列满时任务拒绝策略</li>
-									        <li>优化IE11上传预览不显示的问题</li>
-									        <li>优化Excel格式化不同类型的日期对象</li>
-									        <li>优化国际化配置多余的zh请求问题</li>
-									        <li>优化新版Chrome浏览器回退出现的遮罩层</li>
-									        <li>修复EMAIL类型回退键被禁止问题</li>
-									        <li>修复Xss注解字段值为空时的异常问题</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v472">v4.7.2</a><code class="pull-right">2021.12.23</code>
-								   </h5>
-								</div>
-								<div id="v472" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>自定义xss校验注解实现</li>
-									        <li>进入修改页面方法添加权限标识</li>
-									        <li>代码生成创建按钮添加超级管理员权限</li>
-									        <li>代码生成创建表检查关键字，防止注入风险</li>
-									        <li>修复定时任务多参数逗号分隔的问题</li>
-									        <li>修复表格插件一起使用出现的声明报错问题</li>
-									        <li>修复代码生成主子表模板删除方法缺少事务</li>
-									        <li>升级oshi到最新版本v5.8.6</li>
-									        <li>升级velocity到最新版本2.3</li>
-									        <li>升级fastjson到最新版1.2.79</li>
-									        <li>升级log4j2到最新版2.17.0 防止漏洞风险</li>
-									        <li>升级thymeleaf到最新版3.0.14 阻止远程代码执行漏洞</li>
-									        <li>优化修改/授权角色实时生效</li>
-									        <li>修整tomcat配置参数已过期问题</li>
-									        <li>前端添加单独的二代身份证校验</li>
-									        <li>优化新增部门时验证用户所属部门</li>
-									        <li>优化查询用户的角色组&岗位组代码</li>
-									        <li>请求分页方法设置成通用方便灵活调用</li>
-									        <li>优化日期类型错误提示与图标重叠问题</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v471">v4.7.1</a><code class="pull-right">2021.11.10</code>
-								   </h5>
-								</div>
-								<div id="v471" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>新增是否开启页签功能</li>
-									        <li>代码生成的模块增加创建表功能</li>
-									        <li>Excel导入支持@Excels注解</li>
-									        <li>Excel注解支持导入导出标题信息</li>
-									        <li>Excel注解支持自定义数据处理器</li>
-									        <li>日志注解新增是否保存响应参数</li>
-									        <li>防重提交注解支持配置间隔时间/提示消息</li>
-									        <li>网页部分操作禁止使用后退键（Backspace）</li>
-									        <li>实例演示中增加多层窗口获取值</li>
-									        <li>弹出层openOptions增加动画属性</li>
-									        <li>升级spring-boot到最新版本2.5.6</li>
-									        <li>升级spring-boot-mybatis到最新版2.2.0</li>
-									        <li>升级pagehelper到最新版1.4.0</li>
-									        <li>升级oshi到最新版本v5.8.2</li>
-									        <li>升级druid到最新版1.2.8</li>
-									        <li>升级fastjson到最新版1.2.78</li>
-									        <li>升级thymeleaf-extras-shiro到最新版本v2.1.0</li>
-									        <li>升级bootstrap-fileinput到最新版本v5.2.4</li>
-									        <li>修改阿里云maven仓库地址为新版地址</li>
-									        <li>定时任务屏蔽违规字符</li>
-									        <li>增加sendGet无参请求方法</li>
-									        <li>代码生成去掉多余的排序字段</li>
-									        <li>优化启动脚本参数优化</li>
-									        <li>优化页签关闭右侧清除iframe元素</li>
-									        <li>优化多表格切换表单查询参数</li>
-									        <li>优化表格实例切换event不能为空</li>
-									        <li>优化mybatis全局默认的执行器</li>
-									        <li>优化导入Excel数据关闭时清理file</li>
-									        <li>优化Excel导入图片可能出现的异常</li>
-									        <li>优化记录登录信息，防止不必要的修改</li>
-									        <li>优化aop语法，使用spring自动注入注解</li>
-									        <li>修复无法被反转义问题</li>
-									        <li>修复拖拽行数据错位问题</li>
-									        <li>修复新窗口打开页面关闭弹窗报错</li>
-									        <li>修复富文本回退键被禁止&控制台报错问题</li>
-									        <li>修复自定义弹出层全屏参数无效问题</li>
-									        <li>修复树表代码生成短字段无法识别问题</li>
-									        <li>修复apple/webkit浏览器时间无法格式化</li>
-									        <li>修复后端主子表代码模板方法名生成错误问题</li>
-									        <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v470">v4.7.0</a><code class="pull-right">2021.09.01</code>
-								   </h5>
-								</div>
-								<div id="v470" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>优化弹出层显示在顶层窗口</li>
-									        <li>定时任务支持在线生成cron表达式</li>
-									        <li>Excel注解支持Image图片导入</li>
-									        <li>支持配置是否开启记住我功能</li>
-									        <li>修改时检查用户数据权限范围</li>
-									        <li>表单重置开始/结束时间控件</li>
-									        <li>新增多图上传示例</li>
-									        <li>启用父部门状态排除顶级节点</li>
-									        <li>富文本默认dialogsInBody属性</li>
-									        <li>去除默认分页合理化参数</li>
-									        <li>顶部菜单跳转添加绝对路径</li>
-									        <li>升级oshi到最新版本v5.8.0</li>
-									        <li>升级shiro到最新版本v1.8.0</li>
-									        <li>升级commons.io到最新版本v2.11.0</li>
-									        <li>升级jquery到最新版v3.6.0</li>
-									        <li>升级icheck到最新版v1.0.3</li>
-									        <li>升级layer到最新版本v3.5.1</li>
-									        <li>升级layui到最新版本v2.6.8</li>
-									        <li>升级laydate到最新版本v5.3.1</li>
-									        <li>升级select2到最新版v4.0.13</li>
-									        <li>升级cropper到最新版本v1.5.12</li>
-									        <li>升级summernote到最新版本v0.8.18</li>
-									        <li>升级duallistbox到最新版本v3.0.9</li>
-									        <li>升级jquery.validate到最新版本v1.19.3</li>
-									        <li>升级bootstrap-suggest到最新版本v0.1.29</li>
-									        <li>升级bootstrap-select到最新版本v1.13.18</li>
-									        <li>升级bootstrap-fileinput到最新版本v5.2.3</li>
-									        <li>查询表格指定列值增加是否去重属性</li>
-									        <li>删除sourceMappingURL源映射</li>
-									        <li>去除多余的favicon.ico引入</li>
-									        <li>优化代码生成模板</li>
-									        <li>优化XSS跨站脚本过滤</li>
-									        <li>补充定时任务表字段注释</li>
-									        <li>定时任务屏蔽ldap远程调用</li>
-									        <li>定时任务屏蔽http(s)远程调用</li>
-									        <li>定时任务对检查异常进行事务回滚</li>
-									        <li>调度日志详细页添加关闭按钮</li>
-									        <li>优化异常打印输出信息</li>
-									        <li>优化移动端进入首页样式</li>
-									        <li>优化用户操作不能删除自己</li>
-									        <li>默认开始/结束时间绑定控件选择类型</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v462">v4.6.2</a><code class="pull-right">2021.07.01</code>
-								   </h5>
-								</div>
-								<div id="v462" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>优化参数&字典缓存操作</li>
-									        <li>新增表格参数（导出方式&导出文件类型）</li>
-									        <li>新增表格示例（自定义视图分页）</li>
-									        <li>新增示例（表格列拖拽）</li>
-									        <li>集成yuicompressor实现(CSS/JS压缩)</li>
-									        <li>新增表格参数（是否支持打印页面showPrint）</li>
-									        <li>支持bat脚本执行应用</li>
-									        <li>修复存在的SQL注入漏洞问题</li>
-									        <li>定时任务屏蔽rmi远程调用</li>
-									        <li>导出Excel文件支持数据流下载方式</li>
-									        <li>实例演示弹层组件增加相册层示例</li>
-									        <li>删除操作日志记录信息</li>
-									        <li>增加表格重置分页的参数</li>
-									        <li>限制超级管理员不允许操作</li>
-									        <li>树级结构更新子节点使用replaceFirst</li>
-									        <li>支持动态生成密匙，防止默认密钥泄露</li>
-									        <li>升级pagehelper到最新版1.3.1</li>
-									        <li>升级oshi到最新版本v5.7.4</li>
-									        <li>升级swagger到最新版本v3.0.0</li>
-									        <li>升级commons.io到最新版本v2.10.0</li>
-									        <li>升级commons.fileupload到最新版本v1.4</li>
-									        <li>升级bootstrap-table到最新版本v1.18.3</li>
-									        <li>升级druid到最新版本v1.2.6</li>
-									        <li>升级fastjson到最新版1.2.76</li>
-									        <li>升级layui到最新版本v2.6.6</li>
-									        <li>升级layer到最新版本v3.5.0</li>
-									        <li>升级laydate到最新版本v5.3.0</li>
-									        <li>优化表格树移动端&边框显示</li>
-									        <li>新增表格刷新options配置方法</li>
-									        <li>优化图片工具类读取文件，防止异常</li>
-									        <li>修复表格图片预览移动端宽高无效问题</li>
-									        <li>主子表通用操作封装处理增加文本域类型</li>
-									        <li>日志注解兼容获取json类型的参数</li>
-									        <li>修复表单向导插件有滚动条时底部工具栏无法固定问题</li>
-									        <li>修复导出角色数据范围翻译缺少仅本人</li>
-									        <li>修正Velocity模板初始字符集</li>
-									        <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
-									        <li>优化代码生成导出模板名称</li>
-									        <li>修改个人中心密码长度提醒</li>
-									        <li>实例演示中弹出表格增加以回调形式回显到父窗体</li>
-									        <li>修复登录页面弹窗文字不显示的问题</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v461">v4.6.1</a><code class="pull-right">2021.04.12</code>
-								   </h5>
-								</div>
-								<div id="v461" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>新增IE浏览器版本过低提示页面</li>
-									        <li>新增详细信息tab页签方式</li>
-									        <li>新增解锁屏幕打开上次页签</li>
-									        <li>数据监控默认账户密码防止越权访问</li>
-									        <li>新增表格示例（导出选择列）</li>
-									        <li>个人信息添加手机&邮箱重复验证</li>
-									        <li>个人中心刷新后样式问题</li>
-									        <li>操作日志返回参数添加非空验证</li>
-									        <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
-									        <li>子表模板默认日期格式化</li>
-									        <li>代码生成预览语言根据后缀名高亮显示</li>
-									        <li>代码生成主子表相同字段导致数据问题</li>
-									        <li>升级SpringBoot到最新版本2.2.13</li>
-									        <li>升级shiro到最新版1.7.1 阻止身份认证绕过漏洞</li>
-									        <li>升级bootstrapTable到最新版本v1.18.2</li>
-									        <li>升级bootstrapTable相关组件到最新版本v1.18.2</li>
-									        <li>升级fastjson到最新版1.2.75</li>
-									        <li>升级druid到最新版本v1.2.4</li>
-									        <li>升级oshi到最新版本v5.6.0</li>
-									        <li>修改ip字段长度防止ipv6地址长度不够</li>
-									        <li>搜索建议示例选择后隐藏列表</li>
-									        <li>主子表示例增加初始化数据</li>
-									        <li>优化Excel导入增加空行判断</li>
-									        <li>修复横向菜单无法打开页签问题</li>
-									        <li>修复导入数据为负浮点数时，导入结果会丢失精度问题</li>
-									        <li>优化更多操作按钮左侧移入内容闪现消失情况</li>
-									        <li>修复主子表提交中列隐藏后出现列偏移问题</li>
-									        <li>单据打印网页时通过hidden-print隐藏元素</li>
-									        <li>表格销毁清除记住选择数据</li>
-									        <li>增加表格动态列示例</li>
-									        <li>代码生成选择主子表关联元素必填</li>
-									        <li>tree根据Id和Name选中指定节点增加空判断</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v46">v4.6.0</a><code class="pull-right">2021.01.01</code>
-								   </h5>
-								</div>
-								<div id="v46" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>新增缓存监控管理</li>
-									        <li>新增锁定屏幕功能</li>
-									        <li>菜单新增是否刷新页面</li>
-									        <li>删除用户和角色解绑关联</li>
-									        <li>新增密码强度字符范围提示</li>
-									        <li>防止匿名访问进行过滤</li>
-									        <li>升级SpringBoot到最新版本2.2.12</li>
-									        <li>升级poi到最新版本4.1.2</li>
-									        <li>升级bitwalker到最新版本1.21</li>
-									        <li>升级bootstrap-fileinput到最新版本5.1.3</li>
-									        <li>升级bootstrapTable到最新版本v1.18.0</li>
-									        <li>升级bootstrapTable相关组件到最新版本v1.18.0</li>
-									        <li>升级oshi到最新版本v5.3.6</li>
-									        <li>新增示例（标签 & 提示）</li>
-									        <li>添加单据打印示例</li>
-									        <li>修改表格初始参数sortName默认值为undefined</li>
-									        <li>新增表格参数（自定义打印页面模板printPageBuilder）</li>
-									        <li>新增表格参数（是否显示行间隔色striped）</li>
-									        <li>新增表格参数（渲染完成后执行的事件onPostBody）</li>
-									        <li>Excel注解支持Image图片导出</li>
-									        <li>Excel支持注解align对齐方式</li>
-									        <li>Excel支持导入Boolean型数据</li>
-									        <li>主子表操作添加通用addColumn方法</li>
-									        <li>代码生成日期控件区分范围</li>
-									        <li>代码生成数据库文本类型生成表单文本域</li>
-									        <li>修复生成主子表外键名错误</li>
-									        <li>选项卡新增是否刷新属性</li>
-									        <li>修复树表格表头跟表格宽度不同步的问题</li>
-									        <li>表格树加载完成触发tooltip方法</li>
-									        <li>使用widthUnit定义树表格选项单位</li>
-									        <li>修复主子表editColumn序列问题</li>
-									        <li>修复添加全屏在无参数时没有替换url参数问题</li>
-									        <li>弹出层openOptions移动端自适应</li>
-									        <li>防止错误页返回主页出现嵌套问题</li>
-									        <li>设置回显数据字典验证防止空值</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v451">v4.5.1</a><code class="pull-right">2020.11.18</code>
-								   </h5>
-								</div>
-								<div id="v451" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>阻止任意文件下载漏洞</li>
-									        <li>升级shiro到最新版1.7.0 阻止权限绕过漏洞</li>
-									        <li>升级druid到最新版本v1.2.2</li>
-									        <li>新增表格行触发事件（onCheck、onUncheck、onCheckAll、onUncheckAll）</li>
-									        <li>修复多页签关闭非当前选项出现空白问题</li>
-									        <li>代码生成预览支持高亮显示</li>
-									        <li>mapperLocations配置支持分隔符</li>
-									        <li>权限信息调整</li>
-									        <li>个人中心头像和上传头像增加默认图片</li>
-									        <li>全局配置类保持和其他应用命名相同</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v45">v4.5.0</a><code class="pull-right">2020.10.20</code>
-								   </h5>
-								</div>
-								<div id="v45" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>新增菜单导航显示风格（default为左侧导航菜单，topnav为顶部导航菜单）</li>
-									        <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
-									        <li>账号密码支持自定义更新周期</li>
-									        <li>初始密码支持自定义修改策略</li>
-									        <li>新增校验用户修改新密码不能与旧密码相同</li>
-									        <li>添加检查密码范围支持的特殊字符包括：~!@#$%^&*()-=_+</li>
-									        <li>注册账号设置默认用户名称及密码最后更新时间</li>
-									        <li>去除用户手机邮箱部门必填验证</li>
-									        <li>新增日期格式化方法</li>
-									        <li>代码生成添加bit类型</li>
-									        <li>树结构加载添加callBack回调方法</li>
-									        <li>修复用户管理页面滚动返回顶部条失效</li>
-									        <li>修复代码生成模板文件上传组件缺少ctx的问题</li>
-									        <li>限制系统内置参数不允许删除</li>
-									        <li>新增表格列宽拖动插件</li>
-									        <li>新增Ajax局部刷新demo</li>
-									        <li>新增是否开启页脚功能</li>
-									        <li>新增表格参数（通过自定义函数设置标题样式headerStyle）</li>
-									        <li>新增表格参数（通过自定义函数设置页脚样式footerStyle）</li>
-									        <li>修复窗体大小改变后浮动提示框失效问题</li>
-									        <li>生成代码补充必填样式</li>
-									        <li>生成页面时不忽略remark属性</li>
-									        <li>字典数据列表页添加关闭按钮</li>
-									        <li>Excel注解支持自动统计数据总和</li>
-									        <li>升级springboot到2.1.17 提升安全性</li>
-									        <li>升级pagehelper到最新版1.3.0</li>
-									        <li>升级druid到最新版本v1.2.1</li>
-									        <li>升级fastjson到最新版1.2.74</li>
-									        <li>升级bootstrap-fileinput到最新版本5.1.2</li>
-									        <li>升级oshi到最新版本v5.2.5</li>
-									        <li>表单向导插件更换为jquery-smartwizard</li>
-									        <li>修改主子表提交示例代码防止渲染失效</li>
-									        <li>添加导入数据弹出窗体自定义宽高</li>
-									        <li>用户信息参数返回忽略掉密码字段</li>
-									        <li>优化关闭窗体添加index参数</li>
-									        <li>回显数据字典（字符串数组）增加空值判断</li>
-									        <li>修改前端密码长度校验和错误提示不符问题</li>
-									        <li>AjaxResult重写put方法，以方便链式调用</li>
-									        <li>增强验证码校验的语义，更易懂</li>
-									        <li>导入excel整形值校验优化</li>
-									        <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-									        <li>导出Excel调整targetAttr获取值方法，防止get方法不规范</li>
-									        <li>输入框组验证错误后置图标提示颜色</li>
-									        <li>上传媒体类型添加视频格式</li>
-									        <li>数据权限判断参数类型</li>
-									        <li>修正数据库字符串类型nvarchar</li>
-									        <li>优化递归子节点</li>
-									        <li>修复多表格搜索formId无效</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v44">v4.4.0</a><code class="pull-right">2020.08.24</code>
-								   </h5>
-								</div>
-								<div id="v44" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>升级bootstrapTable到最新版本1.17.1</li>
-									        <li>升级shiro到最新版1.6.0 阻止权限绕过漏洞</li>
-									        <li>升级fastjson到最新版1.2.73</li>
-									        <li>代码生成支持同步数据库</li>
-									        <li>代码生成支持富文本控件</li>
-									        <li>用户密码支持自定义配置规则</li>
-									        <li>新增表格自动刷新插件</li>
-									        <li>新增表格打印配置插件</li>
-									        <li>更换图片裁剪工具为cropper</li>
-									        <li>Excel支持sort导出排序</li>
-									        <li>代码生成支持自定义路径</li>
-									        <li>代码生成支持选择上级菜单</li>
-									        <li>代码生成支持上传控件</li>
-									        <li>新增表格参数（自定义加载文本的字体大小loadingFontSize）</li>
-									        <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-									        <li>操作日志记录排除敏感属性字段</li>
-									        <li>修复不同浏览器附件下载中文名乱码的问题</li>
-									        <li>用户分配角色不允许选择超级管理员角色</li>
-									        <li>更换表格冻结列插件</li>
-									        <li>添加右侧冻结列示例</li>
-									        <li>升级表格行编辑&移动端适应插件</li>
-									        <li>修复更新表格插件后无法设置实例配置问题</li>
-									        <li>修复更新表格插件后导致的主子表错误</li>
-									        <li>修复页面存在多表格，回调函数res数据不正确问题</li>
-									        <li>强退&过期清理登录帐号缓存会话</li>
-									        <li>表格树标题内容支持html语义化标签</li>
-									        <li>修复配置应用的访问路径首页页签重复问题</li>
-									        <li>优化openTab打开时滚动到当前页签</li>
-									        <li>表格请求方式method支持自定义配置</li>
-									        <li>菜单页签联动优化</li>
-									        <li>用户邮箱长度限制修改为50</li>
-									        <li>主子表示例添加日期格式案例</li>
-									        <li>修改表格行内编辑示例旧值参数</li>
-									        <li>操作日志查询方式调整</li>
-									        <li>唯一限制条件只返回单条数据</li>
-									        <li>修改Excel设置STRING单元格类型</li>
-									        <li>添加获取当前的环境配置方法</li>
-									        <li>截取返回参数长度，防止超出异常</li>
-									        <li>定时任务cron表达式验证</li>
-									        <li>拆分表格插件，按需引入</li>
-									        <li>多行文本框补齐必填错误提示背景</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v431">v4.3.1</a><code class="pull-right">2020.07.05</code>
-								   </h5>
-								</div>
-								<div id="v431" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>国家信息安全漏洞（请务必保持cipherKey密钥唯一性）</li>
-									        <li>升级shiro到最新版1.5.3 阻止权限绕过漏洞</li>
-									        <li>修改验证码在使用后清除，防止多次使用</li>
-									        <li>检查字符支持小数点&降级改成异常提醒</li>
-									        <li>openOptions函数中加入自定义maxmin属性</li>
-									        <li>支持openOptions方法最大化</li>
-									        <li>支持openOptions方法多个按钮回调</li>
-									        <li>新增isLinkage支持页签与菜单联动</li>
-									        <li>修改代码生成导入表结构出现异常页面不提醒问题</li>
-									        <li>优化用户头像发生错误，则显示一个默认头像</li>
-									        <li>Excel导出支持字典类型</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v43">v4.3.0</a><code class="pull-right">2020.06.22</code>
-								   </h5>
-								</div>
-								<div id="v43" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>代码生成模板支持主子表</li>
-									        <li>代码生成显示类型支持复选框</li>
-									        <li>前端表单样式修改成圆角</li>
-									        <li>新增回显数据字典（字符串数组）</li>
-									        <li>修复浏览器手动缩放比例后菜单无法自适应问题</li>
-									        <li>限制用户不允许选择系统管理员角色</li>
-									        <li>用户信息添加输入框组图标&鼠标按下显示密码</li>
-									        <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-									        <li>升级Bootstrap版本到v3.3.7</li>
-									        <li>修复selectColumns方法获取子对象数据无效问题</li>
-									        <li>修改数据源类型优先级，先根据方法，再根据类</li>
-									        <li>修改上级部门（选择项排除本身和下级）</li>
-									        <li>首页菜单显示调整</li>
-									        <li>添加是否开启swagger配置</li>
-									        <li>新增示例（主子表提交）</li>
-									        <li>新增示例（多级联动下拉示例）</li>
-									        <li>新增示例（表格属性data数据加载）</li>
-									        <li>新增表格列参数（是否列选项可见ignore）</li>
-									        <li>新增表格参数（是否启用显示卡片视图cardView）</li>
-									        <li>新增表格参数（是否显示全屏按钮showFullscreen）</li>
-									        <li>新增表格参数（是否启用分页条无限循环的功能paginationLoop）</li>
-									        <li>新增表格参数（是否显示表头showHeader）</li>
-									        <li>表格添加显示/隐藏所有列方法 showAllColumns/hideAllColumns</li>
-									        <li>修复部分情况节点不展开问题</li>
-									        <li>修复关闭标签页后刷新还是上次地址问题</li>
-									        <li>修复选择菜单后刷新页面，菜单箭头显示不对问题</li>
-											<li>修复jquery表单序列化时复选框未选中不会序列化到对象中问题</li>
-											<li>Excel支持readConverterExp读取字符串组内容</li>
-									        <li>更换IP地址查询接口</li>
-									        <li>默认关闭获取ip地址</li>
-									        <li>操作处理ajaxSuccess判断修正</li>
-									        <li>HttpUtils.sendPost()方法，参数无需拼接参数到url</li>
-									        <li>通用http发送方法增加参数 contentType 编码类型</li>
-									        <li>HTML过滤器不替换&实体</li>
-									        <li>代码生成浮点型改用BigDecimal</li>
-									        <li>修复表单构建单选和多选框渲染问题</li>
-									        <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
-									        <li>字典数据查询列表根据dictSort升序排序</li>
-									        <li>修复树表对imageView和tooltip方法无效问题</li>
-									        <li>修复Long类型比较相等问题调整</li>
-									        <li>示例demo页面清除html链接，防止点击后跳转出现404</li>
-									        <li>在线用户强退方法合并</li>
-									        <li>添加校验部门包含未停用的子部门</li>
-									        <li>取消回车自动提交表单</li>
-									        <li>'A','I','BUTTON' 标签忽略clickToSelect事件，防止点击操作按钮时选中</li>
-									        <li>邮箱显示截取部分字符串，防止低分辨率错位</li>
-									        <li>代码生成列属性根据sort排序</li>
-									        <li>修复更多操作部分浏览器不兼容情况</li>
-									        <li>图片预览事件属性修正</li>
-									        <li>修复冻结列排序样式无效问题</li>
-									        <li>修复context-path的情况下个人中心刷新导致样式问题</li>
-									        <li>全屏editFull打开适配表树</li>
-									        <li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v42">v4.2.0</a><code class="pull-right">2020.03.23</code>
-								   </h5>
-								</div>
-								<div id="v42" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>用户管理添加分配角色页面</li>
-									        <li>定时任务添加调度日志按钮</li>
-									        <li>新增是否开启用户注册功能</li>
-											<li>新增页面滚动显示返回顶部按钮</li>
-											<li>用户&角色&任务添加更多操作按钮</li>
-											<li>iframe框架页会话过期弹出超时提示</li>
-											<li>移动端登录不显示左侧菜单</li>
-											<li>侧边栏添加一套深蓝色主题</li>
-											<li>首页logo固定，不随菜单滚动</li>
-											<li>支持mode配置history（表示去掉地址栏的#）</li>
-											<li>任务分组字典翻译（调度日志详细）</li>
-											<li>字典管理添加缓存读取</li>
-											<li>字典数据列表标签显示样式</li>
-											<li>参数管理支持缓存操作</li>
-											<li>日期控件清空结束时间设置开始默认值为2099-12-31</li>
-											<li>表格树添加获取数据后响应回调处理</li>
-											<li>批量替换表前缀调整</li>
-											<li>支持表格导入模板的弹窗表单加入其它输入控件</li>
-											<li>表单重置刷新表格树</li>
-											<li>新增支持导出数据字段排序</li>
-											<li>新增表格参数（是否单选checkbox）</li>
-											<li>druid未授权不允许访问</li>
-											<li>表格树父节点兼容0,'0','',null</li>
-											<li>表单必填的项添加星号</li>
-											<li>修复select2不显示校验错误信息</li>
-											<li>添加自定义HTML过滤器</li>
-											<li>修复多数据源下开关关闭出现异常问题</li>
-											<li>修复翻页记住选择项数据问题</li>
-											<li>用户邮箱长度限制20</li>
-											<li>修改错误页面返回主页出现嵌套问题</li>
-											<li>表格浮动提示单双引号转义</li>
-											<li>支持配置四级菜单</li>
-											<li>升级shiro到最新版1.4.2 阻止rememberMe漏洞攻击</li>
-											<li>升级summernote到最新版本v0.8.12</li>
-											<li>导入Excel根据dateFormat属性格式处理</li>
-											<li>修复War部署无法正常shutdown,ehcache内存泄漏</li>
-											<li>修复代码生成短字段无法识别问题</li>
-											<li>修复serviceImpl模版，修改方法判断日期错误</li>
-											<li>代码生成模板增加导出功能日志记录</li>
-											<li>代码生成唯一编号调整为tableId</li>
-											<li>代码生成查询时忽略大小写</li>
-											<li>代码生成支持翻页记住选中</li>
-											<li>代码生成表注释未填写也允许导入</li>
-											<li>Global全局配置类修改为注解，防止多环境配置下读取问题</li>
-											<li>修复多表格情况下，firstLoad只对第一个表格生效</li>
-											<li>处理Maven打包出现警告问题</li>
-											<li>默认主题样式，防止网速慢情况下出现空白</li>
-											<li>修复文件上传多级目录识别问题</li>
-											<li>锚链接解码url，防止中文导致页面不能加载问题</li>
-											<li>修复右键Tab页刷新事件重复请求问题</li>
-											<li>角色禁用&菜单隐藏不查询权限</li>
-											<li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v41">v4.1.0</a><code class="pull-right">2019.10.22</code>
-								   </h5>
-								</div>
-								<div id="v41" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>支持多表格实例操作</li>
-									        <li>浮动提示方法tooltip支持弹窗</li>
-											<li>代码生成&字典数据支持模糊条件查询</li>
-											<li>增加页签全屏方法</li>
-											<li>增加清除表单验证错误信息方法</li>
-											<li>支持iframe局部刷新页面</li>
-											<li>支持在线切换主题</li>
-											<li>修改图片预览设置的高宽参数颠倒问题</li>
-											<li>操作日志新增解锁账户功能</li>
-											<li>管理员用户&角色不允许操作</li>
-											<li>去掉jsoup包调用自定义转义工具</li>
-											<li>添加时间轴示例</li>
-											<li>修复翻页记住选择时获取指定列值的问题</li>
-											<li>代码生成sql脚本添加导出按钮</li>
-											<li>添加表格父子视图示例</li>
-											<li>添加表格行内编辑示例</li>
-											<li>升级fastjson到最新版1.2.60 阻止漏洞攻击</li>
-											<li>升级echarts到最新版4.2.1</li>
-											<li>操作日志新增返回参数</li>
-											<li>支持mybatis通配符扫描任意多个包</li>
-											<li>权限验证多种情况处理</li>
-											<li>修复树形类型的代码生成的部分必要属性无法显示</li>
-											<li>修复非表格插件情况下重置出现异常</li>
-											<li>修复富文本编辑器有序列表冲突</li>
-											<li>代码生成表前缀配置支持多个</li>
-											<li>修复自动去除表前缀配置无效问题</li>
-											<li>菜单列表按钮数据可见不显示（权限标识控制）</li>
-											<li>修复设置会话超时时间无效问题</li>
-											<li>新增本地资源通用下载方法</li>
-											<li>操作日志记录新增请求方式</li>
-											<li>代码生成单选按钮属性重名修复</li>
-											<li>优化select2下拉框宽度不会随浏览器改变</li>
-											<li>修复代码生成树表异常</li>
-											<li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v40">v4.0.0</a><code class="pull-right">2019.08.08</code>
-								   </h5>
-								</div>
-								<div id="v40" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>代码生成支持预览、编辑，保存方案</li>
-									        <li>新增防止表单重复提交注解</li>
-											<li>新增后端校验（和前端保持一致）</li>
-											<li>新增同一个用户最大会话数控制</li>
-											<li>Excel导出子对象支持多个字段</li>
-											<li>定时任务支持静态调用和多参数</li>
-											<li>定时任务增加分组条件查询</li>
-											<li>字典类型增加任务分组数据</li>
-											<li>新增表格是否首次加载数据</li>
-											<li>新增parentTab选项卡可在同一页签打开</li>
-											<li>多数据源支持类注解（允许继承父类的注解）</li>
-											<li>部门及以下数据权限（调整为以下及所有子节点）</li>
-											<li>新增角色数据权限配（仅本人数据权限）</li>
-											<li>修改菜单权限显示问题</li>
-											<li>上传文件修改路径及返回名称</li>
-											<li>添加报表插件及示例</li>
-											<li>添加首页统计模板</li>
-											<li>添加表格拖拽示例</li>
-											<li>添加卡片列表示例</li>
-											<li>添加富文本编辑器示例</li>
-											<li>添加表格动态增删改查示例</li>
-											<li>添加用户页面岗位选择框提示</li>
-											<li>点击菜单操作添加背景高亮显示</li>
-											<li>表格树新增showSearch是否显示检索信息</li>
-											<li>解决表格列设置sortName无效问题</li>
-											<li>表格图片预览支持自定义设置宽高</li>
-											<li>添加表格列浮动提示（单击文本复制）</li>
-											<li>PC端收起菜单后支持浮动显示</li>
-											<li>详细操作样式调整</li>
-											<li>修改用户更新描述空串不更新问题</li>
-											<li>导入修改为模板渲染</li>
-											<li>修改菜单及部门排序规则</li>
-											<li>角色导出数据范围表达式翻译</li>
-											<li>添加summernote富文本字体大小</li>
-											<li>优化表格底部下边框防重叠&汇总像素问题</li>
-											<li>树表格支持属性多层级访问</li>
-											<li>修复IE浏览器用户管理界面右侧留白问题</li>
-											<li>重置按钮刷新表格</li>
-											<li>重置密码更新用户缓存</li>
-											<li>优化验证码属性参数</li>
-											<li>支持数据监控配置用户名和密码</li>
-											<li>文件上传修改按钮背景及加载动画</li>
-											<li>支持配置一级菜单href跳转</li>
-											<li>侧边栏添加一套浅色主题</li>
-											<li>树表格添加回调函数（校验异常状态）</li>
-											<li>用户个人中心适配手机端显示</li>
-											<li>Excel支持设置导出类型&更换样式</li>
-											<li>检查属性改变修改为克隆方式（防止热部署强转异常）</li>
-											<li>其他细节优化</li>
-										</ol>
-									</div>
-							    </div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v34">v3.4.0</a><code class="pull-right">2019.06.03</code>
-								   </h5>
-								</div>
-								<div id="v34" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-									        <li>新增实例演示菜单及demo</li>
-											<li>新增页签右键操作</li>
-											<li>菜单管理新增打开方式</li>
-											<li>新增点击某行触发的事件</li>
-											<li>新增双击某行触发的事件</li>
-											<li>新增单击某格触发的事件</li>
-											<li>新增双击某格触发的事件</li>
-											<li>新增是否启用显示细节视图</li>
-											<li>支持上传任意格式文件</li>
-											<li>修复角色权限注解失效问题</li>
-											<li>左侧的菜单栏宽度调整</li>
-											<li>新增响应完成后自定义回调函数</li>
-											<li>支持前端及其他模块直接获取用户信息</li>
-											<li>升级swagger到最新版2.9.2</li>
-											<li>升级jquery.slimscroll到最新版1.3.8</li>
-											<li>升级select2到最新版4.0.7</li>
-											<li>新增角色配置本部门数据权限</li>
-											<li>新增角色配置本部门及以下数据权限</li>
-											<li>优化底部操作防止跳到页面顶端</li>
-											<li>修改冻结列选框无效及样式问题</li>
-											<li>修复部门四层级修改祖级无效问题</li>
-											<li>更换开关切换按钮样式</li>
-											<li>新增select2-bootstrap美化下拉框</li>
-											<li>添加表格内图片预览方法</li>
-											<li>修复权限校验失败跳转页面路径错误</li>
-											<li>国际化资源文件调整</li>
-											<li>通知公告布局调整</li>
-											<li>删除页签操作功能</li>
-											<li>表格树新增查询指定列值</li>
-											<li>更改系统接口扫描方式及完善测试案例</li>
-											<li>表格列浮动提示及字典回显默认去背景</li>
-											<li>修复启用翻页记住前面的选择check没选中问题</li>
-											<li>去除监控页面底部的广告</li>
-											<li>日期控件功问题修复及data功能增强</li>
-											<li>新增角色权限可见性（前端直接调用）</li>
-											<li>新增获取当前登录用户方法（前端及子模块调用）</li>
-											<li>修复热部署重启导致菜单丢失问题</li>
-											<li>优化业务校验失败普通请求跳转页面</li>
-											<li>操作日志新增状态条件查询</li>
-											<li>操作类型支持多选条件查询</li>
-											<li>通知公告防止滚动触底回弹优化</li>
-											<li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							 </div>
-                             <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v33">v3.3.0</a><code class="pull-right">2019.04.01</code>
-								   </h5>
-								</div>
-								<div id="v33" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-											<li>新增线程池统一管理</li>
-											<li>新增支持左右冻结列</li>
-											<li>新增表格字符超长浮动提示</li>
-											<li>升级datepicker拓展并汉化</li>
-											<li>升级druid到最新版本v1.1.14</li>
-											<li>修复个人头像为图片服务器跨域问题</li>
-											<li>修改上传文件按日期存储</li>
-											<li>新增表格客户端分页选项</li>
-											<li>新增表格的高度参数</li>
-											<li>新增表格销毁方法</li>
-											<li>新增表格下拉按钮切换方法</li>
-											<li>新增表格分页跳转到指定页码</li>
-											<li>新增表格启用点击选中行参数</li>
-											<li>修复表格数据重新加载未触发部分按钮禁用</li>
-											<li>使用jsonview展示操作日志参数</li>
-											<li>新增方法（addTab、editTab）</li>
-											<li>修改用户管理界面为Tab打开方式</li>
-											<li>表单验证代码优化</li>
-											<li>修复@Excel注解 prompt 属性使用报错</li>
-											<li>修复combo属性Excel兼容性问题</li>
-											<li>新增@Excel导入导出支持父类字段</li>
-											<li>修复关闭最后选项卡无法激活滚动问题</li>
-											<li>增加日期控件显示类型及回显格式扩展选项</li>
-											<li>修复定时任务执行失败后入库状态为成功状态</li>
-											<li>支持定时任务并发开关控制</li>
-											<li>优化权限校验失败普通请求跳转页面</li>
-											<li>捕获线程池执行任务抛出的异常</li>
-											<li>修复IE浏览器导出功能报错</li>
-											<li>新增角色管理分配用户功能</li>
-											<li>新增表格翻页记住前面的选择</li>
-											<li>调整用户个人中心页面</li>
-											<li>修复界面存在的一些安全问题</li>
-											<li>其他细节优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v32">v3.2.0</a><code class="pull-right">2019.01.18</code>
-								   </h5>
-								</div>
-								<div id="v32" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-											<li>部门修改时不允许选择最后节点</li>
-											<li>修复部门菜单排序字段无效</li>
-											<li>修复光驱磁盘导致服务监控异常</li>
-											<li>登录界面去除check插件</li>
-											<li>验证码文本字符间距修正</li>
-											<li>升级SpringBoot到最新版本2.1.1</li>
-											<li>升级MYSQL驱动</li>
-											<li>修正登录必填项位置偏移</li>
-											<li>Session会话检查优化</li>
-											<li>Excel注解支持多级获取</li>
-											<li>新增序列号生成方法</li>
-											<li>修复WAR部署tomcat退出线程异常</li>
-											<li>全屏操作增加默认确认/关闭</li>
-											<li>修复个人信息可能导致漏洞</li>
-											<li>字典数据根据下拉选择新增类型</li>
-											<li>升级Summernote到最新版本v0.8.11</li>
-											<li>新增用户数据导入</li>
-											<li>首页主题样式更换</li>
-											<li>layer扩展主题更换</li>
-											<li>用户管理移动端默认隐藏左侧布局</li>
-											<li>详细信息弹出层显示在顶层</li>
-											<li>表格支持切换状态（用户/角色/定时任务）</li>
-											<li>Druid数据源支持配置继承</li>
-											<li>修正部分iPhone手机端表格适配问题</li>
-											<li>新增防止重复提交表单方法</li>
-											<li>新增表格数据统计汇总方法</li>
-											<li>支持富文本上传图片文件</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v31">v3.1.0</a><code class="pull-right">2018.12.03</code>
-								   </h5>
-								</div>
-								<div id="v31" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-											<li>新增内网不获取IP地址</li>
-											<li>新增cron表达式有效校验</li>
-											<li>定时任务新增详细信息</li>
-											<li>定时任务默认策略修改（不触发立即执行）</li>
-											<li>定时任务显示下一个执行周期</li>
-											<li>支持前端任意日期格式处理</li>
-											<li>上传头像删除多余提交按钮</li>
-											<li>表格增加行间隔色配置项</li>
-											<li>表格增加转义HTML字符串配置项</li>
-											<li>表格增加显示/隐藏指定列</li>
-											<li>代码生成优化</li>
-											<li>操作日志参数格式化显示</li>
-											<li>页签新增新增全屏显示</li>
-											<li>新增一键打包部署</li>
-											<li>Excel注解新增多个参数</li>
-											<li>新增提交静默更新表格方法</li>
-											<li>新增服务监控菜单</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-							<div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v30">v3.0.0</a><code class="pull-right">2018.10.08</code>
-								   </h5>
-								</div>
-								<div id="v30" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-											<li>升级poi到最新版3.17</li>
-											<li>导出修改临时目录绝对路径</li>
-											<li>升级laydate到最新版5.0.9</li>
-											<li>升级SpringBoot到最新版本2.0.5</li>
-											<li>优化开始/结束时间校验限制</li>
-											<li>重置密码参数表中获取默认值</li>
-											<li>修复头像修改显示问题</li>
-											<li>新增数据权限过滤注解</li>
-											<li>新增表格检索折叠按钮</li>
-											<li>新增清空（登录、操作、调度）日志</li>
-											<li>固定按钮位置（提交/关闭）</li>
-											<li>部门/菜单支持（展开/折叠）</li>
-											<li>部分细节调整优化</li>
-											<li>项目采用分模块</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-							<div class="panel panel-default">
-								<div class="panel-heading">
-								   <h5 class="panel-title">
-									   <a data-toggle="collapse" data-parent="#version" href="#v24">v2.4.0</a><code class="pull-right">2018.09.03</code>
-								   </h5>
-								</div>
-								<div id="v24" class="panel-collapse collapse">
-									<div class="panel-body">
-									   <ol>
-											<li>支持部门多级查询</li>
-											<li>修复菜单状态查询无效</li>
-											<li>支持IP地址开关</li>
-											<li>支持XSS开关</li>
-											<li>记录日志异步处理</li>
-											<li>字典回显样式更改为下拉框</li>
-											<li>菜单类型必填校验</li>
-											<li>修复在线用户排序报错</li>
-											<li>增加重置按钮</li>
-											<li>支持注解导入数据</li>
-											<li>支持弹层外区域关闭</li>
-											<li>备注更换为文本区域</li>
-											<li>新增角色逻辑删除</li>
-											<li>新增部门逻辑删除</li>
-											<li>支持部门数据权限</li>
-											<li>管理员默认拥有所有授权</li>
-											<li>字典数据采用分页</li>
-											<li>部分细节调整优化</li>
-										</ol>
-									</div>
-								</div>
-							</div>
-                            <div class="panel panel-default">
-									<div class="panel-heading">
-									   <h5 class="panel-title">
-										   <a data-toggle="collapse" data-parent="#version" href="#v23">v2.3.0</a><code class="pull-right">2018.08.06</code>
-									   </h5>
-									</div>
-									<div id="v23" class="panel-collapse collapse">
-										<div class="panel-body">
-										   <ol>
-										        <li>支持表格不分页开关控制</li>
-										        <li>修改字典类型同步修改字典数据</li>
-										        <li>代码生成新增修改后缀处理</li>
-										        <li>代码生成新增实体toString</li>
-										        <li>代码生成非字符串去除!=''</li>
-												<li>导出数据前加载遮罩层</li>
-												<li>部门删除校验条件修改</li>
-												<li>搜索查询下载优化</li>
-												<li>手机打开弹出层自适应</li>
-												<li>角色岗位禁用显示置灰</li>
-												<li>角色禁用不显示菜单</li>
-												<li>新增导出权限</li>
-												<li>角色权限唯一校验</li>
-												<li>岗位名称编码唯一校验</li>
-                                                <li>TreeTable优化</li>
-                                                <li>支持多数据源</li>
-												<li>其他细节优化</li>
-											</ol>
-										</div>
-									</div>
-								</div>
-                                <div class="panel panel-default">
-									<div class="panel-heading">
-									   <h5 class="panel-title">
-										   <a data-toggle="collapse" data-parent="#version" href="#v22">v2.2.0</a><code class="pull-right">2018.07.23</code>
-									   </h5>
-									</div>
-									<div id="v22" class="panel-collapse collapse">
-										<div class="panel-body">
-										   <ol>
-										        <li>修复批量生成代码异常问题</li>
-										        <li>修复定时器保存失败问题</li>
-										        <li>修复热部署转换问题</li>
-												<li>支持查询菜单管理，部门管理</li>
-												<li>大多数功能支持时间查询</li>
-												<li>自定义导出注解自动匹配column</li>
-												<li>新增任务执行策略</li>
-												<li>操作详细动态显示类型</li>
-												<li>支持动态回显字典数据</li>
-												<li>后台代码优化调整</li>
-												<li>其他细节优化</li>
-											</ol>
-										</div>
-									</div>
-								</div>
-                                <div class="panel panel-default">
-									<div class="panel-heading">
-									   <h5 class="panel-title">
-										   <a data-toggle="collapse" data-parent="#version" href="#v21">v2.1.0</a><code class="pull-right">2018.07.10</code>
-									   </h5>
-									</div>
-									<div id="v21" class="panel-collapse collapse">
-										<div class="panel-body">
-										   <ol>
-										        <li>新增登录超时提醒</li>
-										        <li>修复定时器热部署转换问题</li>
-										        <li>修复登录验证码校验无效问题</li>
-												<li>定时任务新增立即执行一次</li>
-												<li>存在字典数据不允许删除字典</li>
-												<li>字典数据支持按名称查询</li>
-												<li>代码生成增加日志注解&表格优化</li>
-												<li>修复用户逻辑删除后能登录问题</li>
-												<li>表格支持多字段动态排序</li>
-												<li>支持三级菜单显示</li>
-												<li>新增ry.sh启动程序脚本</li>
-												<li>其他细节优化</li>
-											</ol>
-										</div>
-									</div>
-								</div>
-                            	<div class="panel panel-default">
-									<div class="panel-heading">
-									   <h5 class="panel-title">
-										   <a data-toggle="collapse" data-parent="#version" href="#v20">v2.0.0</a><code class="pull-right">2018.07.02</code>
-									   </h5>
-									</div>
-									<div id="v20" class="panel-collapse collapse">
-										<div class="panel-body">
-										   <ol>
-										        <li>升级SpringBoot到最新版本2.0.3</li>
-										        <li>新增公告管理</li>
-												<li>表单校验示提体验优化</li>
-												<li>前端通用方法封装调整</li>
-												<li>前端去除js文件，合并到html</li>
-												<li>操作加载遮罩层</li>
-												<li>支持全屏模式操作</li>
-												<li>支持注解导出数据</li>
-												<li>系统支持多查询&下载</li>
-												<li>系统样式调整</li>
-											</ol>
-										</div>
-									</div>
-								</div>
-                                <div class="panel panel-default">
-									<div class="panel-heading">
-									   <h5 class="panel-title">
-										   <a data-toggle="collapse" data-parent="#version" href="#v16">v1.1.6</a><code class="pull-right">2018.06.04</code>
-									   </h5>
-									</div>
-									<div id="v16" class="panel-collapse collapse">
-										<div class="panel-body">
-										   <ol>
-												<li>新增用户列表部门列</li>
-												<li>新增登录地点</li>
-												<li>新增swagger</li>
-												<li>修复排序数字校验</li>
-												<li>优化头像上传文件类型限定为图片</li>
-												<li>新增XSS过滤</li>
-												<li>新增热部署提高开发效率</li>
-												<li>修复treegrid居中无效</li>
-												<li>角色多条件查询</li>
-											</ol>
-										</div>
-									</div>
-								</div>
-                            	<div class="panel panel-default">
-									<div class="panel-heading">
-									   <h5 class="panel-title">
-										   <a data-toggle="collapse" data-parent="#version" href="#v15">v1.1.5</a><code class="pull-right">2018.05.28</code>
-									   </h5>
-									</div>
-									<div id="v15" class="panel-collapse collapse">
-										<div class="panel-body">
-										   <ol>
-												<li>优化登录失败刷新验证码</li>
-												<li>新增用户登录地址时间</li>
-												<li>修复ajax超时退出问题</li>
-												<li>新增html调用数据字典(若依首创)</li>
-												<li>调整系统部分样式</li>
-												<li>新增用户逻辑删除</li>
-												<li>新增管理员不允许删除修改</li>
-												<li>升级bootstrapTable到最新版本1.12.1</li>
-												<li>升级layer到最新版本3.1.1</li>
-											</ol>
-										</div>
-									</div>
-								</div>
-							    <div class="panel panel-default">
-									<div class="panel-heading">
-									   <h5 class="panel-title">
-										   <a data-toggle="collapse" data-parent="#version" href="#v14">v1.1.4</a><code class="pull-right">2018.05.20</code>
-									   </h5>
-									</div>
-									<div id="v14" class="panel-collapse collapse">
-										<div class="panel-body">
-										   <ol>
-												<li>新增参数管理</li>
-												<li>修复头像上传bug</li>
-												<li>手机邮箱唯一校验</li>
-												<li>支持手机邮箱登录</li>
-												<li>代码生成优化</li>
-												<li>支持模糊查询</li>
-												<li>支持切换主题皮肤</li>
-												<li>修改权限即时生效</li>
-												<li>修复页签Tab关闭问题</li>
-											</ol>
-										</div>
-									</div>
-								</div>
-								<div class="panel panel-default">
-									<div class="panel-heading">
-									   <h5 class="panel-title">
-										   <a data-toggle="collapse" data-parent="#version" href="#v13">v1.1.3</a><code class="pull-right">2018.05.14</code>
-									   </h5>
-									</div>
-									<div id="v13" class="panel-collapse collapse">
-										<div class="panel-body">
-										   <ol>
-												<li>新增验证码（数组计算、字符验证）</li>
-												<li>新增cookie记住我</li>
-												<li>新增头像上传</li>
-												<li>用户名密码长度限制</li>
-												<li>通用字段提取</li>
-												<li>支持自定义条件查询</li>
-												<li>部门名称必填、时间格式调整</li>
-												<li>其他细节优化</li>
-											</ol>
-										</div>
-									</div>
-								</div>
-								<div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v12">v1.1.2</a><code class="pull-right">2018.05.07</code>
-										</h5>
-                                    </div>
-                                    <div id="v12" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增个人信息修改</li>
-												<li>菜单存在子菜单不允许删除</li>
-												<li>菜单分配角色不允许删除</li>
-												<li>角色分配人员不允许删除</li>
-												<li>岗位使用后不允许删除</li>
-												<li>保证用户的数据完整性加入事物</li>
-												<li>新增环境使用手册、数据建模</li>
-												<li>Thymeleaf升级到3.0</li>
-												<li>支持非ROOT部署</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v11">v1.1.1</a><code class="pull-right">2018.04.23</code>
-										</h5>
-                                    </div>
-                                    <div id="v11" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增表单构建器</li>
-												<li>代码生成优化</li>
-												<li>支持新增主部门</li>
-												<li>支持选择上级部门、上级菜单</li>
-												<li>新增字典管理单条删除</li>
-												<li>优化一些其他细节</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v10">v1.1.0</a><code class="pull-right">2018.04.20</code>
-										</h5>
-                                    </div>
-                                    <div id="v10" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>支持密码盐</li>
-												<li>支持新增主目录</li>
-												<li>支持批量生成代码</li>
-												<li>支持表格导出(csv、txt、doc、excel)</li>
-												<li>自动适应宽高模式窗体</li>
-												<li>重复校验(角色名、菜单名、部门名)</li>
-												<li>优化一些其他细节</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v09">v1.0.9</a><code class="pull-right">2018.04.14</code>
-										</h5>
-                                    </div>
-                                    <div id="v09" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增代码生成(生成包括 java、html、js、xml、sql)</li>
-												<li>新增按钮权限控制隐藏(若依首创)</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-								<div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v08">v1.0.8</a><code class="pull-right">2018.04.08</code>
-										</h5>
-                                    </div>
-                                    <div id="v08" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增定时任务(新增、修改、删除、查询、启动/暂停)</li>
-												<li>新增调度日志(查询、删除)</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-                            	<div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v07">v1.0.7</a><code class="pull-right">2018.04.04</code>
-										</h5>
-                                    </div>
-                                    <div id="v07" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增岗位管理(新增、修改、删除、查询)</li>
-												<li>优化用户管理，菜单管理部分细节</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-								<div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v06">v1.0.6</a><code class="pull-right">2018.03.15</code>
-										</h5>
-                                    </div>
-                                    <div id="v06" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增字典管理(新增、删除、修改、查询、数据选择)</li>
-												<li>新增用户密码重置</li>
-												<li>优化一些其他细节</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-								<div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v05">v1.0.5</a><code class="pull-right">2018.03.12</code>
-										</h5>
-                                    </div>
-                                    <div id="v05" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增菜单管理(新增、删除、修改、查询、图标选择)</li>
-												<li>部门管理优化(添加责任人、联系电话、邮箱、修改者)</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-								<div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v04">v1.0.4</a><code class="pull-right">2018.03.11</code>
-										</h5>
-                                    </div>
-                                    <div id="v04" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增角色管理(新增、删除、修改、查询、菜单选择)</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-								<div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v03">v1.0.3</a><code class="pull-right">2018.03.08</code>
-										</h5>
-                                    </div>
-                                    <div id="v03" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增用户管理(新增、删除、修改、查询、部门选择)</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-                            	<div class="panel panel-default">
-									<div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v02">v1.0.2</a><code class="pull-right">2018.03.04</code>
-										</h5>
-                                    </div>
-                                    <div id="v02" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增部门管理 (新增、删除、修改、查询)</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">
-                                        <h5 class="panel-title">
-											<a data-toggle="collapse" data-parent="#version" href="#v01">v1.0.1</a><code class="pull-right">2018.03.03</code>
-										</h5>
-                                    </div>
-                                    <div id="v01" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                            	<li>新增在线用户 (批量强退、单条强退、查询)</li>
-                                                <li>新增登录日志 (批量删除、查询)</li>
-												<li>新增操作日志 (批量删除、查询、详细)</li>
-												<li>新增数据监控 (监控DB池连接和SQL的执行)</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">
-                                        <h4 class="panel-title">
-                                            <a data-toggle="collapse" data-parent="#version" href="#v00">v1.0.0</a><code class="pull-right">2018.03.01</code>
-                                        </h4>
-                                    </div>
-                                    <div id="v00" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            <ol>
-                                                <li>若依管理系统正式发布。</li>
-                                            </ol>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>捐赠</h5>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="alert alert-warning">
-                            	请作者喝杯咖啡（点击图片放大）
-                        </div>
-                        <p id="pay-qrcode">
-                            <a href="javascript:;"><img th:src="@{/img/pay.png}" width="100%" alt="请使用手机支付宝或者微信扫码支付">
-                            </a>
-                        </p>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script th:src="@{/js/jquery.min.js}"></script>
-    <script th:src="@{/js/bootstrap.min.js}"></script>
-    <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
-    <script type="text/javascript">
-	    $('#pay-qrcode').click(function(){
-	        var html=$(this).html();
-	        parent.layer.open({
-	            title: false,
-	            type: 1,
-	            closeBtn:false,
-	            shadeClose:true,
-	            area: ['600px', '360px'],
-	            content: html
-	        });
-	    });
-    </script>
 </body>
 </html>
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/err/err.html b/ruoyi-admin/src/main/resources/templates/monitor/err/err.html
new file mode 100644
index 000000000..50102c48b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/monitor/err/err.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('错误日志列表')" />
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>地址：</label>
+                            <input type="text" name="address"/>
+                        </li>
+                        <li>
+                            <label>交易id：</label>
+                            <input type="text" name="trxId"/>
+                        </li>
+                        <li>
+                            <label>其他id：</label>
+                            <input type="text" name="otherId"/>
+                        </li>
+                        <li>
+                            <label>发生场景：</label>
+                            <input type="text" name="errorCode"/>
+                        </li>
+                        <li>
+                            <label>创建时间：</label>
+                            <input type="text" class="time-input" placeholder="请选择创建时间" name="fcd"/>
+                        </li>
+
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="monitor:err:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="monitor:err:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>-->
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:err:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+     <!--       <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:err:export">
+                <i class="fa fa-download"></i> 导出
+            </a>-->
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('monitor:err:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('monitor:err:remove')}]];
+    var prefix = ctx + "monitor/err";
+
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "错误日志",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'idErrorLog',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'address',
+                    title: '地址'
+                },
+                {
+                    field: 'trxId',
+                    title: '交易订单'
+                },
+                {
+                    field: 'otherId',
+                    title: '其他id'
+                },
+                {
+                    field: 'errorCode',
+                    title: '发生场景'
+                },
+                {
+                    field: 'errorMsg',
+                    title: '错误信息'
+                },
+                {
+                    field: 'fcd',
+                    title: '创建时间'
+                }/*,
+                {
+                    field: 'fcu',
+                    title: '创建用户'
+                },
+                {
+                    field: 'lcd',
+                    title: '更新时间'
+                },
+                {
+                    field: 'lcu',
+                    title: '更新用户'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.idErrorLog + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.idErrorLog + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }*/
+                ]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/register.html b/ruoyi-admin/src/main/resources/templates/register.html
index dacc5209c..75e227c41 100644
--- a/ruoyi-admin/src/main/resources/templates/register.html
+++ b/ruoyi-admin/src/main/resources/templates/register.html
@@ -3,8 +3,8 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <title>注册若依系统</title>
-    <meta name="description" content="若依后台管理框架">
+    <title>注册feeen系统</title>
+    <meta name="description" content="feeen后台管理框架">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
@@ -22,18 +22,18 @@
         <div class="row">
             <div class="col-sm-7">
                 <div class="signin-info">
-                    <div class="logopanel m-b">
-                        <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
-                    </div>
-                    <div class="m-b"></div>
-                    <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>
-                    <ul class="m-b">
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>
-                    </ul>
+<!--                    <div class="logopanel m-b">-->
+<!--                        <h1><img alt="[ feeen ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>-->
+<!--                    </div>-->
+<!--                    <div class="m-b"></div>-->
+<!--                    <h4>欢迎使用 <strong>feeen 后台管理系统</strong></h4>-->
+<!--                    <ul class="m-b">-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li>-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>-->
+<!--                    </ul>-->
                     <strong>已经注册过? <a th:href="@{/login}">直接登录&raquo;</a></strong>
                 </div>
             </div>
@@ -62,11 +62,11 @@
                 </form>
             </div>
         </div>
-        <div class="signup-footer">
+   <!--     <div class="signup-footer">
             <div class="pull-left">
                 &copy; 2018-2024 All Rights Reserved. RuoYi <br>
             </div>
-        </div>
+        </div>-->
     </div>
 <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; var captchaEnabled = [[${captchaEnabled}]];</script>
 <!-- 全局js -->
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 8806c451e..c80825645 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -95,6 +95,12 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 90779ca2e..acfe4cd4b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -35,7 +35,8 @@ public class UserConstants
 
     /** 是否为系统默认（是） */
     public static final String YES = "Y";
-    
+    public static final String NO = "N";
+
     /** 是否唯一的返回标识 */
     public final static boolean UNIQUE = true;
     public final static boolean NOT_UNIQUE = false;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AccountAddressInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AccountAddressInfo.java
new file mode 100644
index 000000000..223314642
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AccountAddressInfo.java
@@ -0,0 +1,81 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 出账账户对象 account_address_info
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Data
+public class AccountAddressInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long idAccoutAddressInfo;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
+    /** 加密之后的账户秘钥 */
+    @Excel(name = "加密之后的账户秘钥")
+    private String encryptPrivateKey;
+
+    /** 用于解密加密之后的账户秘钥的秘钥 */
+    @Excel(name = "用于解密加密之后的账户秘钥的秘钥")
+    private String encryptKey;
+
+    /** 是否有效,用于逻辑删除 */
+    @Excel(name = "是否有效,用于逻辑删除")
+    private String isValid;
+
+    /**
+     * 带宽资源
+     */
+    private String netResource;
+
+    /**
+     * 能量资源
+     */
+    private String energyResource;
+
+    /**
+     * 冻结资产数
+     */
+    private BigDecimal totalFrozen;
+
+    /**
+     * trx账户余额
+     */
+    private BigDecimal trxBalance;
+
+    //** 创建时间 *//*
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fcd;
+
+    //** 创建用户 *//*
+    @Excel(name = "创建用户")
+    private String fcu;
+
+    //** 更新时间 *//*
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date lcd;
+
+    //** 更新用户 *//*
+    @Excel(name = "更新用户")
+    private String lcu;
+
+
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ErrorLog.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ErrorLog.java
new file mode 100644
index 000000000..7feece40b
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ErrorLog.java
@@ -0,0 +1,170 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Builder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 错误日志对象 error_log
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Builder
+public class ErrorLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long idErrorLog;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
+    /** 交易id */
+    @Excel(name = "交易id")
+    private String trxId;
+
+    /** 其他可能关联的eid */
+    @Excel(name = "其他可能关联的eid")
+    private String otherId;
+
+    /** 错误类型发生场景 */
+    @Excel(name = "错误类型发生场景")
+    private String errorCode;
+
+    /** 错误信息 */
+    @Excel(name = "错误信息")
+    private String errorMsg;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fcd;
+
+    /** 创建用户 */
+    @Excel(name = "创建用户")
+    private String fcu;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date lcd;
+
+    /** 更新用户 */
+    @Excel(name = "更新用户")
+    private String lcu;
+
+    public void setIdErrorLog(Long idErrorLog) 
+    {
+        this.idErrorLog = idErrorLog;
+    }
+
+    public Long getIdErrorLog() 
+    {
+        return idErrorLog;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setTrxId(String trxId) 
+    {
+        this.trxId = trxId;
+    }
+
+    public String getTrxId() 
+    {
+        return trxId;
+    }
+    public void setOtherId(String otherId) 
+    {
+        this.otherId = otherId;
+    }
+
+    public String getOtherId() 
+    {
+        return otherId;
+    }
+    public void setErrorCode(String errorCode) 
+    {
+        this.errorCode = errorCode;
+    }
+
+    public String getErrorCode() 
+    {
+        return errorCode;
+    }
+    public void setErrorMsg(String errorMsg) 
+    {
+        this.errorMsg = errorMsg;
+    }
+
+    public String getErrorMsg() 
+    {
+        return errorMsg;
+    }
+    public void setFcd(Date fcd) 
+    {
+        this.fcd = fcd;
+    }
+
+    public Date getFcd() 
+    {
+        return fcd;
+    }
+    public void setFcu(String fcu) 
+    {
+        this.fcu = fcu;
+    }
+
+    public String getFcu() 
+    {
+        return fcu;
+    }
+    public void setLcd(Date lcd) 
+    {
+        this.lcd = lcd;
+    }
+
+    public Date getLcd() 
+    {
+        return lcd;
+    }
+    public void setLcu(String lcu) 
+    {
+        this.lcu = lcu;
+    }
+
+    public String getLcu() 
+    {
+        return lcu;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("idErrorLog", getIdErrorLog())
+            .append("address", getAddress())
+            .append("trxId", getTrxId())
+            .append("otherId", getOtherId())
+            .append("errorCode", getErrorCode())
+            .append("errorMsg", getErrorMsg())
+            .append("fcd", getFcd())
+            .append("fcu", getFcu())
+            .append("lcd", getLcd())
+            .append("lcu", getLcu())
+            .toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FreezeBalanceInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FreezeBalanceInfo.java
new file mode 100644
index 000000000..d2c6cac3d
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FreezeBalanceInfo.java
@@ -0,0 +1,58 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 抵押流水记录对象 freeze_balance_info
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Data
+public class FreezeBalanceInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long idFreezeBalanceInfo;
+
+    /** 账户地址 */
+    @Excel(name = "账户地址")
+    private String address;
+
+    /** 抵押金额trx */
+    @Excel(name = "抵押金额trx")
+    private Long freezeTrxAmount;
+
+    /** 交换资源类型id */
+    @Excel(name = "交换资源")
+    private String exchangeResourceType;
+
+    /** 交易id */
+    @Excel(name = "交易id")
+    private String txId;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fcd;
+
+    /** 创建用户 */
+    @Excel(name = "创建用户")
+    private String fcu;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date lcd;
+
+    /** 更新用户 */
+    @Excel(name = "更新用户")
+    private String lcu;
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MonitorAddressInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MonitorAddressInfo.java
new file mode 100644
index 000000000..03a32f3bf
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MonitorAddressInfo.java
@@ -0,0 +1,182 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 监听账户入账对象 monitor_address_info
+ *
+ * @author dorion
+ * @date 2024-04-14
+ */
+public class MonitorAddressInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long idMonitorAddress;
+
+    /** 监听地址 */
+    @Excel(name = "监听地址")
+    private String monitorAddress;
+
+    /** 出账地址 */
+    @Excel(name = "出账地址")
+    private String accountAddress;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private Long price;
+
+    /** trx或者usdt */
+    @Excel(name = "trx或者usdt")
+    private String monitorType;
+
+    /** API_KEY */
+    @Excel(name = "API_KEY")
+    private String apiKey;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private String isValid;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fcd;
+
+    /** 创建用户 */
+    @Excel(name = "创建用户")
+    private String fcu;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date lcd;
+
+    /** 更新用户 */
+    @Excel(name = "更新用户")
+    private String lcu;
+
+    public void setIdMonitorAddress(Long idMonitorAddress)
+    {
+        this.idMonitorAddress = idMonitorAddress;
+    }
+
+    public Long getIdMonitorAddress()
+    {
+        return idMonitorAddress;
+    }
+    public void setMonitorAddress(String monitorAddress)
+    {
+        this.monitorAddress = monitorAddress;
+    }
+
+    public String getMonitorAddress()
+    {
+        return monitorAddress;
+    }
+    public void setAccountAddress(String accountAddress)
+    {
+        this.accountAddress = accountAddress;
+    }
+
+    public String getAccountAddress()
+    {
+        return accountAddress;
+    }
+    public void setPrice(Long price)
+    {
+        this.price = price;
+    }
+
+    public Long getPrice()
+    {
+        return price;
+    }
+    public void setMonitorType(String monitorType)
+    {
+        this.monitorType = monitorType;
+    }
+
+    public String getMonitorType()
+    {
+        return monitorType;
+    }
+    public void setApiKey(String apiKey)
+    {
+        this.apiKey = apiKey;
+    }
+
+    public String getApiKey()
+    {
+        return apiKey;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setFcd(Date fcd)
+    {
+        this.fcd = fcd;
+    }
+
+    public Date getFcd()
+    {
+        return fcd;
+    }
+    public void setFcu(String fcu)
+    {
+        this.fcu = fcu;
+    }
+
+    public String getFcu()
+    {
+        return fcu;
+    }
+    public void setLcd(Date lcd)
+    {
+        this.lcd = lcd;
+    }
+
+    public Date getLcd()
+    {
+        return lcd;
+    }
+    public void setLcu(String lcu)
+    {
+        this.lcu = lcu;
+    }
+
+    public String getLcu()
+    {
+        return lcu;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("idMonitorAddress", getIdMonitorAddress())
+                .append("monitorAddress", getMonitorAddress())
+                .append("accountAddress", getAccountAddress())
+                .append("price", getPrice())
+                .append("monitorType", getMonitorType())
+                .append("apiKey", getApiKey())
+                .append("isValid", getIsValid())
+                .append("fcd", getFcd())
+                .append("fcu", getFcu())
+                .append("lcd", getLcd())
+                .append("lcu", getLcu())
+                .toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TenantInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TenantInfo.java
new file mode 100644
index 000000000..ce42ed412
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TenantInfo.java
@@ -0,0 +1,239 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 租户对象 tenant_info
+ *
+ * @author dorion
+ * @date 2024-04-14
+ */
+public class TenantInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long idTenantInfo;
+
+    /** 接收能量地址 */
+    @Excel(name = "接收能量地址")
+    private String receiverAddress;
+
+    /** 监控入账地址 */
+    @Excel(name = "监控入账地址")
+    private String monitorAddress;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private Long price;
+
+    /** 笔数 */
+    @Excel(name = "笔数")
+    private Long transferCount;
+
+    /** 交易单位 */
+    @Excel(name = "交易单位")
+    private String exchangeUnit;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String txId;
+
+    /** 交易总额 */
+    @Excel(name = "交易总额")
+    private Long exchangeAmount;
+
+    /** 是否到账 */
+    @Excel(name = "是否到账")
+    private String isPaid;
+
+    /** 租期 */
+    @Excel(name = "租期")
+    private Long period;
+
+    /** 最终到期日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最终到期日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date finishTransferTime;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fcd;
+
+    /** 创建用户 */
+    @Excel(name = "创建用户")
+    private String fcu;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lcd;
+
+    /** 更新用户 */
+    @Excel(name = "更新用户")
+    private String lcu;
+
+    public void setIdTenantInfo(Long idTenantInfo)
+    {
+        this.idTenantInfo = idTenantInfo;
+    }
+
+    public Long getIdTenantInfo()
+    {
+        return idTenantInfo;
+    }
+    public void setReceiverAddress(String receiverAddress)
+    {
+        this.receiverAddress = receiverAddress;
+    }
+
+    public String getReceiverAddress()
+    {
+        return receiverAddress;
+    }
+    public void setMonitorAddress(String monitorAddress)
+    {
+        this.monitorAddress = monitorAddress;
+    }
+
+    public String getMonitorAddress()
+    {
+        return monitorAddress;
+    }
+    public void setPrice(Long price)
+    {
+        this.price = price;
+    }
+
+    public Long getPrice()
+    {
+        return price;
+    }
+    public void setTransferCount(Long transferCount)
+    {
+        this.transferCount = transferCount;
+    }
+
+    public Long getTransferCount()
+    {
+        return transferCount;
+    }
+    public void setExchangeUnit(String exchangeUnit)
+    {
+        this.exchangeUnit = exchangeUnit;
+    }
+
+    public String getExchangeUnit()
+    {
+        return exchangeUnit;
+    }
+    public void setTxId(String txId)
+    {
+        this.txId = txId;
+    }
+
+    public String getTxId()
+    {
+        return txId;
+    }
+    public void setExchangeAmount(Long exchangeAmount)
+    {
+        this.exchangeAmount = exchangeAmount;
+    }
+
+    public Long getExchangeAmount()
+    {
+        return exchangeAmount;
+    }
+    public void setIsPaid(String isPaid)
+    {
+        this.isPaid = isPaid;
+    }
+
+    public String getIsPaid()
+    {
+        return isPaid;
+    }
+    public void setPeriod(Long period)
+    {
+        this.period = period;
+    }
+
+    public Long getPeriod()
+    {
+        return period;
+    }
+    public void setFinishTransferTime(Date finishTransferTime)
+    {
+        this.finishTransferTime = finishTransferTime;
+    }
+
+    public Date getFinishTransferTime()
+    {
+        return finishTransferTime;
+    }
+    public void setFcd(Date fcd)
+    {
+        this.fcd = fcd;
+    }
+
+    public Date getFcd()
+    {
+        return fcd;
+    }
+    public void setFcu(String fcu)
+    {
+        this.fcu = fcu;
+    }
+
+    public String getFcu()
+    {
+        return fcu;
+    }
+    public void setLcd(Date lcd)
+    {
+        this.lcd = lcd;
+    }
+
+    public Date getLcd()
+    {
+        return lcd;
+    }
+    public void setLcu(String lcu)
+    {
+        this.lcu = lcu;
+    }
+
+    public String getLcu()
+    {
+        return lcu;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("idTenantInfo", getIdTenantInfo())
+                .append("receiverAddress", getReceiverAddress())
+                .append("monitorAddress", getMonitorAddress())
+                .append("price", getPrice())
+                .append("transferCount", getTransferCount())
+                .append("exchangeUnit", getExchangeUnit())
+                .append("txId", getTxId())
+                .append("exchangeAmount", getExchangeAmount())
+                .append("isPaid", getIsPaid())
+                .append("period", getPeriod())
+                .append("finishTransferTime", getFinishTransferTime())
+                .append("fcd", getFcd())
+                .append("fcu", getFcu())
+                .append("lcd", getLcd())
+                .append("lcu", getLcu())
+                .toString();
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TrxExchangeInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TrxExchangeInfo.java
new file mode 100644
index 000000000..8e78b92f9
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TrxExchangeInfo.java
@@ -0,0 +1,261 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Sensitive;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.enums.DesensitizedType;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * trx兑能量记录对象 trx_exchange_info
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Builder
+@Data
+public class TrxExchangeInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** trx进账表 */
+    private Long idTrxExchangeInfo;
+
+    /** 转出账户 */
+    @Excel(name = "交易账户")
+    private String fromAddress;
+
+    /** 转入账户 */
+    @Excel(name = "转入账户")
+    @Sensitive(desensitizedType = DesensitizedType.WALLET_ADDRESS)
+    private String toAddress;
+
+    /** 实际出账账户 */
+    @Excel(name = "实际出账账户")
+    @Sensitive(desensitizedType = DesensitizedType.WALLET_ADDRESS)
+    private String accountAddress;
+
+    /** 单位 */
+    @Excel(name = "单价")
+    private Long price;
+
+    /** 订单hash */
+    @Excel(name = "订单")
+    private String trxTxId;
+
+    /** 笔数 */
+    @Excel(name = "笔数")
+    private Long tranferCount;
+
+    /** 业务类型 */
+    @Excel(name = "业务类型")
+    private String busiType;
+
+
+    /** 转入金额 */
+    @Excel(name = "转入金额")
+    private Long trxAmount;
+
+    /** 兑换支出能量 */
+    @Excel(name = "兑换支出能量")
+    private Long delegateAmountTrx;
+
+    /** 能量交易订单hash */
+    @Excel(name = "能量交易订单")
+    private String delegateTxId;
+
+    /** 锁定周期 */
+    @Excel(name = "锁定周期")
+    private Long lockPeriod;
+
+    /** 资源委托状态 */
+    @Excel(name = "资源委托状态")
+    private String delegateStatus;
+
+    /** 回收资源交易id */
+    @Excel(name = "回收资源交易")
+    private String unDelegateTxId;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fcd;
+
+    /** 创建用户 */
+    @Excel(name = "创建用户")
+    private String fcu;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat ="yyyy-MM-dd HH:mm:ss")
+    private Date lcd;
+
+    /** 更新用户 */
+    @Excel(name = "更新用户")
+    private String lcu;
+
+    public void setIdTrxExchangeInfo(Long idTrxExchangeInfo) 
+    {
+        this.idTrxExchangeInfo = idTrxExchangeInfo;
+    }
+
+    public Long getIdTrxExchangeInfo() 
+    {
+        return idTrxExchangeInfo;
+    }
+    public void setFromAddress(String fromAddress) 
+    {
+        this.fromAddress = fromAddress;
+    }
+
+    public String getFromAddress() 
+    {
+        return fromAddress;
+    }
+    public void setToAddress(String toAddress) 
+    {
+        this.toAddress = toAddress;
+    }
+
+    public String getToAddress() 
+    {
+        return toAddress;
+    }
+    public void setAccountAddress(String accountAddress) 
+    {
+        this.accountAddress = accountAddress;
+    }
+
+    public String getAccountAddress() 
+    {
+        return accountAddress;
+    }
+    public void setPrice(Long price) 
+    {
+        this.price = price;
+    }
+
+    public Long getPrice() 
+    {
+        return price;
+    }
+    public void setTrxTxId(String trxTxId) 
+    {
+        this.trxTxId = trxTxId;
+    }
+
+    public String getTrxTxId() 
+    {
+        return trxTxId;
+    }
+    public void setTrxAmount(Long trxAmount) 
+    {
+        this.trxAmount = trxAmount;
+    }
+
+    public Long getTrxAmount() 
+    {
+        return trxAmount;
+    }
+    public void setDelegateAmountTrx(Long delegateAmountTrx) 
+    {
+        this.delegateAmountTrx = delegateAmountTrx;
+    }
+
+    public Long getDelegateAmountTrx() 
+    {
+        return delegateAmountTrx;
+    }
+    public void setDelegateTxId(String delegateTxId) 
+    {
+        this.delegateTxId = delegateTxId;
+    }
+
+    public String getDelegateTxId() 
+    {
+        return delegateTxId;
+    }
+    public void setLockPeriod(Long lockPeriod) 
+    {
+        this.lockPeriod = lockPeriod;
+    }
+
+    public Long getLockPeriod() 
+    {
+        return lockPeriod;
+    }
+    public void setDelegateStatus(String delegateStatus) 
+    {
+        this.delegateStatus = delegateStatus;
+    }
+
+    public String getDelegateStatus() 
+    {
+        return delegateStatus;
+    }
+    public void setUnDelegateTxId(String unDelegateTxId) 
+    {
+        this.unDelegateTxId = unDelegateTxId;
+    }
+
+    public String getUnDelegateTxId() 
+    {
+        return unDelegateTxId;
+    }
+    public void setFcd(Date fcd) 
+    {
+        this.fcd = fcd;
+    }
+
+    public Date getFcd() 
+    {
+        return fcd;
+    }
+    public void setFcu(String fcu) 
+    {
+        this.fcu = fcu;
+    }
+
+    public String getFcu() 
+    {
+        return fcu;
+    }
+    public void setLcd(Date lcd) 
+    {
+        this.lcd = lcd;
+    }
+
+    public Date getLcd() 
+    {
+        return lcd;
+    }
+    public void setLcu(String lcu) 
+    {
+        this.lcu = lcu;
+    }
+
+    public String getLcu() 
+    {
+        return lcu;
+    }
+
+    public Long getTranferCount() {
+        return tranferCount;
+    }
+
+    public void setTranferCount(Long tranferCount) {
+        this.tranferCount = tranferCount;
+    }
+
+    public String getBusiType() {
+        return busiType;
+    }
+
+    public void setBusiType(String busiType) {
+        this.busiType = busiType;
+    }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
index d22bccbd3..d46db7c86 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
@@ -27,6 +27,8 @@ public enum BusinessType
      */
     DELETE,
 
+    ACTIVE_DATA,
+
     /**
      * 授权
      */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java
index 450812293..4986f11c0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java
@@ -1,8 +1,9 @@
 package com.ruoyi.common.enums;
 
-import java.util.function.Function;
 import com.ruoyi.common.utils.DesensitizedUtil;
 
+import java.util.function.Function;
+
 /**
  * 脱敏类型
  *
@@ -43,7 +44,9 @@ public enum DesensitizedType
     /**
      * 车牌号码，包含普通车辆、新能源车辆
      */
-    CAR_LICENSE(DesensitizedUtil::carLicense);
+    CAR_LICENSE(DesensitizedUtil::carLicense),
+
+    WALLET_ADDRESS(s -> s.replaceAll("(.{6})(.*)(.{8})", "$1********$3"));
 
     private final Function<String, String> desensitizer;
 
@@ -56,4 +59,5 @@ public enum DesensitizedType
     {
         return desensitizer;
     }
+
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/encrpt/Base64.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/encrpt/Base64.java
new file mode 100644
index 000000000..a1bd41452
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/encrpt/Base64.java
@@ -0,0 +1,748 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.ruoyi.common.utils.encrpt;
+
+import org.apache.commons.codec.binary.Base64OutputStream;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Utilities for encoding and decoding the Base64 representation of
+ * binary data.  See RFCs <a
+ * href="http://www.ietf.org/rfc/rfc2045.txt">2045</a> and <a
+ * href="http://www.ietf.org/rfc/rfc3548.txt">3548</a>.
+ */
+public class Base64 {
+    /**
+     * Default values for encoder/decoder flags.
+     */
+    public static final int DEFAULT = 0;
+
+    /**
+     * Encoder flag bit to omit the padding '=' characters at the end
+     * of the output (if any).
+     */
+    public static final int NO_PADDING = 1;
+
+    /**
+     * Encoder flag bit to omit all line terminators (i.e., the output
+     * will be on one long line).
+     */
+    public static final int NO_WRAP = 2;
+
+    /**
+     * Encoder flag bit to indicate lines should be terminated with a
+     * CRLF pair instead of just an LF.  Has no effect if {@code
+     * NO_WRAP} is specified as well.
+     */
+    public static final int CRLF = 4;
+
+    /**
+     * Encoder/decoder flag bit to indicate using the "URL and
+     * filename safe" variant of Base64 (see RFC 3548 section 4) where
+     * {@code -} and {@code _} are used in place of {@code +} and
+     * {@code /}.
+     */
+    public static final int URL_SAFE = 8;
+
+    /**
+     * Flag to pass to {@link Base64OutputStream} to indicate that it
+     * should not close the output stream it is wrapping when it
+     * itself is closed.
+     */
+    public static final int NO_CLOSE = 16;
+
+    //  --------------------------------------------------------
+    //  shared code
+    //  --------------------------------------------------------
+
+    /* package */ static abstract class Coder {
+        public byte[] output;
+        public int op;
+
+        /**
+         * Encode/decode another block of input data.  this.output is
+         * provided by the caller, and must be big enough to hold all
+         * the coded data.  On exit, this.opwill be set to the length
+         * of the coded data.
+         *
+         * @param finish true if this is the final call to process for
+         *               this object.  Will finalize the coder state and
+         *               include any final bytes in the output.
+         * @return true if the input so far is good; false if some
+         * error has been detected in the input stream..
+         */
+        public abstract boolean process(byte[] input, int offset, int len, boolean finish);
+
+        /**
+         * @return the maximum number of bytes a call to process()
+         * could produce for the given number of input bytes.  This may
+         * be an overestimate.
+         */
+        public abstract int maxOutputSize(int len);
+    }
+
+    //  --------------------------------------------------------
+    //  decoding
+    //  --------------------------------------------------------
+
+    /**
+     * Decode the Base64-encoded data in input and return the data in
+     * a new byte array.
+     *
+     * <p>The padding '=' characters at the end are considered optional, but
+     * if any are present, there must be the correct number of them.
+     *
+     * @param str   the input String to decode, which is converted to
+     *              bytes using the default charset
+     * @param flags controls certain features of the decoded output.
+     *              Pass {@code DEFAULT} to decode standard Base64.
+     * @throws IllegalArgumentException if the input contains
+     *                                  incorrect padding
+     */
+    public static byte[] decode(String str, int flags) {
+        return decode(str.getBytes(), flags);
+    }
+
+    /**
+     * Decode the Base64-encoded data in input and return the data in
+     * a new byte array.
+     *
+     * <p>The padding '=' characters at the end are considered optional, but
+     * if any are present, there must be the correct number of them.
+     *
+     * @param input the input array to decode
+     * @param flags controls certain features of the decoded output.
+     *              Pass {@code DEFAULT} to decode standard Base64.
+     * @throws IllegalArgumentException if the input contains
+     *                                  incorrect padding
+     */
+    public static byte[] decode(byte[] input, int flags) {
+        return decode(input, 0, input.length, flags);
+    }
+
+    /**
+     * Decode the Base64-encoded data in input and return the data in
+     * a new byte array.
+     *
+     * <p>The padding '=' characters at the end are considered optional, but
+     * if any are present, there must be the correct number of them.
+     *
+     * @param input  the data to decode
+     * @param offset the position within the input array at which to start
+     * @param len    the number of bytes of input to decode
+     * @param flags  controls certain features of the decoded output.
+     *               Pass {@code DEFAULT} to decode standard Base64.
+     * @throws IllegalArgumentException if the input contains
+     *                                  incorrect padding
+     */
+    public static byte[] decode(byte[] input, int offset, int len, int flags) {
+        // Allocate space for the most data the input could represent.
+        // (It could contain less if it contains whitespace, etc.)
+        Decoder decoder = new Decoder(flags, new byte[len * 3 / 4]);
+
+        if (!decoder.process(input, offset, len, true)) {
+            throw new IllegalArgumentException("bad base-64");
+        }
+
+        // Maybe we got lucky and allocated exactly enough output space.
+        if (decoder.op == decoder.output.length) {
+            return decoder.output;
+        }
+
+        // Need to shorten the array, so allocate a new one of the
+        // right size and copy.
+        byte[] temp = new byte[decoder.op];
+        System.arraycopy(decoder.output, 0, temp, 0, decoder.op);
+        return temp;
+    }
+
+    /* package */ static class Decoder extends Coder {
+        /**
+         * Lookup table for turning bytes into their position in the
+         * Base64 alphabet.
+         */
+        private static final int DECODE[] = {
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+                52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -2, -1, -1,
+                -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+                15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+                -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+                41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        };
+
+        /**
+         * Decode lookup table for the "web safe" variant (RFC 3548
+         * sec. 4) where - and _ replace + and /.
+         */
+        private static final int DECODE_WEBSAFE[] = {
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1,
+                52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -2, -1, -1,
+                -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+                15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, 63,
+                -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+                41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        };
+
+        /**
+         * Non-data values in the DECODE arrays.
+         */
+        private static final int SKIP = -1;
+        private static final int EQUALS = -2;
+
+        /**
+         * States 0-3 are reading through the next input tuple.
+         * State 4 is having read one '=' and expecting exactly
+         * one more.
+         * State 5 is expecting no more data or padding characters
+         * in the input.
+         * State 6 is the error state; an error has been detected
+         * in the input and no future input can "fix" it.
+         */
+        private int state;   // state number (0 to 6)
+        private int value;
+
+        final private int[] alphabet;
+
+        public Decoder(int flags, byte[] output) {
+            this.output = output;
+
+            alphabet = ((flags & URL_SAFE) == 0) ? DECODE : DECODE_WEBSAFE;
+            state = 0;
+            value = 0;
+        }
+
+        /**
+         * @return an overestimate for the number of bytes {@code
+         * len} bytes could decode to.
+         */
+        public int maxOutputSize(int len) {
+            return len * 3 / 4 + 10;
+        }
+
+        /**
+         * Decode another block of input data.
+         *
+         * @return true if the state machine is still healthy.  false if
+         * bad base-64 data has been detected in the input stream.
+         */
+        public boolean process(byte[] input, int offset, int len, boolean finish) {
+            if (this.state == 6) return false;
+
+            int p = offset;
+            len += offset;
+
+            // Using local variables makes the decoder about 12%
+            // faster than if we manipulate the member variables in
+            // the loop.  (Even alphabet makes a measurable
+            // difference, which is somewhat surprising to me since
+            // the member variable is final.)
+            int state = this.state;
+            int value = this.value;
+            int op = 0;
+            final byte[] output = this.output;
+            final int[] alphabet = this.alphabet;
+
+            while (p < len) {
+                // Try the fast path:  we're starting a new tuple and the
+                // next four bytes of the input stream are all data
+                // bytes.  This corresponds to going through states
+                // 0-1-2-3-0.  We expect to use this method for most of
+                // the data.
+                //
+                // If any of the next four bytes of input are non-data
+                // (whitespace, etc.), value will end up negative.  (All
+                // the non-data values in decode are small negative
+                // numbers, so shifting any of them up and or'ing them
+                // together will result in a value with its top bit set.)
+                //
+                // You can remove this whole block and the output should
+                // be the same, just slower.
+                if (state == 0) {
+                    while (p + 4 <= len &&
+                            (value = ((alphabet[input[p] & 0xff] << 18) |
+                                    (alphabet[input[p + 1] & 0xff] << 12) |
+                                    (alphabet[input[p + 2] & 0xff] << 6) |
+                                    (alphabet[input[p + 3] & 0xff]))) >= 0) {
+                        output[op + 2] = (byte) value;
+                        output[op + 1] = (byte) (value >> 8);
+                        output[op] = (byte) (value >> 16);
+                        op += 3;
+                        p += 4;
+                    }
+                    if (p >= len) break;
+                }
+
+                // The fast path isn't available -- either we've read a
+                // partial tuple, or the next four input bytes aren't all
+                // data, or whatever.  Fall back to the slower state
+                // machine implementation.
+
+                int d = alphabet[input[p++] & 0xff];
+
+                switch (state) {
+                    case 0:
+                        if (d >= 0) {
+                            value = d;
+                            ++state;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 1:
+                        if (d >= 0) {
+                            value = (value << 6) | d;
+                            ++state;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 2:
+                        if (d >= 0) {
+                            value = (value << 6) | d;
+                            ++state;
+                        } else if (d == EQUALS) {
+                            // Emit the last (partial) output tuple;
+                            // expect exactly one more padding character.
+                            output[op++] = (byte) (value >> 4);
+                            state = 4;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 3:
+                        if (d >= 0) {
+                            // Emit the output triple and return to state 0.
+                            value = (value << 6) | d;
+                            output[op + 2] = (byte) value;
+                            output[op + 1] = (byte) (value >> 8);
+                            output[op] = (byte) (value >> 16);
+                            op += 3;
+                            state = 0;
+                        } else if (d == EQUALS) {
+                            // Emit the last (partial) output tuple;
+                            // expect no further data or padding characters.
+                            output[op + 1] = (byte) (value >> 2);
+                            output[op] = (byte) (value >> 10);
+                            op += 2;
+                            state = 5;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 4:
+                        if (d == EQUALS) {
+                            ++state;
+                        } else if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+
+                    case 5:
+                        if (d != SKIP) {
+                            this.state = 6;
+                            return false;
+                        }
+                        break;
+                }
+            }
+
+            if (!finish) {
+                // We're out of input, but a future call could provide
+                // more.
+                this.state = state;
+                this.value = value;
+                this.op = op;
+                return true;
+            }
+
+            // Done reading input.  Now figure out where we are left in
+            // the state machine and finish up.
+
+            switch (state) {
+                case 0:
+                    // Output length is a multiple of three.  Fine.
+                    break;
+                case 1:
+                    // Read one extra input byte, which isn't enough to
+                    // make another output byte.  Illegal.
+                    this.state = 6;
+                    return false;
+                case 2:
+                    // Read two extra input bytes, enough to emit 1 more
+                    // output byte.  Fine.
+                    output[op++] = (byte) (value >> 4);
+                    break;
+                case 3:
+                    // Read three extra input bytes, enough to emit 2 more
+                    // output bytes.  Fine.
+                    output[op++] = (byte) (value >> 10);
+                    output[op++] = (byte) (value >> 2);
+                    break;
+                case 4:
+                    // Read one padding '=' when we expected 2.  Illegal.
+                    this.state = 6;
+                    return false;
+                case 5:
+                    // Read all the padding '='s we expected and no more.
+                    // Fine.
+                    break;
+            }
+
+            this.state = state;
+            this.op = op;
+            return true;
+        }
+    }
+
+    //  --------------------------------------------------------
+    //  encoding
+    //  --------------------------------------------------------
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * String with the result.
+     *
+     * @param input the data to encode
+     * @param flags controls certain features of the encoded output.
+     *              Passing {@code DEFAULT} results in output that
+     *              adheres to RFC 2045.
+     */
+    public static String encodeToString(byte[] input, int flags) {
+        try {
+            return new String(encode(input, flags), "US-ASCII");
+        } catch (UnsupportedEncodingException e) {
+            // US-ASCII is guaranteed to be available.
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * String with the result.
+     *
+     * @param input  the data to encode
+     * @param offset the position within the input array at which to
+     *               start
+     * @param len    the number of bytes of input to encode
+     * @param flags  controls certain features of the encoded output.
+     *               Passing {@code DEFAULT} results in output that
+     *               adheres to RFC 2045.
+     */
+    public static String encodeToString(byte[] input, int offset, int len, int flags) {
+        try {
+            return new String(encode(input, offset, len, flags), "US-ASCII");
+        } catch (UnsupportedEncodingException e) {
+            // US-ASCII is guaranteed to be available.
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * byte[] with the result.
+     *
+     * @param input the data to encode
+     * @param flags controls certain features of the encoded output.
+     *              Passing {@code DEFAULT} results in output that
+     *              adheres to RFC 2045.
+     */
+    public static byte[] encode(byte[] input, int flags) {
+        return encode(input, 0, input.length, flags);
+    }
+
+    /**
+     * Base64-encode the given data and return a newly allocated
+     * byte[] with the result.
+     *
+     * @param input  the data to encode
+     * @param offset the position within the input array at which to
+     *               start
+     * @param len    the number of bytes of input to encode
+     * @param flags  controls certain features of the encoded output.
+     *               Passing {@code DEFAULT} results in output that
+     *               adheres to RFC 2045.
+     */
+    public static byte[] encode(byte[] input, int offset, int len, int flags) {
+        Encoder encoder = new Encoder(flags, null);
+
+        // Compute the exact length of the array we will produce.
+        int output_len = len / 3 * 4;
+
+        // Account for the tail of the data and the padding bytes, if any.
+        if (encoder.do_padding) {
+            if (len % 3 > 0) {
+                output_len += 4;
+            }
+        } else {
+            switch (len % 3) {
+                case 0:
+                    break;
+                case 1:
+                    output_len += 2;
+                    break;
+                case 2:
+                    output_len += 3;
+                    break;
+            }
+        }
+
+        // Account for the newlines, if any.
+        if (encoder.do_newline && len > 0) {
+            output_len += (((len - 1) / (3 * Encoder.LINE_GROUPS)) + 1) *
+                    (encoder.do_cr ? 2 : 1);
+        }
+
+        encoder.output = new byte[output_len];
+        encoder.process(input, offset, len, true);
+
+        assert encoder.op == output_len;
+
+        return encoder.output;
+    }
+
+    /* package */ static class Encoder extends Coder {
+        /**
+         * Emit a new line every this many output tuples.  Corresponds to
+         * a 76-character line length (the maximum allowable according to
+         * <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>).
+         */
+        public static final int LINE_GROUPS = 19;
+
+        /**
+         * Lookup table for turning Base64 alphabet positions (6 bits)
+         * into output bytes.
+         */
+        private static final byte ENCODE[] = {
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+                'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+                'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+                'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/',
+        };
+
+        /**
+         * Lookup table for turning Base64 alphabet positions (6 bits)
+         * into output bytes.
+         */
+        private static final byte ENCODE_WEBSAFE[] = {
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+                'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+                'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+                'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_',
+        };
+
+        final private byte[] tail;
+        /* package */ int tailLen;
+        private int count;
+
+        final public boolean do_padding;
+        final public boolean do_newline;
+        final public boolean do_cr;
+        final private byte[] alphabet;
+
+        public Encoder(int flags, byte[] output) {
+            this.output = output;
+
+            do_padding = (flags & NO_PADDING) == 0;
+            do_newline = (flags & NO_WRAP) == 0;
+            do_cr = (flags & CRLF) != 0;
+            alphabet = ((flags & URL_SAFE) == 0) ? ENCODE : ENCODE_WEBSAFE;
+
+            tail = new byte[2];
+            tailLen = 0;
+
+            count = do_newline ? LINE_GROUPS : -1;
+        }
+
+        /**
+         * @return an overestimate for the number of bytes {@code
+         * len} bytes could encode to.
+         */
+        public int maxOutputSize(int len) {
+            return len * 8 / 5 + 10;
+        }
+
+        public boolean process(byte[] input, int offset, int len, boolean finish) {
+            // Using local variables makes the encoder about 9% faster.
+            final byte[] alphabet = this.alphabet;
+            final byte[] output = this.output;
+            int op = 0;
+            int count = this.count;
+
+            int p = offset;
+            len += offset;
+            int v = -1;
+
+            // First we need to concatenate the tail of the previous call
+            // with any input bytes available now and see if we can empty
+            // the tail.
+
+            switch (tailLen) {
+                case 0:
+                    // There was no tail.
+                    break;
+
+                case 1:
+                    if (p + 2 <= len) {
+                        // A 1-byte tail with at least 2 bytes of
+                        // input available now.
+                        v = ((tail[0] & 0xff) << 16) |
+                                ((input[p++] & 0xff) << 8) |
+                                (input[p++] & 0xff);
+                        tailLen = 0;
+                    }
+                    ;
+                    break;
+
+                case 2:
+                    if (p + 1 <= len) {
+                        // A 2-byte tail with at least 1 byte of input.
+                        v = ((tail[0] & 0xff) << 16) |
+                                ((tail[1] & 0xff) << 8) |
+                                (input[p++] & 0xff);
+                        tailLen = 0;
+                    }
+                    break;
+            }
+
+            if (v != -1) {
+                output[op++] = alphabet[(v >> 18) & 0x3f];
+                output[op++] = alphabet[(v >> 12) & 0x3f];
+                output[op++] = alphabet[(v >> 6) & 0x3f];
+                output[op++] = alphabet[v & 0x3f];
+                if (--count == 0) {
+                    if (do_cr) output[op++] = '\r';
+                    output[op++] = '\n';
+                    count = LINE_GROUPS;
+                }
+            }
+
+            // At this point either there is no tail, or there are fewer
+            // than 3 bytes of input available.
+
+            // The main loop, turning 3 input bytes into 4 output bytes on
+            // each iteration.
+            while (p + 3 <= len) {
+                v = ((input[p] & 0xff) << 16) |
+                        ((input[p + 1] & 0xff) << 8) |
+                        (input[p + 2] & 0xff);
+                output[op] = alphabet[(v >> 18) & 0x3f];
+                output[op + 1] = alphabet[(v >> 12) & 0x3f];
+                output[op + 2] = alphabet[(v >> 6) & 0x3f];
+                output[op + 3] = alphabet[v & 0x3f];
+                p += 3;
+                op += 4;
+                if (--count == 0) {
+                    if (do_cr) output[op++] = '\r';
+                    output[op++] = '\n';
+                    count = LINE_GROUPS;
+                }
+            }
+
+            if (finish) {
+                // Finish up the tail of the input.  Note that we need to
+                // consume any bytes in tail before any bytes
+                // remaining in input; there should be at most two bytes
+                // total.
+
+                if (p - tailLen == len - 1) {
+                    int t = 0;
+                    v = ((tailLen > 0 ? tail[t++] : input[p++]) & 0xff) << 4;
+                    tailLen -= t;
+                    output[op++] = alphabet[(v >> 6) & 0x3f];
+                    output[op++] = alphabet[v & 0x3f];
+                    if (do_padding) {
+                        output[op++] = '=';
+                        output[op++] = '=';
+                    }
+                    if (do_newline) {
+                        if (do_cr) output[op++] = '\r';
+                        output[op++] = '\n';
+                    }
+                } else if (p - tailLen == len - 2) {
+                    int t = 0;
+                    v = (((tailLen > 1 ? tail[t++] : input[p++]) & 0xff) << 10) |
+                            (((tailLen > 0 ? tail[t++] : input[p++]) & 0xff) << 2);
+                    tailLen -= t;
+                    output[op++] = alphabet[(v >> 12) & 0x3f];
+                    output[op++] = alphabet[(v >> 6) & 0x3f];
+                    output[op++] = alphabet[v & 0x3f];
+                    if (do_padding) {
+                        output[op++] = '=';
+                    }
+                    if (do_newline) {
+                        if (do_cr) output[op++] = '\r';
+                        output[op++] = '\n';
+                    }
+                } else if (do_newline && op > 0 && count != LINE_GROUPS) {
+                    if (do_cr) output[op++] = '\r';
+                    output[op++] = '\n';
+                }
+
+                assert tailLen == 0;
+                assert p == len;
+            } else {
+                // Save the leftovers in tail to be consumed on the next
+                // call to encodeInternal.
+
+                if (p == len - 1) {
+                    tail[tailLen++] = input[p];
+                } else if (p == len - 2) {
+                    tail[tailLen++] = input[p];
+                    tail[tailLen++] = input[p + 1];
+                }
+            }
+
+            this.op = op;
+            this.count = count;
+
+            return true;
+        }
+    }
+
+    private Base64() {
+    }   // don't instantiate
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/encrpt/Dt.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/encrpt/Dt.java
new file mode 100644
index 000000000..404aeea6c
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/encrpt/Dt.java
@@ -0,0 +1,154 @@
+package com.ruoyi.common.utils.encrpt;
+
+
+import org.springframework.util.StringUtils;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESKeySpec;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+
+public class Dt {
+
+    public static final String KEY = "com.awm.six";
+    private static final String DES = "DES";
+
+    /**
+     * Description 根据键值进行加密
+     *
+     * @param data
+     * @param key  加密键byte数组
+     * @return
+     * @throws Exception
+     */
+    public static String encrypt(String data, String key) throws Exception {
+        byte[] bt = encrypt(data.getBytes("UTF-8"), key.getBytes());
+        String strs = Base64.encodeToString(bt, Base64.DEFAULT);
+        return strs;
+    }
+
+    /**
+     * Description 根据键值进行解密
+     *
+     * @param data
+     * @param key  加密键byte数组
+     * @return
+     * @throws IOException
+     * @throws Exception
+     */
+    public static String decrypt(String data, String key) throws Exception {
+        if (data == null) {
+            return null;
+        }
+
+        byte[] buf = Base64.decode(data.getBytes(), Base64.DEFAULT);
+        byte[] bt = decrypt(buf, key.getBytes());
+        return new String(bt, "UTF-8");
+    }
+
+    /**
+     * Description 根据键值进行加密
+     *
+     * @param data
+     * @param key  加密键byte数组
+     * @return
+     * @throws Exception
+     */
+    private static byte[] encrypt(byte[] data, byte[] key) throws Exception {
+        // 生成一个可信任的随机数源
+        SecureRandom sr = new SecureRandom();
+
+        // 从原始密钥数据创建DESKeySpec对象
+        DESKeySpec dks = new DESKeySpec(key);
+
+        // 创建一个密钥工厂，然后用它把DESKeySpec转换成SecretKey对象
+        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES);
+        SecretKey securekey = keyFactory.generateSecret(dks);
+
+        // Cipher对象实际完成加密操作
+        Cipher cipher = Cipher.getInstance(DES);
+
+        // 用密钥初始化Cipher对象
+        cipher.init(Cipher.ENCRYPT_MODE, securekey, sr);
+
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * Description 根据键值进行解密
+     *
+     * @param data
+     * @param key  加密键byte数组
+     * @return
+     * @throws Exception
+     */
+    private static byte[] decrypt(byte[] data, byte[] key) throws Exception {
+        // 生成一个可信任的随机数源
+        SecureRandom sr = new SecureRandom();
+
+        // 从原始密钥数据创建DESKeySpec对象
+        DESKeySpec dks = new DESKeySpec(key);
+
+        // 创建一个密钥工厂，然后用它把DESKeySpec转换成SecretKey对象
+        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES);
+        SecretKey securekey = keyFactory.generateSecret(dks);
+
+        // Cipher对象实际完成解密操作
+        Cipher cipher = Cipher.getInstance(DES);
+
+        // 用密钥初始化Cipher对象
+        cipher.init(Cipher.DECRYPT_MODE, securekey, sr);
+
+        return cipher.doFinal(data);
+    }
+
+    public static String md5(String string) {
+        if (StringUtils.isEmpty(string)) {
+            return "";
+        }
+        MessageDigest md5 = null;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+            byte[] bytes = md5.digest(string.getBytes());
+            String result = toHexString(bytes, "");
+            return result;
+        } catch (NoSuchAlgorithmException e) {
+        }
+        return "";
+    }
+
+
+    public static String toHexString(byte[] bytes, String separator) {
+        StringBuilder hexString = new StringBuilder();
+        byte[] arrayOfByte = bytes;
+        int j = bytes.length;
+        for (int i = 0; i < j; i++) {
+            byte b = arrayOfByte[i];
+            int byteValue = 0xFF & b;
+            if (byteValue < 16) {
+                hexString.append("0");
+            }
+            hexString.append(Integer.toHexString(0xFF & b)).append(separator);
+        }
+        return hexString.toString();
+    }
+
+    public static void main(String[] args) throws Exception {
+        String data = "abc";
+        String encryptData = encrypt(data, KEY);
+
+        System.out.println(encryptData);
+
+        String decrypt1 = decrypt(encryptData, KEY);
+        System.out.println(decrypt1);
+
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/RestTemplateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/RestTemplateUtils.java
new file mode 100644
index 000000000..413ecaf58
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/RestTemplateUtils.java
@@ -0,0 +1,628 @@
+package com.ruoyi.common.utils.http;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.*;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Arrays;
+import java.util.Map;
+
+public class RestTemplateUtils {
+    private static final RestTemplate restTemplate = new RestTemplate();
+    private static HttpHeaders headers = new HttpHeaders();
+
+    static {
+
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON_UTF8));
+        headers.add("user-agent","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36");
+    }
+// ----------------------------------GET-------------------------------------------------------
+
+    /**
+     * GET请求调用方式
+     *
+     * @param url          请求URL
+     * @param responseType 返回对象类型
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> get(String url, Class<T> responseType) {
+        return restTemplate.getForEntity(url, responseType);
+    }
+
+    /**
+     * GET请求调用方式
+     *
+     * @param url          请求URL
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> get(String url, Class<T> responseType, Object... uriVariables) {
+        return restTemplate.getForEntity(url, responseType, uriVariables);
+    }
+
+    /**
+     * GET请求调用方式
+     *
+     * @param url          请求URL
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> get(String url, Class<T> responseType, Map<String, ?> uriVariables) {
+        return restTemplate.getForEntity(url, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的GET请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> get(String url, Map<String, String> headers, Class<T> responseType, Object... uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return get(url, httpHeaders, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的GET请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> get(String url, HttpHeaders headers, Class<T> responseType, Object... uriVariables) {
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        return exchange(url, HttpMethod.GET, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的GET请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> get(String url, Map<String, String> headers, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return get(url, httpHeaders, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的GET请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> get(String url, HttpHeaders headers, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        return exchange(url, HttpMethod.GET, requestEntity, responseType, uriVariables);
+    }
+
+    private static Logger logger = LoggerFactory.getLogger(RestTemplateUtils.class);
+
+
+
+// ----------------------------------POST-------------------------------------------------------
+
+    /**
+     * POST请求调用方式
+     *
+     * @param url          请求URL
+     * @param responseType 返回对象类型
+     * @return
+     */
+    public static <T> ResponseEntity<T> post(String url, Class<T> responseType) {
+        return restTemplate.postForEntity(url, HttpEntity.EMPTY, responseType);
+    }
+
+    /**
+     * POST请求调用方式
+     *
+     * @param url          请求URL
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, Object requestBody, Class<T> responseType) {
+        return restTemplate.postForEntity(url, requestBody, responseType);
+    }
+
+    /**
+     * POST请求调用方式
+     *
+     * @param url          请求URL
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        return restTemplate.postForEntity(url, requestBody, responseType, uriVariables);
+    }
+
+    /**
+     * POST请求调用方式
+     *
+     * @param url          请求URL
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        return restTemplate.postForEntity(url, requestBody, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的POST请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, Map<String, String> headers, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return post(url, httpHeaders, requestBody, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的POST请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, HttpHeaders headers, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return post(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的POST请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, Map<String, String> headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return post(url, httpHeaders, requestBody, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的POST请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, HttpHeaders headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return post(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 自定义请求头和请求体的POST请求调用方式
+     *
+     * @param url           请求URL
+     * @param requestEntity 请求头和请求体封装对象
+     * @param responseType  返回对象类型
+     * @param uriVariables  URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables) {
+        return restTemplate.exchange(url, HttpMethod.POST, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 自定义请求头和请求体的POST请求调用方式
+     *
+     * @param url           请求URL
+     * @param requestEntity 请求头和请求体封装对象
+     * @param responseType  返回对象类型
+     * @param uriVariables  URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(String url, HttpEntity<?> requestEntity, Class<T> responseType, Map<String, ?> uriVariables) {
+        return restTemplate.exchange(url, HttpMethod.POST, requestEntity, responseType, uriVariables);
+    }
+
+// ----------------------------------PUT-------------------------------------------------------
+
+    /**
+     * PUT请求调用方式
+     *
+     * @param url          请求URL
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, Class<T> responseType, Object... uriVariables) {
+        return put(url, HttpEntity.EMPTY, responseType, uriVariables);
+    }
+
+    /**
+     * PUT请求调用方式
+     *
+     * @param url          请求URL
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody);
+        return put(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * PUT请求调用方式
+     *
+     * @param url          请求URL
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody);
+        return put(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的PUT请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, Map<String, String> headers, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return put(url, httpHeaders, requestBody, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的PUT请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, HttpHeaders headers, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return put(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的PUT请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, Map<String, String> headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return put(url, httpHeaders, requestBody, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的PUT请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, HttpHeaders headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return put(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 自定义请求头和请求体的PUT请求调用方式
+     *
+     * @param url           请求URL
+     * @param requestEntity 请求头和请求体封装对象
+     * @param responseType  返回对象类型
+     * @param uriVariables  URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables) {
+        return restTemplate.exchange(url, HttpMethod.PUT, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 自定义请求头和请求体的PUT请求调用方式
+     *
+     * @param url           请求URL
+     * @param requestEntity 请求头和请求体封装对象
+     * @param responseType  返回对象类型
+     * @param uriVariables  URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(String url, HttpEntity<?> requestEntity, Class<T> responseType, Map<String, ?> uriVariables) {
+        return restTemplate.exchange(url, HttpMethod.PUT, requestEntity, responseType, uriVariables);
+    }
+
+// ----------------------------------DELETE-------------------------------------------------------
+
+    /**
+     * DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, Class<T> responseType, Object... uriVariables) {
+        return delete(url, HttpEntity.EMPTY, responseType, uriVariables);
+    }
+
+    /**
+     * DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, Class<T> responseType, Map<String, ?> uriVariables) {
+        return delete(url, HttpEntity.EMPTY, responseType, uriVariables);
+    }
+
+    /**
+     * DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody);
+        return delete(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody);
+        return delete(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, Map<String, String> headers, Class<T> responseType, Object... uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return delete(url, httpHeaders, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, HttpHeaders headers, Class<T> responseType, Object... uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(headers);
+        return delete(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, Map<String, String> headers, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return delete(url, httpHeaders, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, HttpHeaders headers, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(headers);
+        return delete(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, Map<String, String> headers, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return delete(url, httpHeaders, requestBody, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, HttpHeaders headers, Object requestBody, Class<T> responseType, Object... uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return delete(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, Map<String, String> headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return delete(url, httpHeaders, requestBody, responseType, uriVariables);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param url          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, HttpHeaders headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return delete(url, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 自定义请求头和请求体的DELETE请求调用方式
+     *
+     * @param url           请求URL
+     * @param requestEntity 请求头和请求体封装对象
+     * @param responseType  返回对象类型
+     * @param uriVariables  URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables) {
+        return restTemplate.exchange(url, HttpMethod.DELETE, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 自定义请求头和请求体的DELETE请求调用方式
+     *
+     * @param url           请求URL
+     * @param requestEntity 请求头和请求体封装对象
+     * @param responseType  返回对象类型
+     * @param uriVariables  URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(String url, HttpEntity<?> requestEntity, Class<T> responseType, Map<String, ?> uriVariables) {
+        return restTemplate.exchange(url, HttpMethod.DELETE, requestEntity, responseType, uriVariables);
+    }
+
+// ----------------------------------通用方法-------------------------------------------------------
+
+    /**
+     * 通用调用方式
+     *
+     * @param url           请求URL
+     * @param method        请求方法类型
+     * @param requestEntity 请求头和请求体封装对象
+     * @param responseType  返回对象类型
+     * @param uriVariables  URL中的变量，按顺序依次对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables) {
+        return restTemplate.exchange(url, method, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 通用调用方式
+     *
+     * @param url           请求URL
+     * @param method        请求方法类型
+     * @param requestEntity 请求头和请求体封装对象
+     * @param responseType  返回对象类型
+     * @param uriVariables  URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requestEntity, Class<T> responseType, Map<String, ?> uriVariables) {
+        return restTemplate.exchange(url, method, requestEntity, responseType, uriVariables);
+    }
+
+    /**
+     * 获取RestTemplate实例对象，可自由调用其方法
+     *
+     * @return RestTemplate实例对象
+     */
+    public static RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java
index 40939e91c..b1217767a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java
@@ -1,13 +1,14 @@
 package com.ruoyi.framework.shiro.web.filter.captcha;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.shiro.web.filter.AccessControlFilter;
 import com.google.code.kaptcha.Constants;
 import com.ruoyi.common.constant.ShiroConstants;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
+import org.apache.shiro.web.filter.AccessControlFilter;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 验证码过滤器
@@ -19,7 +20,8 @@ public class CaptchaValidateFilter extends AccessControlFilter
     /**
      * 是否开启验证码
      */
-    private boolean captchaEnabled = true;
+    private boolean captchaEnabled = true
+            ;
 
     /**
      * 验证码类型
diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml
index 29b3dd2b5..2ba36dabd 100644
--- a/ruoyi-generator/src/main/resources/generator.yml
+++ b/ruoyi-generator/src/main/resources/generator.yml
@@ -2,7 +2,7 @@
 # 代码生成
 gen:
   # 作者
-  author: ruoyi
+  author: dorion
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
   packageName: com.ruoyi.system
   # 自动去除表前缀，默认是false
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 9f370748c..986e38d55 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -35,6 +35,19 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MonitorTrxTransferTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MonitorTrxTransferTask.java
new file mode 100644
index 000000000..a733f154b
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MonitorTrxTransferTask.java
@@ -0,0 +1,65 @@
+package com.ruoyi.quartz.task;
+
+
+import com.ruoyi.common.core.domain.entity.AccountAddressInfo;
+import com.ruoyi.common.core.domain.entity.MonitorAddressInfo;
+import com.ruoyi.system.domain.MonitorAddressAccount;
+import com.ruoyi.system.service.IAccountAddressInfoService;
+import com.ruoyi.system.service.IMonitorAddressInfoService;
+import com.ruoyi.system.service.ITrxExchangeInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component("monitorTrxTransferTask")
+@Slf4j
+public class MonitorTrxTransferTask {
+
+     @Autowired
+    private IMonitorAddressInfoService iMonitorAddressInfoService;
+    @Autowired
+    private ITrxExchangeInfoService trxExchangeInfoService;
+    @Autowired
+    private IAccountAddressInfoService accountAddressInfoService;
+
+    public void doMonitorTrxTransfer() {
+        //获取需要监听的地址列表
+       /* MonitorAddressAccount monitorAddressAccountExample = MonitorAddressAccount.builder()
+                .isValid("Y")
+                .monitorType("TRX")
+                .build();
+        List<MonitorAddressAccount> monitorAddressAccountList = iMonitorAddressInfoService.selectAllMonitorAddressAccount(monitorAddressAccountExample);*/
+        List<MonitorAddressInfo> monitorAddressInfoList = iMonitorAddressInfoService.selectAllValidMonitorAddressAccount();
+        List<MonitorAddressAccount> monitorAddressAccountList = new ArrayList<>();
+
+        for (MonitorAddressInfo monitorAddressInfo : monitorAddressInfoList) {
+            AccountAddressInfo accountAddressInfoExample = new AccountAddressInfo();
+            String accountAddress = monitorAddressInfo.getAccountAddress();
+            accountAddressInfoExample.setAddress(accountAddress);
+            List<AccountAddressInfo> accountAddressInfoList = accountAddressInfoService.selectAccountAddressInfoList(accountAddressInfoExample);
+            AccountAddressInfo accountAddressInfo = accountAddressInfoList.get(0);
+
+            MonitorAddressAccount monitorAddressAccount = MonitorAddressAccount.builder()
+                    .monitorAddress(monitorAddressInfo.getMonitorAddress())
+                    .accountAddress(accountAddress)
+                    .price(monitorAddressInfo.getPrice().intValue())
+                    .monitorType(monitorAddressInfo.getMonitorType())
+                    .apiKey(monitorAddressInfo.getApiKey())
+                    .encryptPrivateKey(accountAddressInfo.getEncryptPrivateKey())
+                    .encryptKey(accountAddressInfo.getEncryptKey())
+                    .build();
+            monitorAddressAccountList.add(monitorAddressAccount);
+        }
+
+
+        for (MonitorAddressAccount monitorAddressAccount : monitorAddressAccountList) {
+            trxExchangeInfoService.doMonitorTrxTransferByMonitorAddressInfo(monitorAddressAccount);
+        }
+
+    }
+
+
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MonitorUsdtTransferTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MonitorUsdtTransferTask.java
new file mode 100644
index 000000000..8d989ab3e
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MonitorUsdtTransferTask.java
@@ -0,0 +1,4 @@
+package com.ruoyi.quartz.task;
+
+public class MonitorUsdtTransferTask {
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/UndelegateEnergyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/UndelegateEnergyTask.java
new file mode 100644
index 000000000..31eed5d27
--- /dev/null
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/UndelegateEnergyTask.java
@@ -0,0 +1,35 @@
+package com.ruoyi.quartz.task;
+
+
+import com.ruoyi.common.core.domain.entity.TrxExchangeInfo;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.system.service.ITrxExchangeInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component("undelegateEnergyTask")
+@Slf4j
+public class UndelegateEnergyTask {
+
+    @Autowired
+    private ITrxExchangeInfoService trxExchangeInfoService;
+
+
+
+    public void doUndelegateEnergy() {
+
+        String dictValue = DictUtils.getDictValue("sys_delegate_status", "已委托");
+
+        TrxExchangeInfo trxExchangeInfoExample = TrxExchangeInfo.builder().delegateStatus(dictValue).build();
+
+        List<TrxExchangeInfo> trxExchangeInfoList = trxExchangeInfoService.selectTrxExchangeInfoList(trxExchangeInfoExample);
+        for (TrxExchangeInfo trxExchangeInfo : trxExchangeInfoList) {
+            trxExchangeInfoService.doUndelegateEnergyByTrxExchangeInfo(trxExchangeInfo);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index a583118a5..6d54d21d7 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -23,6 +23,47 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.tron.trident</groupId>
+            <artifactId>abi</artifactId>
+            <version>0.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.tron.trident</groupId>
+            <artifactId>utils</artifactId>
+            <version>0.8.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.tron.trident</groupId>
+            <artifactId>core</artifactId>
+            <version>0.8.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <version>2.5.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.10.6</version>
+        </dependency>
+
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/MonitorAddressAccount.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/MonitorAddressAccount.java
new file mode 100644
index 000000000..897727aa9
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/MonitorAddressAccount.java
@@ -0,0 +1,49 @@
+package com.ruoyi.system.domain;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Builder
+@Data
+public class MonitorAddressAccount  implements Serializable {
+    /**
+     * 监听地址
+     */
+    private String monitorAddress;
+
+    /**
+     * 出账地址
+     */
+    private String accountAddress;
+
+    /**
+     * 单位
+     */
+    private Integer price;
+
+    /**
+     * trx或者usdt
+     */
+    private String monitorType;
+
+    /**
+     * 是否有效
+     */
+    private String isValid;
+
+    /**
+     * 加密之后的账户秘钥
+     */
+    private String encryptPrivateKey;
+
+    /**
+     * 用于解密加密之后的账户秘钥的秘钥
+     */
+    private String encryptKey;
+
+    private String apiKey;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrxExchange.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrxExchange.java
new file mode 100644
index 000000000..cc0885382
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrxExchange.java
@@ -0,0 +1,58 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * trx兑能量记录对象 trx_exchange_info
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+
+public class TrxExchange extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 转出账户 */
+    private String fromAddress;
+
+    /** 实际出账账户 */
+    private String accountAddress;
+
+    private Long transferNumber;
+
+    private Long lockNum;
+
+    public String getFromAddress() {
+        return fromAddress;
+    }
+
+    public void setFromAddress(String fromAddress) {
+        this.fromAddress = fromAddress;
+    }
+
+    public String getAccountAddress() {
+        return accountAddress;
+    }
+
+    public void setAccountAddress(String accountAddress) {
+        this.accountAddress = accountAddress;
+    }
+
+    public Long getTransferNumber() {
+        return transferNumber;
+    }
+
+    public void setTransferNumber(Long transferNumber) {
+        this.transferNumber = transferNumber;
+    }
+
+    public Long getLockNum() {
+        return lockNum;
+    }
+
+    public void setLockNum(Long lockNum) {
+        this.lockNum = lockNum;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/Contract.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Contract.java
new file mode 100644
index 000000000..dcd0ab89f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Contract.java
@@ -0,0 +1,9 @@
+package com.ruoyi.system.dto;
+
+import lombok.Data;
+
+@Data
+public class Contract {
+    private Parameter parameter;
+    private String type;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/Data.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Data.java
new file mode 100644
index 000000000..1aae8808e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Data.java
@@ -0,0 +1,19 @@
+package com.ruoyi.system.dto;
+
+import java.util.List;
+@lombok.Data
+public class Data {
+    private List<Ret> ret;
+    private List<String> signature;
+    private String txID;
+    private int net_usage;
+    private String raw_data_hex;
+    private int net_fee;
+    private int energy_usage;
+    private long blockNumber;
+    private long block_timestamp;
+    private int energy_fee;
+    private int energy_usage_total;
+    private Raw_data raw_data;
+    private List<String> internal_transactions;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/Meta.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Meta.java
new file mode 100644
index 000000000..51595d6cb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Meta.java
@@ -0,0 +1,9 @@
+package com.ruoyi.system.dto;
+
+import lombok.Data;
+
+@Data
+public class Meta {
+    private long at;
+    private int page_size;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/Parameter.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Parameter.java
new file mode 100644
index 000000000..8447cf71e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Parameter.java
@@ -0,0 +1,9 @@
+package com.ruoyi.system.dto;
+
+import lombok.Data;
+
+@Data
+public class Parameter {
+    private Value value;
+    private String type_url;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/Raw_data.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Raw_data.java
new file mode 100644
index 000000000..fc7e98047
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Raw_data.java
@@ -0,0 +1,13 @@
+package com.ruoyi.system.dto;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class Raw_data {
+    private List<Contract> contract;
+    private String ref_block_bytes;
+    private String ref_block_hash;
+    private long expiration;
+    private long timestamp;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/Ret.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Ret.java
new file mode 100644
index 000000000..0a474a61b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Ret.java
@@ -0,0 +1,19 @@
+package com.ruoyi.system.dto;
+
+
+import lombok.Data;
+
+/**
+ * Auto-generated: 2024-04-08 17:25:14
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@Data
+public class Ret {
+
+    private String contractRet;
+    private int fee;
+
+
+}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TronGridResponse.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TronGridResponse.java
new file mode 100644
index 000000000..d78c291f4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TronGridResponse.java
@@ -0,0 +1,40 @@
+package com.ruoyi.system.dto;
+
+
+
+import java.io.Serializable;
+import java.util.List;
+
+
+public class TronGridResponse implements Serializable {
+    private static final long serialVersionUID = 7446744944022223302L;
+
+    private List<Data> data;
+    private boolean success;
+    private Meta meta;
+
+
+    public List<Data> getData() {
+        return data;
+    }
+
+    public void setData(List<Data> data) {
+        this.data = data;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public Meta getMeta() {
+        return meta;
+    }
+
+    public void setMeta(Meta meta) {
+        this.meta = meta;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/Value.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Value.java
new file mode 100644
index 000000000..1710553a1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/Value.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.dto;
+
+import lombok.Data;
+
+@Data
+public class Value {
+    private String resource;
+    private long frozen_balance;
+    private String owner_address;
+
+    private long amount;
+
+    private String to_address;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AccountAddressInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AccountAddressInfoMapper.java
new file mode 100644
index 000000000..a0bd2a5df
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AccountAddressInfoMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.common.core.domain.entity.AccountAddressInfo;
+
+import java.util.List;
+
+
+/**
+ * 出账账户Mapper接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface AccountAddressInfoMapper 
+{
+    /**
+     * 查询出账账户
+     * 
+     * @param idAccoutAddressInfo 出账账户主键
+     * @return 出账账户
+     */
+    public AccountAddressInfo selectAccountAddressInfoByIdAccoutAddressInfo(Long idAccoutAddressInfo);
+
+    /**
+     * 查询出账账户列表
+     * 
+     * @param accountAddressInfo 出账账户
+     * @return 出账账户集合
+     */
+    public List<AccountAddressInfo> selectAccountAddressInfoList(AccountAddressInfo accountAddressInfo);
+
+    /**
+     * 新增出账账户
+     * 
+     * @param accountAddressInfo 出账账户
+     * @return 结果
+     */
+    public int insertAccountAddressInfo(AccountAddressInfo accountAddressInfo);
+
+    /**
+     * 修改出账账户
+     * 
+     * @param accountAddressInfo 出账账户
+     * @return 结果
+     */
+    public int updateAccountAddressInfo(AccountAddressInfo accountAddressInfo);
+
+    /**
+     * 删除出账账户
+     * 
+     * @param idAccoutAddressInfo 出账账户主键
+     * @return 结果
+     */
+    public int deleteAccountAddressInfoByIdAccoutAddressInfo(Long idAccoutAddressInfo);
+
+    /**
+     * 批量删除出账账户
+     * 
+     * @param idAccoutAddressInfos 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAccountAddressInfoByIdAccoutAddressInfos(String[] idAccoutAddressInfos);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ErrorLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ErrorLogMapper.java
new file mode 100644
index 000000000..da4a34958
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ErrorLogMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+
+import com.ruoyi.common.core.domain.entity.ErrorLog;
+
+import java.util.List;
+
+/**
+ * 错误日志Mapper接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface ErrorLogMapper 
+{
+    /**
+     * 查询错误日志
+     * 
+     * @param idErrorLog 错误日志主键
+     * @return 错误日志
+     */
+    public ErrorLog selectErrorLogByIdErrorLog(Long idErrorLog);
+
+    /**
+     * 查询错误日志列表
+     * 
+     * @param errorLog 错误日志
+     * @return 错误日志集合
+     */
+    public List<ErrorLog> selectErrorLogList(ErrorLog errorLog);
+
+    /**
+     * 新增错误日志
+     * 
+     * @param errorLog 错误日志
+     * @return 结果
+     */
+    public int insertErrorLog(ErrorLog errorLog);
+
+    /**
+     * 修改错误日志
+     * 
+     * @param errorLog 错误日志
+     * @return 结果
+     */
+    public int updateErrorLog(ErrorLog errorLog);
+
+    /**
+     * 删除错误日志
+     * 
+     * @param idErrorLog 错误日志主键
+     * @return 结果
+     */
+    public int deleteErrorLogByIdErrorLog(Long idErrorLog);
+
+    /**
+     * 批量删除错误日志
+     * 
+     * @param idErrorLogs 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteErrorLogByIdErrorLogs(String[] idErrorLogs);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FreezeBalanceInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FreezeBalanceInfoMapper.java
new file mode 100644
index 000000000..89016d94e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FreezeBalanceInfoMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.common.core.domain.entity.FreezeBalanceInfo;
+
+import java.util.List;
+
+
+/**
+ * 抵押流水记录Mapper接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface FreezeBalanceInfoMapper 
+{
+    /**
+     * 查询抵押流水记录
+     * 
+     * @param idFreezeBalanceInfo 抵押流水记录主键
+     * @return 抵押流水记录
+     */
+    public FreezeBalanceInfo selectFreezeBalanceInfoByIdFreezeBalanceInfo(Long idFreezeBalanceInfo);
+
+    /**
+     * 查询抵押流水记录列表
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 抵押流水记录集合
+     */
+    public List<FreezeBalanceInfo> selectFreezeBalanceInfoList(FreezeBalanceInfo freezeBalanceInfo);
+
+    /**
+     * 新增抵押流水记录
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 结果
+     */
+    public int insertFreezeBalanceInfo(FreezeBalanceInfo freezeBalanceInfo);
+
+    /**
+     * 修改抵押流水记录
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 结果
+     */
+    public int updateFreezeBalanceInfo(FreezeBalanceInfo freezeBalanceInfo);
+
+    /**
+     * 删除抵押流水记录
+     * 
+     * @param idFreezeBalanceInfo 抵押流水记录主键
+     * @return 结果
+     */
+    public int deleteFreezeBalanceInfoByIdFreezeBalanceInfo(Long idFreezeBalanceInfo);
+
+    /**
+     * 批量删除抵押流水记录
+     * 
+     * @param idFreezeBalanceInfos 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFreezeBalanceInfoByIdFreezeBalanceInfos(String[] idFreezeBalanceInfos);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MonitorAddressInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MonitorAddressInfoMapper.java
new file mode 100644
index 000000000..96a6ba3f6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MonitorAddressInfoMapper.java
@@ -0,0 +1,65 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.common.core.domain.entity.MonitorAddressInfo;
+
+import java.util.List;
+
+
+/**
+ * 监听账户入账Mapper接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface MonitorAddressInfoMapper 
+{
+    /**
+     * 查询监听账户入账
+     * 
+     * @param idMonitorAddress 监听账户入账主键
+     * @return 监听账户入账
+     */
+    public MonitorAddressInfo selectMonitorAddressInfoByIdMonitorAddress(Long idMonitorAddress);
+
+    /**
+     * 查询监听账户入账列表
+     * 
+     * @param monitorAddressInfo 监听账户入账
+     * @return 监听账户入账集合
+     */
+    public List<MonitorAddressInfo> selectMonitorAddressInfoList(MonitorAddressInfo monitorAddressInfo);
+
+    /**
+     * 新增监听账户入账
+     * 
+     * @param monitorAddressInfo 监听账户入账
+     * @return 结果
+     */
+    public int insertMonitorAddressInfo(MonitorAddressInfo monitorAddressInfo);
+
+    /**
+     * 修改监听账户入账
+     * 
+     * @param monitorAddressInfo 监听账户入账
+     * @return 结果
+     */
+    public int updateMonitorAddressInfo(MonitorAddressInfo monitorAddressInfo);
+
+    /**
+     * 删除监听账户入账
+     * 
+     * @param idMonitorAddress 监听账户入账主键
+     * @return 结果
+     */
+    public int deleteMonitorAddressInfoByIdMonitorAddress(Long idMonitorAddress);
+
+    /**
+     * 批量删除监听账户入账
+     * 
+     * @param idMonitorAddresss 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMonitorAddressInfoByIdMonitorAddresss(String[] idMonitorAddresss);
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TenantInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TenantInfoMapper.java
new file mode 100644
index 000000000..e91c6408b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TenantInfoMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+
+import com.ruoyi.common.core.domain.entity.TenantInfo;
+
+import java.util.List;
+
+/**
+ * 租户Mapper接口
+ * 
+ * @author dorion
+ * @date 2024-04-14
+ */
+public interface TenantInfoMapper 
+{
+    /**
+     * 查询租户
+     * 
+     * @param idTenantInfo 租户主键
+     * @return 租户
+     */
+    public TenantInfo selectTenantInfoByIdTenantInfo(Long idTenantInfo);
+
+    /**
+     * 查询租户列表
+     * 
+     * @param tenantInfo 租户
+     * @return 租户集合
+     */
+    public List<TenantInfo> selectTenantInfoList(TenantInfo tenantInfo);
+
+    /**
+     * 新增租户
+     * 
+     * @param tenantInfo 租户
+     * @return 结果
+     */
+    public int insertTenantInfo(TenantInfo tenantInfo);
+
+    /**
+     * 修改租户
+     * 
+     * @param tenantInfo 租户
+     * @return 结果
+     */
+    public int updateTenantInfo(TenantInfo tenantInfo);
+
+    /**
+     * 删除租户
+     * 
+     * @param idTenantInfo 租户主键
+     * @return 结果
+     */
+    public int deleteTenantInfoByIdTenantInfo(Long idTenantInfo);
+
+    /**
+     * 批量删除租户
+     * 
+     * @param idTenantInfos 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTenantInfoByIdTenantInfos(String[] idTenantInfos);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrxExchangeInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrxExchangeInfoMapper.java
new file mode 100644
index 000000000..bdfd43e9c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrxExchangeInfoMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+
+import com.ruoyi.common.core.domain.entity.TrxExchangeInfo;
+
+import java.util.List;
+
+/**
+ * trx兑能量记录Mapper接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface TrxExchangeInfoMapper 
+{
+    /**
+     * 查询trx兑能量记录
+     * 
+     * @param idTrxExchangeInfo trx兑能量记录主键
+     * @return trx兑能量记录
+     */
+    public TrxExchangeInfo selectTrxExchangeInfoByIdTrxExchangeInfo(Long idTrxExchangeInfo);
+
+    /**
+     * 查询trx兑能量记录列表
+     * 
+     * @param trxExchangeInfo trx兑能量记录
+     * @return trx兑能量记录集合
+     */
+    public List<TrxExchangeInfo> selectTrxExchangeInfoList(TrxExchangeInfo trxExchangeInfo);
+
+    /**
+     * 新增trx兑能量记录
+     * 
+     * @param trxExchangeInfo trx兑能量记录
+     * @return 结果
+     */
+    public int insertTrxExchangeInfo(TrxExchangeInfo trxExchangeInfo);
+
+    /**
+     * 修改trx兑能量记录
+     * 
+     * @param trxExchangeInfo trx兑能量记录
+     * @return 结果
+     */
+    public int updateTrxExchangeInfo(TrxExchangeInfo trxExchangeInfo);
+
+    /**
+     * 删除trx兑能量记录
+     * 
+     * @param idTrxExchangeInfo trx兑能量记录主键
+     * @return 结果
+     */
+    public int deleteTrxExchangeInfoByIdTrxExchangeInfo(Long idTrxExchangeInfo);
+
+    /**
+     * 批量删除trx兑能量记录
+     * 
+     * @param idTrxExchangeInfos 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTrxExchangeInfoByIdTrxExchangeInfos(String[] idTrxExchangeInfos);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAccountAddressInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IAccountAddressInfoService.java
new file mode 100644
index 000000000..8c444a24c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IAccountAddressInfoService.java
@@ -0,0 +1,69 @@
+package com.ruoyi.system.service;
+
+
+import com.ruoyi.common.core.domain.entity.AccountAddressInfo;
+
+import java.util.List;
+
+/**
+ * 出账账户Service接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface IAccountAddressInfoService 
+{
+    /**
+     * 查询出账账户
+     * 
+     * @param idAccoutAddressInfo 出账账户主键
+     * @return 出账账户
+     */
+    public AccountAddressInfo selectAccountAddressInfoByIdAccoutAddressInfo(Long idAccoutAddressInfo);
+
+    /**
+     * 查询出账账户列表
+     * 
+     * @param accountAddressInfo 出账账户
+     * @return 出账账户集合
+     */
+    public List<AccountAddressInfo> selectAccountAddressInfoList(AccountAddressInfo accountAddressInfo) ;
+
+    /**
+     * 新增出账账户
+     * 
+     * @param accountAddressInfo 出账账户
+     * @return 结果
+     */
+    public int insertAccountAddressInfo(AccountAddressInfo accountAddressInfo) throws Exception;
+
+    /**
+     * 修改出账账户
+     * 
+     * @param accountAddressInfo 出账账户
+     * @return 结果
+     */
+    public int updateAccountAddressInfo(AccountAddressInfo accountAddressInfo) throws Exception;
+
+    /**
+     * 批量删除出账账户
+     * 
+     * @param idAccoutAddressInfos 需要删除的出账账户主键集合
+     * @return 结果
+     */
+    public int deleteAccountAddressInfoByIdAccoutAddressInfos(String idAccoutAddressInfos);
+
+    /**
+     * 删除出账账户信息
+     * 
+     * @param idAccoutAddressInfo 出账账户主键
+     * @return 结果
+     */
+    public int deleteAccountAddressInfoByIdAccoutAddressInfo(Long idAccoutAddressInfo);
+
+    Object selectAccountAddressInfoAll();
+
+    String getDecryptPrivateKey(String address) throws Exception;
+
+    List<AccountAddressInfo> selectAccountAddressInfoListByResouce(AccountAddressInfo accountAddressInfo) throws Exception;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IErrorLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IErrorLogService.java
new file mode 100644
index 000000000..323dd5fb8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IErrorLogService.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+
+import com.ruoyi.common.core.domain.entity.ErrorLog;
+
+import java.util.List;
+
+/**
+ * 错误日志Service接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface IErrorLogService 
+{
+    /**
+     * 查询错误日志
+     * 
+     * @param idErrorLog 错误日志主键
+     * @return 错误日志
+     */
+    public ErrorLog selectErrorLogByIdErrorLog(Long idErrorLog);
+
+    /**
+     * 查询错误日志列表
+     * 
+     * @param errorLog 错误日志
+     * @return 错误日志集合
+     */
+    public List<ErrorLog> selectErrorLogList(ErrorLog errorLog);
+
+    /**
+     * 新增错误日志
+     * 
+     * @param errorLog 错误日志
+     * @return 结果
+     */
+    public int insertErrorLog(ErrorLog errorLog);
+
+    /**
+     * 修改错误日志
+     * 
+     * @param errorLog 错误日志
+     * @return 结果
+     */
+    public int updateErrorLog(ErrorLog errorLog);
+
+    /**
+     * 批量删除错误日志
+     * 
+     * @param idErrorLogs 需要删除的错误日志主键集合
+     * @return 结果
+     */
+    public int deleteErrorLogByIdErrorLogs(String idErrorLogs);
+
+    /**
+     * 删除错误日志信息
+     * 
+     * @param idErrorLog 错误日志主键
+     * @return 结果
+     */
+    public int deleteErrorLogByIdErrorLog(Long idErrorLog);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IFreezeBalanceInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IFreezeBalanceInfoService.java
new file mode 100644
index 000000000..3fc54c793
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IFreezeBalanceInfoService.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+
+import com.ruoyi.common.core.domain.entity.FreezeBalanceInfo;
+
+import java.util.List;
+
+/**
+ * 抵押流水记录Service接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface IFreezeBalanceInfoService 
+{
+    /**
+     * 查询抵押流水记录
+     * 
+     * @param idFreezeBalanceInfo 抵押流水记录主键
+     * @return 抵押流水记录
+     */
+    public FreezeBalanceInfo selectFreezeBalanceInfoByIdFreezeBalanceInfo(Long idFreezeBalanceInfo);
+
+    /**
+     * 查询抵押流水记录列表
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 抵押流水记录集合
+     */
+    public List<FreezeBalanceInfo> selectFreezeBalanceInfoList(FreezeBalanceInfo freezeBalanceInfo);
+
+    /**
+     * 新增抵押流水记录
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 结果
+     */
+    public int insertFreezeBalanceInfo(FreezeBalanceInfo freezeBalanceInfo) throws Exception;
+
+    /**
+     * 修改抵押流水记录
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 结果
+     */
+    public int updateFreezeBalanceInfo(FreezeBalanceInfo freezeBalanceInfo);
+
+    /**
+     * 批量删除抵押流水记录
+     * 
+     * @param idFreezeBalanceInfos 需要删除的抵押流水记录主键集合
+     * @return 结果
+     */
+    public int deleteFreezeBalanceInfoByIdFreezeBalanceInfos(String idFreezeBalanceInfos);
+
+    /**
+     * 删除抵押流水记录信息
+     * 
+     * @param idFreezeBalanceInfo 抵押流水记录主键
+     * @return 结果
+     */
+    public int deleteFreezeBalanceInfoByIdFreezeBalanceInfo(Long idFreezeBalanceInfo);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IMonitorAddressInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IMonitorAddressInfoService.java
new file mode 100644
index 000000000..c2895303f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IMonitorAddressInfoService.java
@@ -0,0 +1,71 @@
+package com.ruoyi.system.service;
+
+
+import com.ruoyi.common.core.domain.entity.MonitorAddressInfo;
+
+import java.util.List;
+
+/**
+ * 监听账户入账Service接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface IMonitorAddressInfoService 
+{
+    /**
+     * 查询监听账户入账
+     * 
+     * @param idMonitorAddress 监听账户入账主键
+     * @return 监听账户入账
+     */
+    public MonitorAddressInfo selectMonitorAddressInfoByIdMonitorAddress(Long idMonitorAddress);
+
+    /**
+     * 查询监听账户入账列表
+     * 
+     * @param monitorAddressInfo 监听账户入账
+     * @return 监听账户入账集合
+     */
+    public List<MonitorAddressInfo> selectMonitorAddressInfoList(MonitorAddressInfo monitorAddressInfo);
+
+    /**
+     * 新增监听账户入账
+     * 
+     * @param monitorAddressInfo 监听账户入账
+     * @return 结果
+     */
+    public int insertMonitorAddressInfo(MonitorAddressInfo monitorAddressInfo);
+
+    /**
+     * 修改监听账户入账
+     * 
+     * @param monitorAddressInfo 监听账户入账
+     * @return 结果
+     */
+    public int updateMonitorAddressInfo(MonitorAddressInfo monitorAddressInfo);
+
+    /**
+     * 批量删除监听账户入账
+     * 
+     * @param idMonitorAddresss 需要删除的监听账户入账主键集合
+     * @return 结果
+     */
+    public int deleteMonitorAddressInfoByIdMonitorAddresss(String idMonitorAddresss);
+
+    /**
+     * 删除监听账户入账信息
+     * 
+     * @param idMonitorAddress 监听账户入账主键
+     * @return 结果
+     */
+    public int deleteMonitorAddressInfoByIdMonitorAddress(Long idMonitorAddress);
+/*
+
+    List<MonitorAddressAccount> selectAllMonitorAddressAccount(MonitorAddressAccount monitorAddressAccountExample);
+*/
+
+    List<MonitorAddressInfo> selectAllValidMonitorAddressAccount();
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITenantInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITenantInfoService.java
new file mode 100644
index 000000000..de8d64b9a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITenantInfoService.java
@@ -0,0 +1,65 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.entity.TenantInfo;
+
+import java.util.List;
+
+
+/**
+ * 租户Service接口
+ * 
+ * @author dorion
+ * @date 2024-04-14
+ */
+public interface ITenantInfoService 
+{
+    /**
+     * 查询租户
+     * 
+     * @param idTenantInfo 租户主键
+     * @return 租户
+     */
+    public TenantInfo selectTenantInfoByIdTenantInfo(Long idTenantInfo);
+
+    /**
+     * 查询租户列表
+     * 
+     * @param tenantInfo 租户
+     * @return 租户集合
+     */
+    public List<TenantInfo> selectTenantInfoList(TenantInfo tenantInfo);
+
+    /**
+     * 新增租户
+     * 
+     * @param tenantInfo 租户
+     * @return 结果
+     */
+    public int insertTenantInfo(TenantInfo tenantInfo);
+
+    /**
+     * 修改租户
+     * 
+     * @param tenantInfo 租户
+     * @return 结果
+     */
+    public int updateTenantInfo(TenantInfo tenantInfo);
+
+    /**
+     * 批量删除租户
+     * 
+     * @param idTenantInfos 需要删除的租户主键集合
+     * @return 结果
+     */
+    public int deleteTenantInfoByIdTenantInfos(String idTenantInfos);
+
+    /**
+     * 删除租户信息
+     * 
+     * @param idTenantInfo 租户主键
+     * @return 结果
+     */
+    public int deleteTenantInfoByIdTenantInfo(Long idTenantInfo);
+
+    int activeDataTenantInfoByIdTenantInfos(String ids) throws Exception;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrxExchangeInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrxExchangeInfoService.java
new file mode 100644
index 000000000..dcf395101
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrxExchangeInfoService.java
@@ -0,0 +1,71 @@
+package com.ruoyi.system.service;
+
+
+import com.ruoyi.common.core.domain.entity.TrxExchangeInfo;
+import com.ruoyi.system.domain.MonitorAddressAccount;
+import com.ruoyi.system.domain.TrxExchange;
+
+import java.util.List;
+
+/**
+ * trx兑能量记录Service接口
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+public interface ITrxExchangeInfoService 
+{
+    /**
+     * 查询trx兑能量记录
+     * 
+     * @param idTrxExchangeInfo trx兑能量记录主键
+     * @return trx兑能量记录
+     */
+    public TrxExchangeInfo selectTrxExchangeInfoByIdTrxExchangeInfo(Long idTrxExchangeInfo);
+
+    /**
+     * 查询trx兑能量记录列表
+     * 
+     * @param trxExchangeInfo trx兑能量记录
+     * @return trx兑能量记录集合
+     */
+    public List<TrxExchangeInfo> selectTrxExchangeInfoList(TrxExchangeInfo trxExchangeInfo);
+
+    /**
+     * 新增trx兑能量记录
+     * 
+     * @param trxExchangeInfo trx兑能量记录
+     * @return 结果
+     */
+    public int insertTrxExchangeInfo(TrxExchangeInfo trxExchangeInfo);
+
+    /**
+     * 修改trx兑能量记录
+     * 
+     * @param trxExchangeInfo trx兑能量记录
+     * @return 结果
+     */
+    public int updateTrxExchangeInfo(TrxExchangeInfo trxExchangeInfo);
+
+    /**
+     * 批量删除trx兑能量记录
+     * 
+     * @param idTrxExchangeInfos 需要删除的trx兑能量记录主键集合
+     * @return 结果
+     */
+    public int deleteTrxExchangeInfoByIdTrxExchangeInfos(String idTrxExchangeInfos);
+
+    /**
+     * 删除trx兑能量记录信息
+     * 
+     * @param idTrxExchangeInfo trx兑能量记录主键
+     * @return 结果
+     */
+    public int deleteTrxExchangeInfoByIdTrxExchangeInfo(Long idTrxExchangeInfo);
+
+    int delegate(TrxExchange trxExchange,Boolean isTenant) throws Exception;
+
+    void doMonitorTrxTransferByMonitorAddressInfo(MonitorAddressAccount monitorAddressAccount);
+
+    void doUndelegateEnergyByTrxExchangeInfo(TrxExchangeInfo trxExchangeInfo);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AccountAddressInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AccountAddressInfoServiceImpl.java
new file mode 100644
index 000000000..49956af98
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AccountAddressInfoServiceImpl.java
@@ -0,0 +1,205 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.AccountAddressInfo;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.common.utils.encrpt.Dt;
+import com.ruoyi.system.mapper.AccountAddressInfoMapper;
+import com.ruoyi.system.service.IAccountAddressInfoService;
+import org.apache.shiro.crypto.SecureRandomNumberGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.tron.trident.core.ApiWrapper;
+import org.tron.trident.proto.Response;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 出账账户Service业务层处理
+ *
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Service
+public class AccountAddressInfoServiceImpl implements IAccountAddressInfoService {
+    private static final Logger log = LoggerFactory.getLogger(AccountAddressInfoServiceImpl.class);
+    @Autowired
+    private AccountAddressInfoMapper accountAddressInfoMapper;
+
+    /**
+     * 查询出账账户
+     *
+     * @param idAccoutAddressInfo 出账账户主键
+     * @return 出账账户
+     */
+    @Override
+    public AccountAddressInfo selectAccountAddressInfoByIdAccoutAddressInfo(Long idAccoutAddressInfo) {
+        return accountAddressInfoMapper.selectAccountAddressInfoByIdAccoutAddressInfo(idAccoutAddressInfo);
+    }
+
+    /**
+     * 查询出账账户列表
+     *
+     * @param accountAddressInfo 出账账户
+     * @return 出账账户
+     */
+    @Override
+    public List<AccountAddressInfo> selectAccountAddressInfoList(AccountAddressInfo accountAddressInfo)  {
+
+        return  accountAddressInfoMapper.selectAccountAddressInfoList(accountAddressInfo);
+    }
+
+    /**
+     * 新增出账账户
+     *
+     * @param accountAddressInfo 出账账户
+     * @return 结果
+     */
+    @Override
+    public int insertAccountAddressInfo(AccountAddressInfo accountAddressInfo) throws Exception {
+        String encryptPrivateKey = accountAddressInfo.getEncryptPrivateKey();
+        SecureRandomNumberGenerator secureRandom = new SecureRandomNumberGenerator();
+        String encrptKey = secureRandom.nextBytes(24).toHex();
+        String encrypt = Dt.encrypt(encryptPrivateKey, encrptKey);
+        accountAddressInfo.setEncryptPrivateKey(encrypt);
+        accountAddressInfo.setEncryptKey(encrptKey);
+        String userName = ShiroUtils.getLoginName();
+        accountAddressInfo.setFcu(userName);
+        accountAddressInfo.setLcu(userName);
+        return accountAddressInfoMapper.insertAccountAddressInfo(accountAddressInfo);
+    }
+
+    /**
+     * 修改出账账户
+     *
+     * @param accountAddressInfo 出账账户
+     * @return 结果
+     */
+    @Override
+    public int updateAccountAddressInfo(AccountAddressInfo accountAddressInfo) throws Exception {
+        String encryptPrivateKey = accountAddressInfo.getEncryptPrivateKey();
+        SecureRandomNumberGenerator secureRandom = new SecureRandomNumberGenerator();
+        String encrptKey = secureRandom.nextBytes(24).toHex();
+        String encrypt = Dt.encrypt(encryptPrivateKey, encrptKey);
+        accountAddressInfo.setEncryptPrivateKey(encrypt);
+        accountAddressInfo.setEncryptKey(encrptKey);
+        String userName = ShiroUtils.getLoginName();
+        accountAddressInfo.setLcu(userName);
+        return accountAddressInfoMapper.updateAccountAddressInfo(accountAddressInfo);
+    }
+
+    /**
+     * 批量删除出账账户
+     *
+     * @param idAccoutAddressInfos 需要删除的出账账户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAccountAddressInfoByIdAccoutAddressInfos(String idAccoutAddressInfos) {
+        return accountAddressInfoMapper.deleteAccountAddressInfoByIdAccoutAddressInfos(Convert.toStrArray(idAccoutAddressInfos));
+    }
+
+    /**
+     * 删除出账账户信息
+     *
+     * @param idAccoutAddressInfo 出账账户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAccountAddressInfoByIdAccoutAddressInfo(Long idAccoutAddressInfo) {
+        return accountAddressInfoMapper.deleteAccountAddressInfoByIdAccoutAddressInfo(idAccoutAddressInfo);
+    }
+
+    @Override
+    public List<AccountAddressInfo> selectAccountAddressInfoAll() {
+        AccountAddressInfo accountAddressInfo = new AccountAddressInfo();
+        accountAddressInfo.setIsValid(UserConstants.YES);
+        return accountAddressInfoMapper.selectAccountAddressInfoList(accountAddressInfo);
+    }
+
+
+    /**
+     * 获取解密后私钥
+     * @param address
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public String getDecryptPrivateKey(String address) throws Exception {
+        AccountAddressInfo accountAddressInfoExample = new AccountAddressInfo();
+        accountAddressInfoExample.setAddress(address);
+        List<AccountAddressInfo> accountAddressInfoList = accountAddressInfoMapper.selectAccountAddressInfoList(accountAddressInfoExample);
+        AccountAddressInfo accountAddressInfo = accountAddressInfoList.get(0);
+
+        String encryptPrivateKey = accountAddressInfo.getEncryptPrivateKey();
+        String encryptKey = accountAddressInfo.getEncryptKey();
+
+        //解密获得秘钥
+        String decryptPrivateKey = Dt.decrypt(encryptPrivateKey, encryptKey);
+        return decryptPrivateKey;
+    }
+
+    @Override
+    public List<AccountAddressInfo> selectAccountAddressInfoListByResouce(AccountAddressInfo accountAddressInfo) throws Exception {
+
+        List<AccountAddressInfo> accountAddressInfoList = accountAddressInfoMapper.selectAccountAddressInfoList(accountAddressInfo);
+        for (AccountAddressInfo addressInfo : accountAddressInfoList) {
+            String encryptPrivateKey = addressInfo.getEncryptPrivateKey();
+            String encryptKey = addressInfo.getEncryptKey();
+
+            //解密获得秘钥
+            String decryptPrivateKey = Dt.decrypt(encryptPrivateKey, encryptKey);
+            String tronApiKey = DictUtils.getDictValue("sys_tron_api_key", "synp@outlook");
+
+            ApiWrapper apiWrapper = ApiWrapper.ofMainnet(decryptPrivateKey,tronApiKey);
+
+            String address = addressInfo.getAddress();
+            Response.AccountResourceMessage accountResource = apiWrapper.getAccountResource(address);
+
+            //免费带宽使用量
+            long freeNetUsed = accountResource.getFreeNetUsed();
+            //免费带宽上限
+            long freeNetLimit = accountResource.getFreeNetLimit();
+            //网络带宽消耗
+            long netUsed = accountResource.getNetUsed();
+            //网络上限
+            long netLimit = accountResource.getNetLimit();
+            //能量消耗
+            long energyUsed = accountResource.getEnergyUsed();
+            //能量上限
+            long energyLimit = accountResource.getEnergyLimit();
+
+            long totalNetUsed = freeNetUsed + netUsed;
+
+            long taotalNetLimit = freeNetLimit + netLimit;
+
+            long totalNetBalance = taotalNetLimit - totalNetUsed;
+            long totalEnergyBalance = energyLimit - energyUsed;
+
+            addressInfo.setNetResource(totalNetBalance + "/" + taotalNetLimit);
+            addressInfo.setEnergyResource(totalEnergyBalance + "/" + energyLimit);
+
+            Response.Account account = apiWrapper.getAccount(address);
+
+            long balance = account.getBalance();
+
+            List<Response.Account.FreezeV2> frozenV2List = account.getFrozenV2List();
+
+            Long totalFrozen = 0L;
+            for (Response.Account.FreezeV2 freezeV2 : frozenV2List) {
+                totalFrozen += freezeV2.getAmount();
+
+            }
+            addressInfo.setTrxBalance(BigDecimal.valueOf(balance).movePointLeft(6));
+            addressInfo.setTotalFrozen(BigDecimal.valueOf(totalFrozen).movePointLeft(6));
+        }
+
+
+        return accountAddressInfoList;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ErrorLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ErrorLogServiceImpl.java
new file mode 100644
index 000000000..4308058d2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ErrorLogServiceImpl.java
@@ -0,0 +1,101 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.entity.ErrorLog;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.mapper.ErrorLogMapper;
+import com.ruoyi.system.service.IErrorLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 错误日志Service业务层处理
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Service
+public class ErrorLogServiceImpl implements IErrorLogService 
+{
+    @Autowired
+    private ErrorLogMapper errorLogMapper;
+
+    /**
+     * 查询错误日志
+     * 
+     * @param idErrorLog 错误日志主键
+     * @return 错误日志
+     */
+    @Override
+    public ErrorLog selectErrorLogByIdErrorLog(Long idErrorLog)
+    {
+        return errorLogMapper.selectErrorLogByIdErrorLog(idErrorLog);
+    }
+
+    /**
+     * 查询错误日志列表
+     * 
+     * @param errorLog 错误日志
+     * @return 错误日志
+     */
+    @Override
+    public List<ErrorLog> selectErrorLogList(ErrorLog errorLog)
+    {
+        return errorLogMapper.selectErrorLogList(errorLog);
+    }
+
+    /**
+     * 新增错误日志
+     * 
+     * @param errorLog 错误日志
+     * @return 结果
+     */
+    @Override
+    public int insertErrorLog(ErrorLog errorLog)
+    {
+        String userName = ShiroUtils.getLoginName();
+        errorLog.setFcu(userName);
+        errorLog.setLcu(userName);
+        return errorLogMapper.insertErrorLog(errorLog);
+    }
+
+    /**
+     * 修改错误日志
+     * 
+     * @param errorLog 错误日志
+     * @return 结果
+     */
+    @Override
+    public int updateErrorLog(ErrorLog errorLog)
+    {
+        String userName = ShiroUtils.getLoginName();
+        errorLog.setLcu(userName);
+        return errorLogMapper.updateErrorLog(errorLog);
+    }
+
+    /**
+     * 批量删除错误日志
+     * 
+     * @param idErrorLogs 需要删除的错误日志主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErrorLogByIdErrorLogs(String idErrorLogs)
+    {
+        return errorLogMapper.deleteErrorLogByIdErrorLogs(Convert.toStrArray(idErrorLogs));
+    }
+
+    /**
+     * 删除错误日志信息
+     * 
+     * @param idErrorLog 错误日志主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErrorLogByIdErrorLog(Long idErrorLog)
+    {
+        return errorLogMapper.deleteErrorLogByIdErrorLog(idErrorLog);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FreezeBalanceInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FreezeBalanceInfoServiceImpl.java
new file mode 100644
index 000000000..73f9ab1f4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FreezeBalanceInfoServiceImpl.java
@@ -0,0 +1,136 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.FreezeBalanceInfo;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.mapper.FreezeBalanceInfoMapper;
+import com.ruoyi.system.service.IAccountAddressInfoService;
+import com.ruoyi.system.service.IFreezeBalanceInfoService;
+import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.tron.trident.core.ApiWrapper;
+import org.tron.trident.proto.Chain;
+import org.tron.trident.proto.Common;
+import org.tron.trident.proto.Response;
+
+import java.util.List;
+
+/**
+ * 抵押流水记录Service业务层处理
+ * 
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Service
+public class FreezeBalanceInfoServiceImpl implements IFreezeBalanceInfoService 
+{
+    @Autowired
+    private FreezeBalanceInfoMapper freezeBalanceInfoMapper;
+
+    @Autowired
+    private IAccountAddressInfoService accountAddressInfoService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 查询抵押流水记录
+     * 
+     * @param idFreezeBalanceInfo 抵押流水记录主键
+     * @return 抵押流水记录
+     */
+    @Override
+    public FreezeBalanceInfo selectFreezeBalanceInfoByIdFreezeBalanceInfo(Long idFreezeBalanceInfo)
+    {
+        return freezeBalanceInfoMapper.selectFreezeBalanceInfoByIdFreezeBalanceInfo(idFreezeBalanceInfo);
+    }
+
+    /**
+     * 查询抵押流水记录列表
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 抵押流水记录
+     */
+    @Override
+    public List<FreezeBalanceInfo> selectFreezeBalanceInfoList(FreezeBalanceInfo freezeBalanceInfo)
+    {
+        return freezeBalanceInfoMapper.selectFreezeBalanceInfoList(freezeBalanceInfo);
+    }
+
+    /**
+     * 新增抵押流水记录
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 结果
+     */
+    @Override
+    public int insertFreezeBalanceInfo(FreezeBalanceInfo freezeBalanceInfo) throws Exception {
+
+        String systronApiSwitch = configService.selectConfigByKey("sys.tron.api");
+        if(UserConstants.YES.equals(systronApiSwitch)){
+            Long freezeTrxAmount = freezeBalanceInfo.getFreezeTrxAmount();
+            String address = freezeBalanceInfo.getAddress();
+            String decryptPrivateKey = accountAddressInfoService.getDecryptPrivateKey(address);
+
+            String tronApiKey = DictUtils.getDictValue("sys_tron_api_key", "synp@outlook");
+            //发起抵押
+            ApiWrapper apiWrapper = ApiWrapper.ofMainnet(decryptPrivateKey,tronApiKey);
+
+            Long frozenBalance = freezeTrxAmount * 1000000L;
+
+            Response.TransactionExtention transactionExtention = apiWrapper.freezeBalanceV2(address, frozenBalance, Common.ResourceCode.valueOf(freezeBalanceInfo.getExchangeResourceType()).getNumber());
+
+            //签名
+            Chain.Transaction signTransaction = apiWrapper.signTransaction(transactionExtention);
+            //广播 交易hash
+            String hexTxid = apiWrapper.broadcastTransaction(signTransaction);
+
+            freezeBalanceInfo.setTxId(hexTxid);
+        }
+
+        String userName = ShiroUtils.getLoginName();
+        freezeBalanceInfo.setFcu(userName);
+        freezeBalanceInfo.setLcu(userName);
+        return freezeBalanceInfoMapper.insertFreezeBalanceInfo(freezeBalanceInfo);
+    }
+
+
+    /**
+     * 修改抵押流水记录
+     * 
+     * @param freezeBalanceInfo 抵押流水记录
+     * @return 结果
+     */
+    @Override
+    public int updateFreezeBalanceInfo(FreezeBalanceInfo freezeBalanceInfo)
+    {
+        return freezeBalanceInfoMapper.updateFreezeBalanceInfo(freezeBalanceInfo);
+    }
+
+    /**
+     * 批量删除抵押流水记录
+     * 
+     * @param idFreezeBalanceInfos 需要删除的抵押流水记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFreezeBalanceInfoByIdFreezeBalanceInfos(String idFreezeBalanceInfos)
+    {
+        return freezeBalanceInfoMapper.deleteFreezeBalanceInfoByIdFreezeBalanceInfos(Convert.toStrArray(idFreezeBalanceInfos));
+    }
+
+    /**
+     * 删除抵押流水记录信息
+     * 
+     * @param idFreezeBalanceInfo 抵押流水记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFreezeBalanceInfoByIdFreezeBalanceInfo(Long idFreezeBalanceInfo)
+    {
+        return freezeBalanceInfoMapper.deleteFreezeBalanceInfoByIdFreezeBalanceInfo(idFreezeBalanceInfo);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MonitorAddressInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MonitorAddressInfoServiceImpl.java
new file mode 100644
index 000000000..29717c51e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MonitorAddressInfoServiceImpl.java
@@ -0,0 +1,113 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.entity.MonitorAddressInfo;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.mapper.MonitorAddressInfoMapper;
+import com.ruoyi.system.service.IMonitorAddressInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 监听账户入账Service业务层处理
+ *
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Service
+@Slf4j
+public class MonitorAddressInfoServiceImpl implements IMonitorAddressInfoService {
+    @Autowired
+    private MonitorAddressInfoMapper monitorAddressInfoMapper;
+
+
+    /**
+     * 查询监听账户入账
+     *
+     * @param idMonitorAddress 监听账户入账主键
+     * @return 监听账户入账
+     */
+    @Override
+    public MonitorAddressInfo selectMonitorAddressInfoByIdMonitorAddress(Long idMonitorAddress) {
+        return monitorAddressInfoMapper.selectMonitorAddressInfoByIdMonitorAddress(idMonitorAddress);
+    }
+
+    /**
+     * 查询监听账户入账列表
+     *
+     * @param monitorAddressInfo 监听账户入账
+     * @return 监听账户入账
+     */
+    @Override
+    public List<MonitorAddressInfo> selectMonitorAddressInfoList(MonitorAddressInfo monitorAddressInfo) {
+        return monitorAddressInfoMapper.selectMonitorAddressInfoList(monitorAddressInfo);
+    }
+
+    /**
+     * 新增监听账户入账
+     *
+     * @param monitorAddressInfo 监听账户入账
+     * @return 结果
+     */
+    @Override
+    public int insertMonitorAddressInfo(MonitorAddressInfo monitorAddressInfo) {
+        String userName = ShiroUtils.getLoginName();
+        monitorAddressInfo.setFcu(userName);
+        monitorAddressInfo.setLcu(userName);
+        return monitorAddressInfoMapper.insertMonitorAddressInfo(monitorAddressInfo);
+    }
+
+    /**
+     * 修改监听账户入账
+     *
+     * @param monitorAddressInfo 监听账户入账
+     * @return 结果
+     */
+    @Override
+    public int updateMonitorAddressInfo(MonitorAddressInfo monitorAddressInfo) {
+        String userName = ShiroUtils.getLoginName();
+        monitorAddressInfo.setLcu(userName);
+        return monitorAddressInfoMapper.updateMonitorAddressInfo(monitorAddressInfo);
+    }
+
+    /**
+     * 批量删除监听账户入账
+     *
+     * @param idMonitorAddresss 需要删除的监听账户入账主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMonitorAddressInfoByIdMonitorAddresss(String idMonitorAddresss) {
+        return monitorAddressInfoMapper.deleteMonitorAddressInfoByIdMonitorAddresss(Convert.toStrArray(idMonitorAddresss));
+    }
+
+    /**
+     * 删除监听账户入账信息
+     *
+     * @param idMonitorAddress 监听账户入账主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMonitorAddressInfoByIdMonitorAddress(Long idMonitorAddress) {
+        return monitorAddressInfoMapper.deleteMonitorAddressInfoByIdMonitorAddress(idMonitorAddress);
+    }
+
+
+  /*  @Override
+    public List<MonitorAddressAccount> selectAllMonitorAddressAccount(MonitorAddressAccount monitorAddressAccountExample) {
+        return monitorAddressInfoMapper.selectAllMonitorAddressAccount(monitorAddressAccountExample);
+    }*/
+
+    @Override
+    public List<MonitorAddressInfo> selectAllValidMonitorAddressAccount() {
+        MonitorAddressInfo monitorAddressInfo = new MonitorAddressInfo();
+        monitorAddressInfo.setIsValid("Y");
+
+        return   monitorAddressInfoMapper.selectMonitorAddressInfoList(monitorAddressInfo);
+    }
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TenantInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TenantInfoServiceImpl.java
new file mode 100644
index 000000000..7e4d4e8cb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TenantInfoServiceImpl.java
@@ -0,0 +1,178 @@
+package com.ruoyi.system.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.google.common.base.Preconditions;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.MonitorAddressInfo;
+import com.ruoyi.common.core.domain.entity.TenantInfo;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.domain.TrxExchange;
+import com.ruoyi.system.mapper.MonitorAddressInfoMapper;
+import com.ruoyi.system.mapper.TenantInfoMapper;
+import com.ruoyi.system.service.ITenantInfoService;
+import com.ruoyi.system.service.ITrxExchangeInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 租户Service业务层处理
+ * 
+ * @author dorion
+ * @date 2024-04-14
+ */
+@Service
+public class TenantInfoServiceImpl implements ITenantInfoService 
+{
+    @Autowired
+    private TenantInfoMapper tenantInfoMapper;
+
+    @Autowired
+    private ITrxExchangeInfoService trxExchangeInfoService;
+    @Autowired
+    private MonitorAddressInfoMapper monitorAddressInfoMapper;
+
+    /**
+     * 查询租户
+     * 
+     * @param idTenantInfo 租户主键
+     * @return 租户
+     */
+    @Override
+    public TenantInfo selectTenantInfoByIdTenantInfo(Long idTenantInfo)
+    {
+        return tenantInfoMapper.selectTenantInfoByIdTenantInfo(idTenantInfo);
+    }
+
+    /**
+     * 查询租户列表
+     * 
+     * @param tenantInfo 租户
+     * @return 租户
+     */
+    @Override
+    public List<TenantInfo> selectTenantInfoList(TenantInfo tenantInfo)
+    {
+        return tenantInfoMapper.selectTenantInfoList(tenantInfo);
+    }
+
+    /**
+     * 新增租户
+     * 
+     * @param tenantInfo 租户
+     * @return 结果
+     */
+    @Override
+    public int insertTenantInfo(TenantInfo tenantInfo)
+    {
+        Long price = tenantInfo.getPrice();
+        Long transferCount = tenantInfo.getTransferCount();
+
+        long exchangeAmount = price * transferCount;
+        tenantInfo.setExchangeAmount(exchangeAmount);
+        tenantInfo.setIsPaid(UserConstants.NO);
+        Long period = tenantInfo.getPeriod();
+
+        DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), period.intValue());
+
+        tenantInfo.setFinishTransferTime( DateUtil.endOfDay(dateTime));
+
+        String loginName = ShiroUtils.getLoginName();
+        tenantInfo.setFcd(new Date());
+        tenantInfo.setFcu(loginName);
+
+        tenantInfo.setLcd(new Date());
+        tenantInfo.setLcu(loginName);
+
+        return tenantInfoMapper.insertTenantInfo(tenantInfo);
+    }
+
+
+    /**
+     * 修改租户
+     * 
+     * @param tenantInfo 租户
+     * @return 结果
+     */
+    @Override
+    public int updateTenantInfo(TenantInfo tenantInfo)
+    {
+        Long price = tenantInfo.getPrice();
+        Long transferCount = tenantInfo.getTransferCount();
+
+        long exchangeAmount = price * transferCount;
+        tenantInfo.setExchangeAmount(exchangeAmount);
+        Long period = tenantInfo.getPeriod();
+
+        DateTime dateTime = DateUtil.offsetDay(tenantInfo.getFcd(), period.intValue());
+        tenantInfo.setFinishTransferTime( DateUtil.endOfDay(dateTime));
+
+        String loginName = ShiroUtils.getLoginName();
+
+        tenantInfo.setLcd(new Date());
+        tenantInfo.setLcu(loginName);
+
+        return tenantInfoMapper.updateTenantInfo(tenantInfo);
+    }
+
+    /**
+     * 批量删除租户
+     * 
+     * @param idTenantInfos 需要删除的租户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTenantInfoByIdTenantInfos(String idTenantInfos)
+    {
+        return tenantInfoMapper.deleteTenantInfoByIdTenantInfos(Convert.toStrArray(idTenantInfos));
+    }
+
+    /**
+     * 删除租户信息
+     * 
+     * @param idTenantInfo 租户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTenantInfoByIdTenantInfo(Long idTenantInfo)
+    {
+        return tenantInfoMapper.deleteTenantInfoByIdTenantInfo(idTenantInfo);
+    }
+
+    @Override
+    public int activeDataTenantInfoByIdTenantInfos(String idTenantInfos) throws Exception {
+        String[] idArray = Convert.toStrArray(idTenantInfos);
+        for (String id : idArray) {
+            TenantInfo tenantInfo = tenantInfoMapper.selectTenantInfoByIdTenantInfo(Long.valueOf(id));
+
+            Date finishTransferTime = tenantInfo.getFinishTransferTime();
+            int compare = DateUtil.compare(new Date(), finishTransferTime);
+
+            Preconditions.checkState(compare <= 0, "租户已过期,无法再次委托能量");
+
+            MonitorAddressInfo monitorAddressInfoExample = new MonitorAddressInfo();
+            monitorAddressInfoExample.setMonitorAddress(tenantInfo.getMonitorAddress());
+            monitorAddressInfoExample.setIsValid(UserConstants.YES);
+            List<MonitorAddressInfo> monitorAddressInfoList = monitorAddressInfoMapper.selectMonitorAddressInfoList(monitorAddressInfoExample);
+
+            Preconditions.checkState(CollectionUtil.isNotEmpty(monitorAddressInfoList), "监听地址不存在或者已失效,无法再次委托能量");
+
+            MonitorAddressInfo monitorAddressInfo = monitorAddressInfoList.get(0);
+
+            TrxExchange trxExchange = new TrxExchange();
+            trxExchange.setFromAddress(tenantInfo.getReceiverAddress());
+            trxExchange.setAccountAddress(monitorAddressInfo.getAccountAddress());
+            trxExchange.setTransferNumber(tenantInfo.getTransferCount());
+            trxExchange.setLockNum(24L);
+
+            trxExchangeInfoService.delegate(trxExchange, true);
+        }
+
+        return 1;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrxExchangeInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrxExchangeInfoServiceImpl.java
new file mode 100644
index 000000000..792359cfd
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrxExchangeInfoServiceImpl.java
@@ -0,0 +1,637 @@
+package com.ruoyi.system.service.impl;
+
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.ErrorLog;
+import com.ruoyi.common.core.domain.entity.TenantInfo;
+import com.ruoyi.common.core.domain.entity.TrxExchangeInfo;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.common.utils.encrpt.Dt;
+import com.ruoyi.common.utils.http.RestTemplateUtils;
+import com.ruoyi.system.domain.MonitorAddressAccount;
+import com.ruoyi.system.domain.TrxExchange;
+import com.ruoyi.system.dto.Contract;
+import com.ruoyi.system.dto.Data;
+import com.ruoyi.system.dto.TronGridResponse;
+import com.ruoyi.system.dto.Value;
+import com.ruoyi.system.mapper.ErrorLogMapper;
+import com.ruoyi.system.mapper.TenantInfoMapper;
+import com.ruoyi.system.mapper.TrxExchangeInfoMapper;
+import com.ruoyi.system.service.IAccountAddressInfoService;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ITrxExchangeInfoService;
+import com.ruoyi.system.util.AddressUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.util.UriComponentsBuilder;
+import org.tron.trident.core.ApiWrapper;
+import org.tron.trident.core.exceptions.IllegalException;
+import org.tron.trident.proto.Chain;
+import org.tron.trident.proto.Common;
+import org.tron.trident.proto.Response;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * trx兑能量记录Service业务层处理
+ *
+ * @author dorion
+ * @date 2024-04-13
+ */
+@Service
+@Slf4j
+public class TrxExchangeInfoServiceImpl implements ITrxExchangeInfoService {
+    @Autowired
+    private TrxExchangeInfoMapper trxExchangeInfoMapper;
+
+    @Autowired
+    private ISysConfigService configService;
+    @Autowired
+    private IAccountAddressInfoService accountAddressInfoService;
+    @Autowired
+    private RedisTemplate redisTemplate;
+    @Autowired
+    private RedissonClient redissonClient;
+    @Autowired
+    private ErrorLogMapper errorLogMapper;
+
+    @Autowired
+    private TenantInfoMapper tenantInfoMapper;
+
+
+    /**
+     * 查询trx兑能量记录
+     *
+     * @param idTrxExchangeInfo trx兑能量记录主键
+     * @return trx兑能量记录
+     */
+    @Override
+    public TrxExchangeInfo selectTrxExchangeInfoByIdTrxExchangeInfo(Long idTrxExchangeInfo) {
+        return trxExchangeInfoMapper.selectTrxExchangeInfoByIdTrxExchangeInfo(idTrxExchangeInfo);
+    }
+
+    /**
+     * 查询trx兑能量记录列表
+     *
+     * @param trxExchangeInfo trx兑能量记录
+     * @return trx兑能量记录
+     */
+    @Override
+    public List<TrxExchangeInfo> selectTrxExchangeInfoList(TrxExchangeInfo trxExchangeInfo) {
+        return trxExchangeInfoMapper.selectTrxExchangeInfoList(trxExchangeInfo);
+    }
+
+    /**
+     * 新增trx兑能量记录
+     *
+     * @param trxExchangeInfo trx兑能量记录
+     * @return 结果
+     */
+    @Override
+    public int insertTrxExchangeInfo(TrxExchangeInfo trxExchangeInfo) {
+        String userName = ShiroUtils.getSysUser().getUserName();
+        trxExchangeInfo.setFcu(userName);
+        trxExchangeInfo.setLcu(userName);
+        return trxExchangeInfoMapper.insertTrxExchangeInfo(trxExchangeInfo);
+    }
+
+    /**
+     * 修改trx兑能量记录
+     *
+     * @param trxExchangeInfo trx兑能量记录
+     * @return 结果
+     */
+    @Override
+    public int updateTrxExchangeInfo(TrxExchangeInfo trxExchangeInfo) {
+        String userName = ShiroUtils.getSysUser().getUserName();
+        trxExchangeInfo.setLcu(userName);
+        return trxExchangeInfoMapper.updateTrxExchangeInfo(trxExchangeInfo);
+    }
+
+    /**
+     * 批量删除trx兑能量记录
+     *
+     * @param idTrxExchangeInfos 需要删除的trx兑能量记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTrxExchangeInfoByIdTrxExchangeInfos(String idTrxExchangeInfos) {
+        return trxExchangeInfoMapper.deleteTrxExchangeInfoByIdTrxExchangeInfos(Convert.toStrArray(idTrxExchangeInfos));
+    }
+
+    /**
+     * 删除trx兑能量记录信息
+     *
+     * @param idTrxExchangeInfo trx兑能量记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTrxExchangeInfoByIdTrxExchangeInfo(Long idTrxExchangeInfo) {
+        return trxExchangeInfoMapper.deleteTrxExchangeInfoByIdTrxExchangeInfo(idTrxExchangeInfo);
+    }
+
+    @Override
+    public int delegate(TrxExchange trxExchange,Boolean isTenant) throws Exception {
+        //转账笔数
+        Long transferNumber = trxExchange.getTransferNumber();
+        //实际锁定周期
+        long lockPeriod = trxExchange.getLockNum() * 1200;
+        String systronApiSwitch = configService.selectConfigByKey("sys.tron.api");
+
+        String fromAddress = trxExchange.getFromAddress();
+
+        String dictValue = DictUtils.getDictValue("sys_delegate_status", "已委托");
+
+        TrxExchangeInfo trxExchangeInfo = null;
+        String userName = ShiroUtils.getLoginName();
+        if (UserConstants.YES.equals(systronApiSwitch)) {
+            String accountAddress = trxExchange.getAccountAddress();
+            String decryptPrivateKey = accountAddressInfoService.getDecryptPrivateKey(accountAddress);
+
+            String tronApiKey = DictUtils.getDictValue("sys_tron_api_key", "synp@outlook");
+
+            ApiWrapper apiWrapper = ApiWrapper.ofMainnet(decryptPrivateKey, tronApiKey);
+            Response.AccountResourceMessage accountResource = apiWrapper.getAccountResource(accountAddress);
+
+
+            //总用于质押换取能量的trx上限
+            long balance = getBalance(accountResource, transferNumber);
+
+            String delegateResourceTxid = getDelegateResourceTxid(apiWrapper, accountAddress, balance, fromAddress, lockPeriod);
+
+            String busiType = DictUtils.getDictValue("sys_busi_type", "闪兑套餐");
+
+            if (isTenant){
+                busiType =  DictUtils.getDictValue("sys_busi_type", "天数套餐");
+            }else  if (lockPeriod > 1200 && lockPeriod <= 24*1200){
+                busiType =  DictUtils.getDictValue("sys_busi_type", "笔数套餐");
+            }
+            trxExchangeInfo = TrxExchangeInfo.builder()
+                    .delegateAmountTrx(balance)
+                    .tranferCount(transferNumber)
+                    .busiType(busiType)
+                    .lockPeriod(lockPeriod)
+                    .accountAddress(trxExchange.getAccountAddress())
+                    .fromAddress(fromAddress)
+                    .delegateTxId(delegateResourceTxid)
+                    .delegateStatus(dictValue)
+                    .fcu(userName)
+                    .lcu(userName)
+                    .build();
+
+        }else{
+            String busiType = DictUtils.getDictValue("sys_busi_type", "闪兑套餐");
+            if (isTenant){
+                busiType =  DictUtils.getDictValue("sys_busi_type", "天数套餐");
+            }else  if (lockPeriod > 1200 && lockPeriod <= 24*1200){
+                busiType =  DictUtils.getDictValue("sys_busi_type", "笔数套餐");
+            }
+            trxExchangeInfo = TrxExchangeInfo.builder()
+                    .delegateAmountTrx(0L)
+                    .tranferCount(transferNumber)
+                    .lockPeriod(lockPeriod)
+                    .busiType(busiType)
+                    .lockPeriod(lockPeriod)
+                    .accountAddress(trxExchange.getAccountAddress())
+                    .fromAddress(fromAddress)
+                    .delegateStatus(dictValue)
+                    .fcu(userName)
+                    .lcu(userName)
+                    .build();
+        }
+
+        return trxExchangeInfoMapper.insertTrxExchangeInfo(trxExchangeInfo);
+    }
+
+
+    /**
+     * 按照单个地址监听方法
+     *
+     * @param monitorAddressAccount
+     */
+    @Override
+    public void doMonitorTrxTransferByMonitorAddressInfo(MonitorAddressAccount monitorAddressAccount) {
+
+        String monitorAddress = monitorAddressAccount.getMonitorAddress();
+        String apiKey = monitorAddressAccount.getApiKey();
+
+        ResponseEntity responseEntity = null;
+        try {
+            responseEntity = getTransActionList(monitorAddress, apiKey);
+        } catch (Exception e) {
+            log.error("获取交易列表异常", e);
+            ErrorLog errorLog = ErrorLog.builder()
+                    .address(monitorAddressAccount.getMonitorAddress())
+                    .errorCode("getTransAction")
+                    .errorMsg(e.getMessage())
+                    .fcu("system")
+                    .lcu("system").build();
+
+            errorLogMapper.insertErrorLog(errorLog);
+
+            throw new RuntimeException("获取交易列表异常", e);
+        }
+
+        Object responseEntityBody = getResponseEntityBody(responseEntity, monitorAddress);
+
+        if (responseEntityBody == null) return;
+        TronGridResponse tronGridResponse = JSONUtil.toBean((String) responseEntityBody, TronGridResponse.class);
+        if (log.isInfoEnabled()) {
+            log.info("{}responseEntityBody:{}", monitorAddress, JSONUtil.toJsonStr(tronGridResponse));
+        }
+        List<Data> dataList = tronGridResponse.getData();
+        for (Data data : dataList) {
+            //交易hash判断有没有处理过
+            String txID = data.getTxID();
+            Boolean hasKey = redisTemplate.hasKey("transfer_trx_" + txID);
+            if (hasKey) {
+                continue;
+            }
+
+
+            RLock lock = redissonClient.getLock("lock_" + txID);
+            try {
+                boolean res = lock.tryLock(3, 50, TimeUnit.SECONDS);
+                if (!res) {
+                    //有其他程序正在处理则不需要再处理
+                    continue;
+                }
+
+                Contract contract = data.getRaw_data().getContract().get(0);
+
+                String type = contract.getType();
+                //判断是否转账业务
+                if (Chain.Transaction.Contract.ContractType.TransferContract.name().equals(type)) {
+                    //判断是否是租户
+                    doDelegateResource(contract, txID, monitorAddressAccount);
+                } else {
+                    log.info("txID:{}其他业务类型不处理:{}", txID, JSONUtil.toJsonStr(data));
+                }
+            } catch (Exception e) {
+                log.error("业务处理异常{},txid:{}", monitorAddress, txID, e);
+                ErrorLog errorLog = ErrorLog.builder()
+                        .address(monitorAddressAccount.getMonitorAddress())
+                        .trxId(txID)
+                        .errorCode("doDelegateResource")
+                        .errorMsg(e.getMessage())
+                        .fcu("system")
+                        .lcu("system").build();
+
+                errorLogMapper.insertErrorLog(errorLog);
+            } finally {
+                if (lock.isLocked()) {
+                    if (lock.isHeldByCurrentThread()) {
+                        lock.unlock();
+                    }
+                }
+            }
+        }
+
+
+    }
+
+
+    /**
+     * 获取响应体
+     *
+     * @param responseEntity
+     * @param address
+     * @return
+     */
+    private static Object getResponseEntityBody(ResponseEntity responseEntity, String address) {
+        if (responseEntity == null) {
+            log.warn("{}:responseEntity is null", address);
+            return null;
+        }
+        HttpStatus statusCode = responseEntity.getStatusCode();
+        if (statusCode != HttpStatus.OK) {
+            log.error("获取trx交易信息失败:{}", address);
+            return null;
+        }
+        Object responseEntityBody = responseEntity.getBody();
+        if (responseEntityBody == null) {
+            log.warn("{}:responseEntityBody is null", address);
+            return null;
+        }
+        return responseEntityBody;
+    }
+
+
+    /**
+     * 获取交易列表
+     *
+     * @param address 监听地址
+     * @param apiKey
+     * @return
+     */
+    private ResponseEntity getTransActionList(String address, String apiKey) {
+        ResponseEntity responseEntity;
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("TRON-PRO-API-KEY", apiKey);
+        //监听
+        UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://api.trongrid.io/v1/accounts/" + address + "/transactions");
+//        builder.queryParam("only_confirmed", true);
+        builder.queryParam("only_to", true);
+        builder.queryParam("limit", 200);
+        String sysTransferBetween = configService.selectConfigByKey("sys.transfer.between");
+
+        DateTime min_timestamp = DateUtil.offset(new Date(), DateField.MINUTE, Integer.valueOf(sysTransferBetween));
+        builder.queryParam("min_timestamp", min_timestamp.getTime());
+
+        String uriString = builder.toUriString();
+        responseEntity = RestTemplateUtils.get(uriString, headers, String.class);
+        return responseEntity;
+    }
+
+
+    /**
+     * 进行资源代理操作
+     *
+     * @param contract
+     * @param txID
+     * @param monitorAddressAccount
+     * @throws IllegalException
+     */
+    private void doDelegateResource(Contract contract, String txID, MonitorAddressAccount monitorAddressAccount) throws Exception {
+
+
+        Value value = contract.getParameter().getValue();
+        //转账金额需除以10的6次方精度
+        long amountSun = value.getAmount();
+        long amount = amountSun / 1000000L;
+
+        if (amount < 1) {
+            log.info("txID:{}金额{}小于1TRX不做处理", txID, amountSun);
+            return;
+        }
+        String ownerAddress = value.getOwner_address();
+        String toAddress = value.getTo_address();
+
+        //查询是否是按天支付的租户
+        TenantInfo tenantInfoExample = new TenantInfo();
+        tenantInfoExample.setReceiverAddress(ownerAddress);
+        tenantInfoExample.setMonitorAddress(monitorAddressAccount.getMonitorAddress());
+        tenantInfoExample.setFinishTransferTime(new Date());
+        tenantInfoExample.setIsPaid(UserConstants.NO);
+        List<TenantInfo> tenantInfoList = tenantInfoMapper.selectTenantInfoList(tenantInfoExample);
+
+        long lockPeriod = 1200L;
+        long transferCount = 0L;
+        Integer price = null;
+        String busiType = DictUtils.getDictValue("sys_busi_type", "闪兑套餐");
+
+        if (tenantInfoList.size() > 0) {
+            TenantInfo tenantInfo = tenantInfoList.get(0);
+            Long exchangeAmount = tenantInfo.getExchangeAmount();
+            //判断入账金额是否与转入金额相等,如果相等则设置为已支付
+            if (amount != exchangeAmount) {
+                log.info("txID:{}金额{}不是入账金额{}不做处理", txID, amountSun, exchangeAmount);
+                ErrorLog errorLog = ErrorLog.builder()
+                        .address(ownerAddress)
+                        .errorCode("tenantTansferAmount")
+                        .errorMsg("金额" + amountSun + "不是入账金额" + exchangeAmount + "不做处理")
+                        .trxId(txID)
+                        .fcu("system")
+                        .lcu("system").build();
+                errorLogMapper.insertErrorLog(errorLog);
+                return;
+            }
+            tenantInfo.setIsPaid("Y");
+            tenantInfo.setLcu("system");
+            tenantInfo.setTxId(txID);
+            tenantInfoMapper.updateTenantInfo(tenantInfo);
+            //取包天的套餐锁定时间和交易笔数
+            lockPeriod = 1200L * 24;
+            busiType =  DictUtils.getDictValue("sys_busi_type", "天数套餐");
+            transferCount = tenantInfo.getTransferCount();
+            price = tenantInfo.getPrice().intValue();
+
+        } else {
+            price = monitorAddressAccount.getPrice();
+            transferCount = amount / price;
+
+            if (transferCount < 1) {
+                log.info("txID:{}金额{}不是单价的倍数不做处理", txID, amountSun);
+                return;
+            }
+
+        }
+
+        String accountAddress = monitorAddressAccount.getAccountAddress();
+        String encryptPrivateKey = monitorAddressAccount.getEncryptPrivateKey();
+        String encryptKey = monitorAddressAccount.getEncryptKey();
+
+        String decryptPrivateKey = Dt.decrypt(encryptPrivateKey, encryptKey);
+
+//        apiWrapper = ApiWrapper.ofShasta(encryptPrivateKey);
+
+        String tronApiKey = DictUtils.getDictValue("sys_tron_api_key", "synp@outlook");
+        ApiWrapper apiWrapper = ApiWrapper.ofMainnet(decryptPrivateKey, tronApiKey);
+
+        Response.AccountResourceMessage accountResource = apiWrapper.getAccountResource(accountAddress);
+
+        //总用于质押换取能量的trx上限
+        long balance = getBalance(accountResource, transferCount);
+
+        /*  lock_period: 锁定周期，以区块时间（3s）为单位，表示锁定多少个区块的时间，当lock为true时，该字段有效。如果代理锁定期为1天，则lock_period为：28800*/
+
+        String delegateResourceTxid = getDelegateResourceTxid(apiWrapper, accountAddress, balance, ownerAddress, lockPeriod);
+
+        TrxExchangeInfo trxExchangeInfo = TrxExchangeInfo.builder()
+                .fromAddress(AddressUtil.hexToBase58(ownerAddress))
+                .toAddress(AddressUtil.hexToBase58(toAddress))
+                .accountAddress(accountAddress)
+                .price(Long.valueOf(price))
+                .trxTxId(txID)
+                .tranferCount(transferCount)
+                .busiType(busiType)
+                .trxAmount(amount)
+                .delegateAmountTrx(balance)
+                .delegateTxId(delegateResourceTxid)
+                .lockPeriod(lockPeriod)
+                .delegateStatus("0")
+                .fcd(new Date())
+                .fcu("system")
+                .lcd(new Date())
+                .fcu("system")
+                .build();
+
+        trxExchangeInfoMapper.insertTrxExchangeInfo(trxExchangeInfo);
+
+        //持久化之后放redis
+        redisTemplate.opsForValue().set("transfer_trx_" + txID, txID, 1, TimeUnit.DAYS);
+
+    }
+
+    private static long getBalance(Response.AccountResourceMessage accountResource, long energyNum) {
+        long totalEnergyLimit = accountResource.getTotalEnergyLimit();
+        //已经用于质押换取能量的trx
+        long totalEnergyWeight = accountResource.getTotalEnergyWeight();
+
+        //系数 保留一位或者保留2位,算出trx往上进一位
+        BigDecimal trxToFreezeEnergyTimes = BigDecimal.valueOf(totalEnergyLimit).divide(BigDecimal.valueOf(totalEnergyWeight), 2, BigDecimal.ROUND_DOWN);
+        //计算代理的数量
+//        long balance = energyNum * 32000 / 12;
+        long balance = BigDecimal.valueOf(energyNum * 32000).divide(trxToFreezeEnergyTimes, 0, BigDecimal.ROUND_UP).longValue();
+        return balance;
+    }
+
+    private static String getDelegateResourceTxid(ApiWrapper apiWrapper, String accountAddress, long balance, String ownerAddress, long lockPeriod) throws IllegalException {
+        Response.TransactionExtention transactionExtention = apiWrapper.delegateResourceV2(accountAddress, balance * 1000000, Common.ResourceCode.ENERGY_VALUE, ownerAddress, true, lockPeriod);
+
+        Chain.Transaction transaction = apiWrapper.signTransaction(transactionExtention);
+
+        String delegateResourceTxid = apiWrapper.broadcastTransaction(transaction);
+        return delegateResourceTxid;
+    }
+
+
+    @Override
+    public void doUndelegateEnergyByTrxExchangeInfo(TrxExchangeInfo trxExchangeInfo) {
+        Long lockPeriod = trxExchangeInfo.getLockPeriod();
+        Date fcd = trxExchangeInfo.getFcd();
+        Date now = new Date();
+        long betweenSeconds = DateUtil.between(fcd, now, DateUnit.SECOND);
+
+        if (betweenSeconds <= lockPeriod * 3) {
+            //不解锁时间不处理
+            return;
+        }
+
+
+        String accountAddress = trxExchangeInfo.getAccountAddress();
+        RLock lock = redissonClient.getLock("lock_undelegate_" + trxExchangeInfo.getDelegateTxId());
+        try {
+            String decryptPrivateKey = accountAddressInfoService.getDecryptPrivateKey(accountAddress);
+            boolean res = lock.tryLock(3, 50, TimeUnit.SECONDS);
+            if (!res) {
+                //有其他程序正在处理则不需要再处理
+                return;
+            }
+            String tronApiKey = DictUtils.getDictValue("sys_tron_api_key", "synp@outlook");
+            ApiWrapper apiWrapper = ApiWrapper.ofMainnet(decryptPrivateKey, tronApiKey);
+
+            //回收能量
+            doUndelegateEnergy(trxExchangeInfo, apiWrapper);
+
+            //查询是否是按天支付的租户,是的话需要回收完再次赠送
+            TenantInfo tenantInfoExample = new TenantInfo();
+            tenantInfoExample.setReceiverAddress(trxExchangeInfo.getFromAddress());
+            tenantInfoExample.setMonitorAddress(trxExchangeInfo.getToAddress());
+            tenantInfoExample.setFinishTransferTime(new Date());
+            List<TenantInfo> tenantInfoList = tenantInfoMapper.selectTenantInfoList(tenantInfoExample);
+
+            if (tenantInfoList.size() > 0) {
+                Response.AccountResourceMessage accountResource = apiWrapper.getAccountResource(accountAddress);
+                TenantInfo tenantInfo = tenantInfoList.get(0);
+
+                if (UserConstants.NO.equals(tenantInfo.getIsPaid())){
+                    return;
+                }
+
+                Long period = tenantInfo.getPeriod();
+                Date tenantInfoFcd = tenantInfo.getFcd();
+                long between = DateUtil.between(tenantInfoFcd, new Date(), DateUnit.DAY);
+                if (between > period) {
+                    //已到期不处理
+                    return;
+                }
+
+                Long transferCount = tenantInfo.getTransferCount();
+                long balance = getBalance(accountResource, transferCount);
+                String receiverAddress = tenantInfo.getReceiverAddress();
+                /*  lock_period: 锁定周期，以区块时间（3s）为单位，表示锁定多少个区块的时间，当lock为true时，该字段有效。如果代理锁定期为1天，则lock_period为：28800*/
+
+                long newLockPeriod = 24 * 1200L;
+                String delegateResourceTxid = getDelegateResourceTxid(apiWrapper, accountAddress, balance, receiverAddress, newLockPeriod);
+
+                TrxExchangeInfo trxExchangeInfoNew = TrxExchangeInfo.builder()
+                        .fromAddress(receiverAddress)
+                        .toAddress(accountAddress)
+                        .accountAddress(accountAddress)
+                        .price(tenantInfo.getPrice())
+                        .trxTxId(tenantInfo.getTxId())
+                        .tranferCount(transferCount)
+                        .busiType(DictUtils.getDictValue("sys_busi_type", "天数套餐"))
+                        .trxAmount(null)
+                        .delegateAmountTrx(balance)
+                        .delegateTxId(delegateResourceTxid)
+                        .lockPeriod(newLockPeriod)
+                        .delegateStatus("0")
+                        .fcd(new Date())
+                        .fcu("system")
+                        .lcd(new Date())
+                        .fcu("system")
+                        .build();
+
+                trxExchangeInfoMapper.insertTrxExchangeInfo(trxExchangeInfoNew);
+            }
+
+        } catch (Exception e) {
+            log.error("回收能量业务处理异常{}", trxExchangeInfo.getIdTrxExchangeInfo(), e);
+            ErrorLog errorLog = ErrorLog.builder()
+                    .address(accountAddress)
+                    .errorCode("UndelegateEnergy")
+                    .errorMsg(e.getMessage())
+                    .trxId(trxExchangeInfo.getDelegateTxId())
+                    .otherId(trxExchangeInfo.getIdTrxExchangeInfo().toString())
+                    .fcu("system")
+                    .lcu("system").build();
+            errorLogMapper.insertErrorLog(errorLog);
+            throw new RuntimeException("回收能量业务处理异常", e);
+        } finally {
+            if (lock.isLocked()) {
+                if (lock.isHeldByCurrentThread()) {
+                    lock.unlock();
+                }
+            }
+        }
+
+
+    }
+
+    /**
+     * 回收业务逻辑
+     *
+     * @param trxExchangeInfo
+     * @param apiWrapper
+     * @throws IllegalException
+     */
+    private void doUndelegateEnergy(TrxExchangeInfo trxExchangeInfo, ApiWrapper apiWrapper) throws IllegalException {
+        String accountAddress = trxExchangeInfo.getAccountAddress();
+        String fromAddress = trxExchangeInfo.getFromAddress();
+        long balance = trxExchangeInfo.getDelegateAmountTrx() * 1000000;
+
+        Response.TransactionExtention transactionExtention = apiWrapper.undelegateResource(accountAddress,
+                balance, Common.ResourceCode.ENERGY_VALUE, fromAddress);
+
+        Chain.Transaction transaction = apiWrapper.signTransaction(transactionExtention);
+
+        String unDelegateTxId = apiWrapper.broadcastTransaction(transaction);
+
+        String dictValue = DictUtils.getDictValue("sys_delegate_status", "已回收");
+
+        trxExchangeInfo.setDelegateStatus(dictValue);
+        trxExchangeInfo.setUnDelegateTxId(unDelegateTxId);
+        trxExchangeInfo.setLcd(new Date());
+        trxExchangeInfo.setLcu("system");
+        trxExchangeInfoMapper.updateTrxExchangeInfo(trxExchangeInfo);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/util/AddressUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/util/AddressUtil.java
new file mode 100644
index 000000000..2023b0303
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/util/AddressUtil.java
@@ -0,0 +1,12 @@
+package com.ruoyi.system.util;
+
+import com.google.protobuf.ByteString;
+import org.tron.trident.core.ApiWrapper;
+import org.tron.trident.utils.Base58Check;
+
+public class AddressUtil {
+    public static String hexToBase58(String address) {
+        ByteString bytes = ApiWrapper.parseAddress(address);
+        return Base58Check.bytesToBase58(bytes.toByteArray());
+    }
+}
diff --git a/ruoyi-system/src/main/resources/mapper/account/AccountAddressInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/account/AccountAddressInfoMapper.xml
new file mode 100644
index 000000000..1550c29ed
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/account/AccountAddressInfoMapper.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.AccountAddressInfoMapper">
+
+    <resultMap type="AccountAddressInfo" id="AccountAddressInfoResult">
+        <result property="idAccoutAddressInfo"    column="id_accout_address_info"    />
+        <result property="address"    column="address"    />
+        <result property="encryptPrivateKey"    column="encrypt_private_key"    />
+        <result property="encryptKey"    column="encrypt_key"    />
+        <result property="isValid"    column="is_valid"    />
+        <result property="fcd"    column="fcd"    />
+        <result property="fcu"    column="fcu"    />
+        <result property="lcd"    column="lcd"    />
+        <result property="lcu"    column="lcu"    />
+    </resultMap>
+
+    <sql id="selectAccountAddressInfoVo">
+        select id_accout_address_info, address, encrypt_private_key, encrypt_key, is_valid, fcd, fcu, lcd, lcu from account_address_info
+    </sql>
+
+    <select id="selectAccountAddressInfoList" parameterType="AccountAddressInfo" resultMap="AccountAddressInfoResult">
+        <include refid="selectAccountAddressInfoVo"/>
+        <where>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="encryptPrivateKey != null  and encryptPrivateKey != ''"> and encrypt_private_key = #{encryptPrivateKey}</if>
+            <if test="encryptKey != null  and encryptKey != ''"> and encrypt_key = #{encryptKey}</if>
+            <if test="isValid != null  and isValid != ''"> and is_valid = #{isValid}</if>
+            <if test="fcd != null "> and fcd = #{fcd}</if>
+            <if test="fcu != null  and fcu != ''"> and fcu = #{fcu}</if>
+            <if test="lcd != null "> and lcd = #{lcd}</if>
+            <if test="lcu != null  and lcu != ''"> and lcu = #{lcu}</if>
+        </where>
+    </select>
+
+    <select id="selectAccountAddressInfoByIdAccoutAddressInfo" parameterType="Long" resultMap="AccountAddressInfoResult">
+        <include refid="selectAccountAddressInfoVo"/>
+        where id_accout_address_info = #{idAccoutAddressInfo}
+    </select>
+
+    <insert id="insertAccountAddressInfo" parameterType="AccountAddressInfo" useGeneratedKeys="true" keyProperty="idAccoutAddressInfo">
+        insert into account_address_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="address != null">address,</if>
+            <if test="encryptPrivateKey != null">encrypt_private_key,</if>
+            <if test="encryptKey != null">encrypt_key,</if>
+            <if test="isValid != null">is_valid,</if>
+            <if test="fcd != null">fcd,</if>
+            <if test="fcu != null">fcu,</if>
+            <if test="lcd != null">lcd,</if>
+            <if test="lcu != null">lcu,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="address != null">#{address},</if>
+            <if test="encryptPrivateKey != null">#{encryptPrivateKey},</if>
+            <if test="encryptKey != null">#{encryptKey},</if>
+            <if test="isValid != null">#{isValid},</if>
+            <if test="fcd != null">#{fcd},</if>
+            <if test="fcu != null">#{fcu},</if>
+            <if test="lcd != null">#{lcd},</if>
+            <if test="lcu != null">#{lcu},</if>
+        </trim>
+    </insert>
+
+    <update id="updateAccountAddressInfo" parameterType="AccountAddressInfo">
+        update account_address_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="address != null">address = #{address},</if>
+            <if test="encryptPrivateKey != null">encrypt_private_key = #{encryptPrivateKey},</if>
+            <if test="encryptKey != null">encrypt_key = #{encryptKey},</if>
+            <if test="isValid != null">is_valid = #{isValid},</if>
+            <if test="fcd != null">fcd = #{fcd},</if>
+            <if test="fcu != null">fcu = #{fcu},</if>
+            <if test="lcd != null">lcd = #{lcd},</if>
+            <if test="lcu != null">lcu = #{lcu},</if>
+        </trim>
+        where id_accout_address_info = #{idAccoutAddressInfo}
+    </update>
+
+    <delete id="deleteAccountAddressInfoByIdAccoutAddressInfo" parameterType="Long">
+        delete from account_address_info where id_accout_address_info = #{idAccoutAddressInfo}
+    </delete>
+
+    <delete id="deleteAccountAddressInfoByIdAccoutAddressInfos" parameterType="String">
+        delete from account_address_info where id_accout_address_info in
+        <foreach item="idAccoutAddressInfo" collection="array" open="(" separator="," close=")">
+            #{idAccoutAddressInfo}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/account/FreezeBalanceInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/account/FreezeBalanceInfoMapper.xml
new file mode 100644
index 000000000..f6d04e3ca
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/account/FreezeBalanceInfoMapper.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.FreezeBalanceInfoMapper">
+
+    <resultMap type="FreezeBalanceInfo" id="FreezeBalanceInfoResult">
+        <result property="idFreezeBalanceInfo"    column="id_freeze_balance_info"    />
+        <result property="address"    column="address"    />
+        <result property="freezeTrxAmount"    column="freeze_trx_amount"    />
+        <result property="exchangeResourceType"    column="exchange_resource_type"    />
+        <result property="txId"    column="tx_id"    />
+        <result property="fcd"    column="fcd"    />
+        <result property="fcu"    column="fcu"    />
+        <result property="lcd"    column="lcd"    />
+        <result property="lcu"    column="lcu"    />
+    </resultMap>
+
+    <sql id="selectFreezeBalanceInfoVo">
+        select id_freeze_balance_info, address, freeze_trx_amount, exchange_resource_type, tx_id, fcd, fcu, lcd, lcu from freeze_balance_info
+    </sql>
+
+    <select id="selectFreezeBalanceInfoList" parameterType="FreezeBalanceInfo" resultMap="FreezeBalanceInfoResult">
+        <include refid="selectFreezeBalanceInfoVo"/>
+        <where>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="freezeTrxAmount != null "> and freeze_trx_amount = #{freezeTrxAmount}</if>
+            <if test="exchangeResourceType != null  and exchangeResourceType != ''"> and exchange_resource_type = #{exchangeResourceType}</if>
+            <if test="txId != null  and txId != ''"> and tx_id = #{txId}</if>
+            <if test="fcd != null "> and fcd = #{fcd}</if>
+            <if test="fcu != null  and fcu != ''"> and fcu = #{fcu}</if>
+            <if test="lcd != null "> and lcd = #{lcd}</if>
+            <if test="lcu != null  and lcu != ''"> and lcu = #{lcu}</if>
+        </where>
+    </select>
+
+    <select id="selectFreezeBalanceInfoByIdFreezeBalanceInfo" parameterType="Long" resultMap="FreezeBalanceInfoResult">
+        <include refid="selectFreezeBalanceInfoVo"/>
+        where id_freeze_balance_info = #{idFreezeBalanceInfo}
+    </select>
+
+    <insert id="insertFreezeBalanceInfo" parameterType="FreezeBalanceInfo" useGeneratedKeys="true" keyProperty="idFreezeBalanceInfo">
+        insert into freeze_balance_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="address != null">address,</if>
+            <if test="freezeTrxAmount != null">freeze_trx_amount,</if>
+            <if test="exchangeResourceType != null">exchange_resource_type,</if>
+            <if test="txId != null">tx_id,</if>
+            <if test="fcd != null">fcd,</if>
+            <if test="fcu != null">fcu,</if>
+            <if test="lcd != null">lcd,</if>
+            <if test="lcu != null">lcu,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="address != null">#{address},</if>
+            <if test="freezeTrxAmount != null">#{freezeTrxAmount},</if>
+            <if test="exchangeResourceType != null">#{exchangeResourceType},</if>
+            <if test="txId != null">#{txId},</if>
+            <if test="fcd != null">#{fcd},</if>
+            <if test="fcu != null">#{fcu},</if>
+            <if test="lcd != null">#{lcd},</if>
+            <if test="lcu != null">#{lcu},</if>
+        </trim>
+    </insert>
+
+    <update id="updateFreezeBalanceInfo" parameterType="FreezeBalanceInfo">
+        update freeze_balance_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="address != null">address = #{address},</if>
+            <if test="freezeTrxAmount != null">freeze_trx_amount = #{freezeTrxAmount},</if>
+            <if test="exchangeResourceType != null">exchange_resource_type = #{exchangeResourceType},</if>
+            <if test="txId != null">tx_id = #{txId},</if>
+            <if test="fcd != null">fcd = #{fcd},</if>
+            <if test="fcu != null">fcu = #{fcu},</if>
+            <if test="lcd != null">lcd = #{lcd},</if>
+            <if test="lcu != null">lcu = #{lcu},</if>
+        </trim>
+        where id_freeze_balance_info = #{idFreezeBalanceInfo}
+    </update>
+
+    <delete id="deleteFreezeBalanceInfoByIdFreezeBalanceInfo" parameterType="Long">
+        delete from freeze_balance_info where id_freeze_balance_info = #{idFreezeBalanceInfo}
+    </delete>
+
+    <delete id="deleteFreezeBalanceInfoByIdFreezeBalanceInfos" parameterType="String">
+        delete from freeze_balance_info where id_freeze_balance_info in
+        <foreach item="idFreezeBalanceInfo" collection="array" open="(" separator="," close=")">
+            #{idFreezeBalanceInfo}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/account/MonitorAddressInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/account/MonitorAddressInfoMapper.xml
new file mode 100644
index 000000000..d46ec9a36
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/account/MonitorAddressInfoMapper.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.MonitorAddressInfoMapper">
+
+    <resultMap type="MonitorAddressInfo" id="MonitorAddressInfoResult">
+        <result property="idMonitorAddress"    column="id_monitor_address"    />
+        <result property="monitorAddress"    column="monitor_address"    />
+        <result property="accountAddress"    column="account_address"    />
+        <result property="price"    column="price"    />
+        <result property="monitorType"    column="monitor_type"    />
+        <result property="apiKey"    column="api_key"    />
+        <result property="isValid"    column="is_valid"    />
+        <result property="fcd"    column="fcd"    />
+        <result property="fcu"    column="fcu"    />
+        <result property="lcd"    column="lcd"    />
+        <result property="lcu"    column="lcu"    />
+    </resultMap>
+
+    <sql id="selectMonitorAddressInfoVo">
+        select id_monitor_address, monitor_address, account_address, price, monitor_type, api_key, is_valid, fcd, fcu, lcd, lcu from monitor_address_info
+    </sql>
+
+    <select id="selectMonitorAddressInfoList" parameterType="MonitorAddressInfo" resultMap="MonitorAddressInfoResult">
+        <include refid="selectMonitorAddressInfoVo"/>
+        <where>
+            <if test="monitorAddress != null  and monitorAddress != ''"> and monitor_address = #{monitorAddress}</if>
+            <if test="accountAddress != null  and accountAddress != ''"> and account_address = #{accountAddress}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="monitorType != null  and monitorType != ''"> and monitor_type = #{monitorType}</if>
+            <if test="apiKey != null  and apiKey != ''"> and api_key = #{apiKey}</if>
+            <if test="isValid != null  and isValid != ''"> and is_valid = #{isValid}</if>
+            <if test="fcd != null "> and fcd = #{fcd}</if>
+            <if test="fcu != null  and fcu != ''"> and fcu = #{fcu}</if>
+            <if test="lcd != null "> and lcd = #{lcd}</if>
+            <if test="lcu != null  and lcu != ''"> and lcu = #{lcu}</if>
+        </where>
+    </select>
+
+    <select id="selectMonitorAddressInfoByIdMonitorAddress" parameterType="Long" resultMap="MonitorAddressInfoResult">
+        <include refid="selectMonitorAddressInfoVo"/>
+        where id_monitor_address = #{idMonitorAddress}
+    </select>
+
+    <insert id="insertMonitorAddressInfo" parameterType="MonitorAddressInfo" useGeneratedKeys="true" keyProperty="idMonitorAddress">
+        insert into monitor_address_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="monitorAddress != null">monitor_address,</if>
+            <if test="accountAddress != null">account_address,</if>
+            <if test="price != null">price,</if>
+            <if test="monitorType != null">monitor_type,</if>
+            <if test="apiKey != null">api_key,</if>
+            <if test="isValid != null">is_valid,</if>
+            <if test="fcd != null">fcd,</if>
+            <if test="fcu != null">fcu,</if>
+            <if test="lcd != null">lcd,</if>
+            <if test="lcu != null">lcu,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="monitorAddress != null">#{monitorAddress},</if>
+            <if test="accountAddress != null">#{accountAddress},</if>
+            <if test="price != null">#{price},</if>
+            <if test="monitorType != null">#{monitorType},</if>
+            <if test="apiKey != null">#{apiKey},</if>
+            <if test="isValid != null">#{isValid},</if>
+            <if test="fcd != null">#{fcd},</if>
+            <if test="fcu != null">#{fcu},</if>
+            <if test="lcd != null">#{lcd},</if>
+            <if test="lcu != null">#{lcu},</if>
+        </trim>
+    </insert>
+
+    <update id="updateMonitorAddressInfo" parameterType="MonitorAddressInfo">
+        update monitor_address_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="monitorAddress != null">monitor_address = #{monitorAddress},</if>
+            <if test="accountAddress != null">account_address = #{accountAddress},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="monitorType != null">monitor_type = #{monitorType},</if>
+            <if test="apiKey != null">api_key = #{apiKey},</if>
+            <if test="isValid != null">is_valid = #{isValid},</if>
+            <if test="fcd != null">fcd = #{fcd},</if>
+            <if test="fcu != null">fcu = #{fcu},</if>
+            <if test="lcd != null">lcd = #{lcd},</if>
+            <if test="lcu != null">lcu = #{lcu},</if>
+        </trim>
+        where id_monitor_address = #{idMonitorAddress}
+    </update>
+
+    <delete id="deleteMonitorAddressInfoByIdMonitorAddress" parameterType="Long">
+        delete from monitor_address_info where id_monitor_address = #{idMonitorAddress}
+    </delete>
+
+    <delete id="deleteMonitorAddressInfoByIdMonitorAddresss" parameterType="String">
+        delete from monitor_address_info where id_monitor_address in
+        <foreach item="idMonitorAddress" collection="array" open="(" separator="," close=")">
+            #{idMonitorAddress}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/account/TenantInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/account/TenantInfoMapper.xml
new file mode 100644
index 000000000..26245fe88
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/account/TenantInfoMapper.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TenantInfoMapper">
+
+    <resultMap type="TenantInfo" id="TenantInfoResult">
+        <result property="idTenantInfo"    column="id_tenant_info"    />
+        <result property="receiverAddress"    column="receiver_address"    />
+        <result property="monitorAddress"    column="monitor_address"    />
+        <result property="price"    column="price"    />
+        <result property="transferCount"    column="transfer_count"    />
+        <result property="exchangeUnit"    column="exchange_unit"    />
+        <result property="txId"    column="tx_id"    />
+        <result property="exchangeAmount"    column="exchange_amount"    />
+        <result property="isPaid"    column="is_paid"    />
+        <result property="period"    column="period"    />
+        <result property="finishTransferTime"    column="finish_transfer_time"    />
+        <result property="fcd"    column="fcd"    />
+        <result property="fcu"    column="fcu"    />
+        <result property="lcd"    column="lcd"    />
+        <result property="lcu"    column="lcu"    />
+    </resultMap>
+
+    <sql id="selectTenantInfoVo">
+        select id_tenant_info, receiver_address, monitor_address, price, transfer_count, exchange_unit, tx_id, exchange_amount, is_paid, period, finish_transfer_time, fcd, fcu, lcd, lcu from tenant_info
+    </sql>
+
+    <select id="selectTenantInfoList" parameterType="TenantInfo" resultMap="TenantInfoResult">
+        <include refid="selectTenantInfoVo"/>
+        <where>
+            <if test="receiverAddress != null  and receiverAddress != ''"> and receiver_address = #{receiverAddress}</if>
+            <if test="monitorAddress != null  and monitorAddress != ''"> and monitor_address = #{monitorAddress}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="transferCount != null "> and transfer_count = #{transferCount}</if>
+            <if test="exchangeUnit != null  and exchangeUnit != ''"> and exchange_unit = #{exchangeUnit}</if>
+            <if test="txId != null  and txId != ''"> and tx_id = #{txId}</if>
+            <if test="exchangeAmount != null "> and exchange_amount = #{exchangeAmount}</if>
+            <if test="isPaid != null  and isPaid != ''"> and is_paid = #{isPaid}</if>
+            <if test="period != null "> and period = #{period}</if>
+            <if test="finishTransferTime != null "> and finish_transfer_time &gt;= #{finishTransferTime}</if>
+            <if test="fcd != null "> and fcd &gt;= #{fcd}</if>
+            <if test="fcu != null  and fcu != ''"> and fcu = #{fcu}</if>
+            <if test="lcd != null "> and lcd &lt;= #{lcd}</if>
+            <if test="lcu != null  and lcu != ''"> and lcu = #{lcu}</if>
+        </where>
+    </select>
+
+    <select id="selectTenantInfoByIdTenantInfo" parameterType="Long" resultMap="TenantInfoResult">
+        <include refid="selectTenantInfoVo"/>
+        where id_tenant_info = #{idTenantInfo}
+    </select>
+
+    <insert id="insertTenantInfo" parameterType="TenantInfo" useGeneratedKeys="true" keyProperty="idTenantInfo">
+        insert into tenant_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="receiverAddress != null and receiverAddress != ''">receiver_address,</if>
+            <if test="monitorAddress != null">monitor_address,</if>
+            <if test="price != null">price,</if>
+            <if test="transferCount != null">transfer_count,</if>
+            <if test="exchangeUnit != null">exchange_unit,</if>
+            <if test="txId != null">tx_id,</if>
+            <if test="exchangeAmount != null">exchange_amount,</if>
+            <if test="isPaid != null">is_paid,</if>
+            <if test="period != null">period,</if>
+            <if test="finishTransferTime != null">finish_transfer_time,</if>
+            <if test="fcd != null">fcd,</if>
+            <if test="fcu != null">fcu,</if>
+            <if test="lcd != null">lcd,</if>
+            <if test="lcu != null">lcu,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="receiverAddress != null and receiverAddress != ''">#{receiverAddress},</if>
+            <if test="monitorAddress != null">#{monitorAddress},</if>
+            <if test="price != null">#{price},</if>
+            <if test="transferCount != null">#{transferCount},</if>
+            <if test="exchangeUnit != null">#{exchangeUnit},</if>
+            <if test="txId != null">#{txId},</if>
+            <if test="exchangeAmount != null">#{exchangeAmount},</if>
+            <if test="isPaid != null">#{isPaid},</if>
+            <if test="period != null">#{period},</if>
+            <if test="finishTransferTime != null">#{finishTransferTime},</if>
+            <if test="fcd != null">#{fcd},</if>
+            <if test="fcu != null">#{fcu},</if>
+            <if test="lcd != null">#{lcd},</if>
+            <if test="lcu != null">#{lcu},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTenantInfo" parameterType="TenantInfo">
+        update tenant_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="receiverAddress != null and receiverAddress != ''">receiver_address = #{receiverAddress},</if>
+            <if test="monitorAddress != null">monitor_address = #{monitorAddress},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="transferCount != null">transfer_count = #{transferCount},</if>
+            <if test="exchangeUnit != null">exchange_unit = #{exchangeUnit},</if>
+            <if test="txId != null">tx_id = #{txId},</if>
+            <if test="exchangeAmount != null">exchange_amount = #{exchangeAmount},</if>
+            <if test="isPaid != null">is_paid = #{isPaid},</if>
+            <if test="period != null">period = #{period},</if>
+            <if test="finishTransferTime != null">finish_transfer_time = #{finishTransferTime},</if>
+            <if test="fcd != null">fcd = #{fcd},</if>
+            <if test="fcu != null">fcu = #{fcu},</if>
+            <if test="lcd != null">lcd = #{lcd},</if>
+            <if test="lcu != null">lcu = #{lcu},</if>
+        </trim>
+        where id_tenant_info = #{idTenantInfo}
+    </update>
+
+    <delete id="deleteTenantInfoByIdTenantInfo" parameterType="Long">
+        delete from tenant_info where id_tenant_info = #{idTenantInfo}
+    </delete>
+
+    <delete id="deleteTenantInfoByIdTenantInfos" parameterType="String">
+        delete from tenant_info where id_tenant_info in
+        <foreach item="idTenantInfo" collection="array" open="(" separator="," close=")">
+            #{idTenantInfo}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/exchange/TrxExchangeInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/exchange/TrxExchangeInfoMapper.xml
new file mode 100644
index 000000000..665b3885f
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/exchange/TrxExchangeInfoMapper.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TrxExchangeInfoMapper">
+
+    <resultMap type="TrxExchangeInfo" id="TrxExchangeInfoResult">
+        <result property="idTrxExchangeInfo"    column="id_trx_exchange_info"    />
+        <result property="fromAddress"    column="from_address"    />
+        <result property="toAddress"    column="to_address"    />
+        <result property="accountAddress"    column="account_address"    />
+        <result property="price"    column="price"    />
+        <result property="trxTxId"    column="trx_tx_id"    />
+        <result property="tranferCount"    column="tranfer_count"    />
+        <result property="busiType"    column="busi_type"    />
+        <result property="trxAmount"    column="trx_amount"    />
+        <result property="delegateAmountTrx"    column="delegate_amount_trx"    />
+        <result property="delegateTxId"    column="delegate_tx_id"    />
+        <result property="lockPeriod"    column="lock_period"    />
+        <result property="delegateStatus"    column="delegate_status"    />
+        <result property="unDelegateTxId"    column="un_delegate_tx_id"    />
+        <result property="fcd"    column="fcd"    />
+        <result property="fcu"    column="fcu"    />
+        <result property="lcd"    column="lcd"    />
+        <result property="lcu"    column="lcu"    />
+    </resultMap>
+
+    <sql id="selectTrxExchangeInfoVo">
+        select id_trx_exchange_info, from_address, to_address, account_address, price, trx_tx_id, tranfer_count, busi_type, trx_amount, delegate_amount_trx, delegate_tx_id, lock_period, delegate_status, un_delegate_tx_id, fcd, fcu, lcd, lcu from trx_exchange_info
+    </sql>
+
+    <select id="selectTrxExchangeInfoList" parameterType="TrxExchangeInfo" resultMap="TrxExchangeInfoResult">
+        <include refid="selectTrxExchangeInfoVo"/>
+        <where> 1=1
+            <if test="fromAddress != null  and fromAddress != ''"> and from_address = #{fromAddress}</if>
+            <if test="toAddress != null  and toAddress != ''"> and to_address = #{toAddress}</if>
+            <if test="accountAddress != null  and accountAddress != ''"> and account_address = #{accountAddress}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="trxTxId != null  and trxTxId != ''"> and trx_tx_id = #{trxTxId}</if>
+            <if test="tranferCount != null "> and tranfer_count = #{tranferCount}</if>
+            <if test="busiType != null  and busiType != ''"> and busi_type = #{busiType}</if>
+            <if test="trxAmount != null "> and trx_amount = #{trxAmount}</if>
+            <if test="delegateAmountTrx != null "> and delegate_amount_trx = #{delegateAmountTrx}</if>
+            <if test="delegateTxId != null  and delegateTxId != ''"> and delegate_tx_id = #{delegateTxId}</if>
+            <if test="lockPeriod != null "> and lock_period = #{lockPeriod}</if>
+            <if test="delegateStatus != null  and delegateStatus != ''"> and delegate_status = #{delegateStatus}</if>
+            <if test="unDelegateTxId != null  and unDelegateTxId != ''"> and un_delegate_tx_id = #{unDelegateTxId}</if>
+            <if test="fcd != null "> and fcd &gt;= #{fcd}</if>
+            <if test="fcu != null  and fcu != ''"> and fcu = #{fcu}</if>
+            <if test="lcd != null "> and lcd &lt;= #{lcd}</if>
+            <if test="lcu != null  and lcu != ''"> and lcu = #{lcu}</if>
+            order by fcd desc
+        </where>
+    </select>
+
+    <select id="selectTrxExchangeInfoByIdTrxExchangeInfo" parameterType="Long" resultMap="TrxExchangeInfoResult">
+        <include refid="selectTrxExchangeInfoVo"/>
+        where id_trx_exchange_info = #{idTrxExchangeInfo}
+    </select>
+
+    <insert id="insertTrxExchangeInfo" parameterType="TrxExchangeInfo" useGeneratedKeys="true" keyProperty="idTrxExchangeInfo">
+        insert into trx_exchange_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fromAddress != null">from_address,</if>
+            <if test="toAddress != null">to_address,</if>
+            <if test="accountAddress != null">account_address,</if>
+            <if test="price != null">price,</if>
+            <if test="trxTxId != null">trx_tx_id,</if>
+            <if test="tranferCount != null">tranfer_count,</if>
+            <if test="busiType != null">busi_type,</if>
+            <if test="trxAmount != null">trx_amount,</if>
+            <if test="delegateAmountTrx != null">delegate_amount_trx,</if>
+            <if test="delegateTxId != null">delegate_tx_id,</if>
+            <if test="lockPeriod != null">lock_period,</if>
+            <if test="delegateStatus != null">delegate_status,</if>
+            <if test="unDelegateTxId != null">un_delegate_tx_id,</if>
+            <if test="fcd != null">fcd,</if>
+            <if test="fcu != null">fcu,</if>
+            <if test="lcd != null">lcd,</if>
+            <if test="lcu != null">lcu,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fromAddress != null">#{fromAddress},</if>
+            <if test="toAddress != null">#{toAddress},</if>
+            <if test="accountAddress != null">#{accountAddress},</if>
+            <if test="price != null">#{price},</if>
+            <if test="trxTxId != null">#{trxTxId},</if>
+            <if test="tranferCount != null">#{tranferCount},</if>
+            <if test="busiType != null">#{busiType},</if>
+            <if test="trxAmount != null">#{trxAmount},</if>
+            <if test="delegateAmountTrx != null">#{delegateAmountTrx},</if>
+            <if test="delegateTxId != null">#{delegateTxId},</if>
+            <if test="lockPeriod != null">#{lockPeriod},</if>
+            <if test="delegateStatus != null">#{delegateStatus},</if>
+            <if test="unDelegateTxId != null">#{unDelegateTxId},</if>
+            <if test="fcd != null">#{fcd},</if>
+            <if test="fcu != null">#{fcu},</if>
+            <if test="lcd != null">#{lcd},</if>
+            <if test="lcu != null">#{lcu},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTrxExchangeInfo" parameterType="TrxExchangeInfo">
+        update trx_exchange_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fromAddress != null">from_address = #{fromAddress},</if>
+            <if test="toAddress != null">to_address = #{toAddress},</if>
+            <if test="accountAddress != null">account_address = #{accountAddress},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="trxTxId != null">trx_tx_id = #{trxTxId},</if>
+            <if test="tranferCount != null">tranfer_count = #{tranferCount},</if>
+            <if test="busiType != null">busi_type = #{busiType},</if>
+            <if test="trxAmount != null">trx_amount = #{trxAmount},</if>
+            <if test="delegateAmountTrx != null">delegate_amount_trx = #{delegateAmountTrx},</if>
+            <if test="delegateTxId != null">delegate_tx_id = #{delegateTxId},</if>
+            <if test="lockPeriod != null">lock_period = #{lockPeriod},</if>
+            <if test="delegateStatus != null">delegate_status = #{delegateStatus},</if>
+            <if test="unDelegateTxId != null">un_delegate_tx_id = #{unDelegateTxId},</if>
+            <if test="fcd != null">fcd = #{fcd},</if>
+            <if test="fcu != null">fcu = #{fcu},</if>
+            <if test="lcd != null">lcd = #{lcd},</if>
+            <if test="lcu != null">lcu = #{lcu},</if>
+        </trim>
+        where id_trx_exchange_info = #{idTrxExchangeInfo}
+    </update>
+
+    <delete id="deleteTrxExchangeInfoByIdTrxExchangeInfo" parameterType="Long">
+        delete from trx_exchange_info where id_trx_exchange_info = #{idTrxExchangeInfo}
+    </delete>
+
+    <delete id="deleteTrxExchangeInfoByIdTrxExchangeInfos" parameterType="String">
+        delete from trx_exchange_info where id_trx_exchange_info in
+        <foreach item="idTrxExchangeInfo" collection="array" open="(" separator="," close=")">
+            #{idTrxExchangeInfo}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/ErrorLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ErrorLogMapper.xml
new file mode 100644
index 000000000..3c97caa0b
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/ErrorLogMapper.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.ErrorLogMapper">
+    
+    <resultMap type="ErrorLog" id="ErrorLogResult">
+        <result property="idErrorLog"    column="id_error_log"    />
+        <result property="address"    column="address"    />
+        <result property="trxId"    column="trx_id"    />
+        <result property="otherId"    column="other_id"    />
+        <result property="errorCode"    column="error_code"    />
+        <result property="errorMsg"    column="error_msg"    />
+        <result property="fcd"    column="fcd"    />
+        <result property="fcu"    column="fcu"    />
+        <result property="lcd"    column="lcd"    />
+        <result property="lcu"    column="lcu"    />
+    </resultMap>
+
+    <sql id="selectErrorLogVo">
+        select id_error_log, address, trx_id, other_id, error_code, error_msg, fcd, fcu, lcd, lcu from error_log
+    </sql>
+
+    <select id="selectErrorLogList" parameterType="ErrorLog" resultMap="ErrorLogResult">
+        <include refid="selectErrorLogVo"/>
+        <where>  
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="trxId != null  and trxId != ''"> and trx_id = #{trxId}</if>
+            <if test="otherId != null  and otherId != ''"> and other_id = #{otherId}</if>
+            <if test="errorCode != null  and errorCode != ''"> and error_code = #{errorCode}</if>
+            <if test="errorMsg != null  and errorMsg != ''"> and error_msg = #{errorMsg}</if>
+            <if test="fcd != null "> and fcd = #{fcd}</if>
+            <if test="fcu != null  and fcu != ''"> and fcu = #{fcu}</if>
+            <if test="lcd != null "> and lcd = #{lcd}</if>
+            <if test="lcu != null  and lcu != ''"> and lcu = #{lcu}</if>
+        </where>
+    </select>
+    
+    <select id="selectErrorLogByIdErrorLog" parameterType="Long" resultMap="ErrorLogResult">
+        <include refid="selectErrorLogVo"/>
+        where id_error_log = #{idErrorLog}
+    </select>
+        
+    <insert id="insertErrorLog" parameterType="ErrorLog" useGeneratedKeys="true" keyProperty="idErrorLog">
+        insert into error_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="address != null">address,</if>
+            <if test="trxId != null">trx_id,</if>
+            <if test="otherId != null">other_id,</if>
+            <if test="errorCode != null">error_code,</if>
+            <if test="errorMsg != null">error_msg,</if>
+            <if test="fcd != null">fcd,</if>
+            <if test="fcu != null">fcu,</if>
+            <if test="lcd != null">lcd,</if>
+            <if test="lcu != null">lcu,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="address != null">#{address},</if>
+            <if test="trxId != null">#{trxId},</if>
+            <if test="otherId != null">#{otherId},</if>
+            <if test="errorCode != null">#{errorCode},</if>
+            <if test="errorMsg != null">#{errorMsg},</if>
+            <if test="fcd != null">#{fcd},</if>
+            <if test="fcu != null">#{fcu},</if>
+            <if test="lcd != null">#{lcd},</if>
+            <if test="lcu != null">#{lcu},</if>
+         </trim>
+    </insert>
+
+    <update id="updateErrorLog" parameterType="ErrorLog">
+        update error_log
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="address != null">address = #{address},</if>
+            <if test="trxId != null">trx_id = #{trxId},</if>
+            <if test="otherId != null">other_id = #{otherId},</if>
+            <if test="errorCode != null">error_code = #{errorCode},</if>
+            <if test="errorMsg != null">error_msg = #{errorMsg},</if>
+            <if test="fcd != null">fcd = #{fcd},</if>
+            <if test="fcu != null">fcu = #{fcu},</if>
+            <if test="lcd != null">lcd = #{lcd},</if>
+            <if test="lcu != null">lcu = #{lcu},</if>
+        </trim>
+        where id_error_log = #{idErrorLog}
+    </update>
+
+    <delete id="deleteErrorLogByIdErrorLog" parameterType="Long">
+        delete from error_log where id_error_log = #{idErrorLog}
+    </delete>
+
+    <delete id="deleteErrorLogByIdErrorLogs" parameterType="String">
+        delete from error_log where id_error_log in 
+        <foreach item="idErrorLog" collection="array" open="(" separator="," close=")">
+            #{idErrorLog}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/sql/ruoyi.html b/sql/ruoyi.html
index 915fa1fbc..5c73bf411 100644
--- a/sql/ruoyi.html
+++ b/sql/ruoyi.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang='en' xmlns='http://www.w3.org/1999/xhtml' >
 <head>
-<title>RuoYi</title>
+<title>后台管理</title>
 <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/>
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
@@ -238,7 +238,7 @@ body {
 <!-- == Legend == -->
 <g transform='translate(10,10)'>
   <rect x='10' y='10' width='330' height='56' rx='6' ry='6' style='fill:url(#legendGradient);filter:url(#shadow);'/> 
-  <text x='20' y='43'>RuoYi</text> 
+  <text x='20' y='43'>后台管理</text>
   <text x='20' y='57' style='fill:#aaaaaa; font-size:11px;'><tspan>Move the mouse over tables &amp; columns to read the comments.</tspan></text> 
 <a xlink:href='https://www.dbschema.com'> <path class='logo' d='m 32.309685,20.963194 c 0.411708,4.732616 -4.298055,7.925636 -8.723583,6.970196 -6.616967,1.8448 -2.656457,-6.434594 -3.911969,-10.01566 -2.15469,-5.89407 6.06247,-3.508505 9.167655,-2.863689 2.199228,1.054873 3.389343,3.582089 3.467897,5.909153 z m -3.720955,0.01451 c 0.434195,-4.414565 -7.644142,-5.37533 -5.137307,0.107342 -1.812268,5.992146 5.532698,4.379388 5.137307,-0.107342 z' /> <path class='logo' d='m 44.329732,23.050637 c 0.850982,5.097305 -5.250434,4.558924 -7.144836,4.752415 -6.418993,1.64391 -1.872992,-7.49274 -3.541914,-10.942842 -2.499646,-3.817859 5.939283,-4.402698 3.538545,-0.13612 -1.287874,4.989123 4.215411,-1.154796 5.956717,2.809584 0.840273,0.970849 1.168829,2.272413 1.191488,3.516963 z m -3.519477,-0.09299 c -1.398216,-5.518069 -6.361061,2.717467 -0.984368,1.810718 0.686994,-0.30388 1.029454,-1.087638 0.984368,-1.810718 z' /> <path class='logo' d='m 52.234961,23.301163 c 0.954818,5.035675 -8.606408,6.284861 -6.262292,1.674914 6.000358,-1.604717 -5.188764,-7.870044 1.75972,-10.384908 2.288682,-3.253567 6.399287,3.075831 2.304111,2.48058 -2.124941,2.016587 2.688777,3.89858 2.198472,6.229403 z' /> <path class='logo' d='m 60.204336,21.349224 c -4.894917,-1.916474 -3.458707,5.391212 0.347494,3.37231 2.120589,6.821713 -10.599623,1.664746 -6.906229,-3.691132 0.354172,-3.663246 9.875349,-4.711252 6.558735,0.318822 z' /> <path class='logo' d='m 71.730617,20.654299 c 0.0013,2.316285 0.190131,4.655698 0.07825,6.958009 -6.532419,3.303565 -0.660423,-8.722256 -6.009639,-5.821653 -0.818815,2.024533 1.726403,6.746337 -1.95327,6.005484 -3.458346,-1.137537 -0.696275,-7.713407 -1.833252,-10.994208 -2.308916,-3.710131 5.93704,-4.164951 3.518609,0.0063 -1.462376,6.166445 5.169629,-2.857523 6.19931,3.846079 z' /> <path class='logo' d='m 82.245738,22.378957 c -0.24581,2.448954 -9.386766,0.8867 -3.885979,2.877055 3.312576,-2.99157 5.250902,3.334514 0.482647,2.665545 -7.415384,1.492275 -7.823196,-11.597641 -0.275476,-10.032117 2.068161,0.391458 3.682204,2.408824 3.678808,4.489517 z m -3.414436,-0.578473 c -1.124703,-4.072004 -5.087405,2.125488 -0.316922,0.156453 z' /> <path class='logo' d='m 98.936899,27.222794 c -4.73541,2.718339 -3.1239,-3.406557 -3.92611,-6.050494 -4.66985,-1.438471 0.21621,6.932413 -3.41219,6.438039 -4.46096,1.160054 -0.22824,-5.774711 -3.31526,-6.700429 -3.410722,1.082173 1.04451,9.536575 -4.745091,6.372895 0.746632,-3.355214 -2.776394,-10.269232 3.034971,-9.038963 -0.058,2.544602 5.00686,-2.785359 6.00342,1.37844 3.42021,-4.316316 7.851251,0.524966 6.24018,4.690538 0.0379,0.969988 0.0954,1.940046 0.12008,2.909974 z' /> <path class='logo' d='m 110.47859,22.686058 c 0.91826,2.682088 0.13016,6.890551 -3.0725,4.397004 -1.63641,1.077877 -7.664291,0.541832 -7.09365,-4.114836 -0.907891,-4.692933 5.14729,-5.625578 7.24058,-4.40354 3.85932,-1.686263 3.13176,1.271515 2.92557,4.121372 z m -3.12695,0.0704 c -1.46278,-5.460062 -6.61615,2.5826 -1.08221,1.782003 0.70431,-0.272594 1.13111,-1.037444 1.08221,-1.782003 z' /> </a>
 </g>